diff --git a/Nodes/Styles.py b/Nodes/Styles.py index df87a9f..ca48c80 100644 --- a/Nodes/Styles.py +++ b/Nodes/Styles.py @@ -27,12 +27,12 @@ class PrimereStylePile: cls.COLORS = ['None'] + sorted(STYLE['colors']['colors']) cls.DIRECTIONS = ['None'] + sorted(STYLE['directions']['directions']) cls.MOODS = ['None'] + sorted(STYLE['moods']['moods']) + cls.MJSTYLES = ['None'] + sorted(STYLE['mjstyles']['mjstyles']) return { "required": { "art_type": (list(cls.ART_TYPES.keys()),), "art_type_strength": ("FLOAT", {"default": 1, "min": 0.0, "max": 10.0, "step": 0.01}), - "color": (cls.COLORS,), "color_strength": ("FLOAT", {"default": 1, "min": 0.0, "max": 10.0, "step": 0.01}), "mood": (cls.MOODS,), @@ -45,6 +45,8 @@ class PrimereStylePile: "artist_strength": ("FLOAT", {"default": 1, "min": 0.0, "max": 10.0, "step": 0.01}), "movement": (cls.ART_MOVEMENTS,), "movement_strength": ("FLOAT", {"default": 1, "min": 0.0, "max": 10.0, "step": 0.01}), + "midjourney_styles": (cls.MJSTYLES,), + "midjourney_styles_strength": ("FLOAT", {"default": 1, "min": 0.0, "max": 10.0, "step": 0.01}), }, "optional": { "opt_pos_style": ("STRING", {"forceInput": True}), @@ -52,7 +54,7 @@ class PrimereStylePile: } } - def styleple(self, concept, concept_strength, art_type, art_type_strength, artist, artist_strength, movement, movement_strength, color, color_strength, mood, mood_strength, direction, direction_strength, opt_pos_style = '', opt_neg_style = ''): + def styleple(self, concept, concept_strength, art_type, art_type_strength, artist, artist_strength, movement, movement_strength, midjourney_styles, midjourney_styles_strength, color, color_strength, mood, mood_strength, direction, direction_strength, opt_pos_style = '', opt_neg_style = ''): opt_pos_style = f'({opt_pos_style})' if opt_pos_style is not None and opt_pos_style.strip(' ,;') != '' else '' opt_neg_style = f'({opt_neg_style})' if opt_neg_style is not None and opt_neg_style.strip(' ,;') != '' else '' @@ -67,8 +69,9 @@ class PrimereStylePile: concept = f'({concept}:{concept_strength:.2f})' if concept is not None and concept != 'None' and concept.strip(' ,;') != '' else '' artist = f'({artist}:{artist_strength:.2f})' if artist is not None and artist != 'None' and artist.strip(' ,;') != '' else '' movement = f'({movement}:{movement_strength:.2f})' if movement is not None and movement != 'None' and movement.strip(' ,;') != '' else '' + midjourney_styles = f'({midjourney_styles}:{midjourney_styles_strength:.2f})' if midjourney_styles is not None and midjourney_styles != 'None' and midjourney_styles.strip(' ,;') != '' else '' - positive_text = f'{opt_pos_style}, {art_type_pos_str}, {color}, {mood}, {direction}, {concept}, {artist}, {movement}'.strip(' ,;').replace(", , ", ", ").replace(", , ", ", ").replace(", , ", ", ") + positive_text = f'{opt_pos_style}, {art_type_pos_str}, {color}, {mood}, {direction}, {concept}, {artist}, {movement}, {midjourney_styles}'.strip(' ,;').replace(", , ", ", ").replace(", , ", ", ").replace(", , ", ", ") negative_text = f'{opt_neg_style}, {art_type_neg_str}'.strip(' ,;').replace(", , ", ", ").replace(", , ", ", ") return (positive_text, negative_text,) diff --git a/Toml/stylepile.toml b/Toml/stylepile.toml index 03b1191..faa6f96 100644 --- a/Toml/stylepile.toml +++ b/Toml/stylepile.toml @@ -632,3 +632,460 @@ moods=[ "Shameful", "Surprising" ] +[mjstyles] +mjstyles=[ + "3D Animation", + "3D Modeling", + "3D Printing", + "3D Render", + "3D Sculpture", + "Abstract", + "Abstract Art", + "Abstract Expressionism", + "Abstract Organic", + "Action Painting", + "Action Photography", + "Added by Nik Bear Brown", + "Added by Sanjay Handa", + "Adventure Time Art Style", + "Advertising Campaign", + "Advertising Poster", + "Aerography", + "Aerography ", + "Aerosolgrafia", + "African Art", + "Afrofuturism", + "Airbrush", + "Album Art Cover", + "Alcohol Ink Art ", + "Alegria", + "American Art", + "Anamorphic Art", + "Ancient Art", + "Ancient Egypt Papyrus", + "Ancient Egyptian Art", + "Animal Art", + "Animaniacs Art Style", + "Anime", + "Aquatint Print", + "Architectural Art", + "Architectural Photography", + "Art Deco", + "Art Nouveau", + "Arte Povera", + "Asian Art", + "Assemblage Art", + "Augmented Reality", + "Autochrome", + "Automatism", + "Avatar", + "Aztec Carving", + "Babylonian Art", + "Balance", + "Balloon Art", + "Ballpoint Pen", + "Baroque", + "Baroque Art", + "Batman Beyond Art Style", + "Bauhaus", + "Bead Art", + "Biomorphic Art", + "Blacklight Painting", + "Blueprint", + "Body Art", + "Body Painting", + "Book Cover", + "Botanical Art ", + "Botanical Illustration", + "Bronze Sculpture", + "Bronze Statue", + "Bubble Wrap Painting", + "Byzantine Icon", + "CGI", + "Calligraphy", + "Camel Bone Art", + "Camera Obscura", + "Caricature", + "Cartoon", + "Carving", + "Cave Painting", + "Ceramic Art", + "Ceramics", + "Chalk Drawing", + "Chalk and Pastel", + "Character", + "Charcoal", + "Charcoal Drawing", + "Child's Drawing", + "Children's Book Illustration", + "Chinese Art", + "Chinese Watercolor", + "Chromolithograph", + "Claymation", + "Coffee Filter Art", + "Coffee Painting", + "Collage", + "Collage Of Magazine Cutouts", + "Collage Painting", + "Color", + "Colored Pencil", + "Colorful Scribbles", + "Colorful Spikey Hair", + "Colouring-in Sheet", + "Comic Book Art", + "Composition Art", + "Concept", + "Conceptual Art", + "Constructivism", + "Courage The Cowardly Dog Art Style", + "Courtroom Sketch", + "Cowboy Bebop Art Style", + "Crayon", + "Crayon Drawing", + "Creativity", + "Crochet", + "Cubism", + "Cyanotype", + "Cybernetic", + "Cyberpunk", + "Cyberpunk Art ", + "Dada", + "Dadaism", + "Danny Phantom Art Style", + "Darkwing Duck Art Style", + "Dashcam", + "De Stijl", + "Decalcomania", + "Decorative Minoan Mural", + "Decoupage", + "Design", + "Detail", + "Diagram", + "Dieselpunk", + "Digital Art", + "Digital Painting", + "Digital Sculpting", + "Disposable Camera", + "Doodle Art ", + "Doodle Art - Playful", + "Doodling", + "Double Exposure", + "Dragon Ball Z Art Style", + "Drawing", + "Drip Painting", + "Drip Painting ", + "Dutch Art", + "Early Renaissance Art", + "Ebru (Turkish Marbling)", + "Editorial Fashion Photography", + "Editorial Illustration", + "Eggshell Mosaic Art", + "Eggshell Mosaic Art ", + "Egyptian Art", + "Electrostatic Painting", + "Embroidery", + "Encaustic Painting Enkaustische Malerei", + "Engraving", + "Etching", + "Etching Metal", + "Experimental Expired Film Photo", + "Expressionism", + "Family Guy Art Style", + "Fantasy", + "Fashion Illustration", + "Fauvism", + "Fifth Grade Yearbook", + "Finger Painting", + "Fingerprint Art", + "Folded Paper Art", + "Folk Art", + "Fractal", + "Fresco", + "Fresco Secco", + "Full Body Photo", + "Fumage", + "Functional Art", + "Futurama Art Style", + "Futurism", + "Game Art", + "Gargoyles Art Style", + "Geometric", + "Geometric Abstraction", + "Geometric Abstraction ", + "Geometric Art", + "Glitch Art", + "Glitchcore", + "Glitter and Glue", + "Gongbi", + "Gothic", + "Graffiti", + "Graffiti Art", + "Graphic Design", + "Graphic Novel", + "Grayscale", + "Greek Art", + "Grisaille", + "Gyotaku", + "Hand-drawn", + "Handprint Art", + "Haptic Art", + "Hard-edge Painting", + "Harsh Flash Photography", + "Harvey Birdman, Attorney At Law Art Style", + "Hey Arnold! Art Style", + "Hieroglyphics", + "Highlight", + "Hong Kong Phooey Art Style", + "Houdini 3D Render", + "Hyperrealism", + "Ice Carving", + "Ice Painting", + "Illustration", + "Illustrator", + "Impasto", + "Impressionism", + "Impressionist", + "Indian Art", + "Ink", + "Ink Wash Painting", + "Installation Art", + "Instruction Manual", + "Interior Design", + "Japanese Art", + "Jelly Bean Art", + "Josie and The Pussycats Art Style", + "Kim Possible Art Style", + "Kindergartener Drawing", + "Kinetic Art", + "Kinetic Painting", + "King Of The Hill Art Style", + "Kirigami", + "Kitsch", + "Knitting", + "Land Art", + "Landscape Painting", + "Layered Paper", + "Light Art", + "Lighting", + "Line Art", + "Line Drawing", + "Linocut", + "Lithography", + "Lomography", + "Long-exposure Photograph With Slow Shutter Speed", + "Looney Tunes Art Style", + "Low Poly", + "Lowbrow Art", + "Luminism", + "Macchiaioli", + "Macram�", + "Macro 35mm Photograph", + "Mandala Art", + "Manga", + "Mannerism", + "Manuscripts", + "Marble Statue", + "Marker", + "Mathematical Art", + "Matte Painting", + "Medieval Art", + "Medieval Portrait", + "Melted Crayon Art", + "Mexican Muralism", + "Minimalism", + "Minimalist", + "Minimalist Art", + "Mixed Media", + "Modeling Photoshoot", + "Modern Art", + "Monochromatic", + "Monochrome", + "Monoprinting", + "Moo Card Paintings", + "Mosaic", + "Mugshot", + "Mural Art", + "Muralism", + "Mythological Map", + "Na�ve Art", + "Negative Space", + "Neo-impressionism", + "Neoclassicism", + "Neon Art", + "Neon Light Art", + "Neon Light Art ", + "New Media Art", + "Oil Painting", + "One-line Drawing", + "Op Art", + "Optical Art (Op Art)", + "Oriental Art", + "Origami", + "Orphism", + "Painting", + "Paper Cutouts", + "Paper Cutting", + "Paper Mache", + "Paper Quilling", + "Paper-cutting", + "Pastel Drawing", + "Patent Drawing", + "Pattern", + "Pen and Ink", + "Pencil", + "Pencil Sketch", + "Pencil Sketching", + "Pencil and Watercolor Drawing", + "Performance Art", + "Phineas and Ferb Art Style", + "Photo-bashing", + "Photograph", + "Photorealism", + "Photoshopped Image", + "Pietra Dura", + "Pinhole Photography", + "Pink Panther and Pals Art Style", + "Pirate Map", + "Pixel Art", + "Playdough Creations", + "Pointillism", + "Polaroid", + "Pop Art", + "Portrait Art", + "Portrait Painting", + "Post-apocalyptic", + "Post-impressionism", + "Postmodern Art", + "Potato Stamp Printing", + "Poured Paint Art", + "Prehistoric Art", + "Press Release", + "Printmaking", + "Product Photography", + "Professional Corporate Portrait", + "Psychedelic Art", + "Psychedelic Art - Surreal, optic, bold imagery associated with 60's counterculture", + "Puffy Paint", + "Quilling", + "Quilting", + "Raster", + "Real Estate Photography", + "Realism", + "Reboot Art Style", + "Regular Show Art Style", + "Renaissance", + "Renaissance Art", + "Retro", + "Reverse Glass Painting", + "Rick and Morty Art Style", + "Rococo", + "Roman Mosaic", + "Romanticism", + "Rorschach-style Art", + "Samurai Jack Art Style", + "Sand Animation", + "Sand Art", + "Sand Painting", + "Sci-fi Art", + "Scooby-Doo, Where Are You! Art Style", + "Scratchboard", + "Sculpture", + "Sealab 2021 Art Style", + "Selfie", + "Seurat Pointillism", + "Sfumato", + "Sgraffito", + "Shading", + "Shadow Art", + "Shadow Puppetry", + "Shot On iPhone", + "Sidewalk Chalk Art", + "Sigma 75mm", + "Silhouette Painting", + "Sketch", + "Sketchbook", + "Skeumorphism", + "Social Realism", + "South Park Art Style", + "Spanish Art", + "Spirograph Drawing", + "SpongeBob SquarePants Art Style", + "Stained Glass Window", + "Steampunk", + "Stencil Art", + "Stencil Painting", + "Sticker Art", + "Sticker Illustration", + "Still Life", + "Stippling", + "Stop-motion Animation", + "Storyboard", + "Storybook", + "Street Art", + "Street Art and Graffiti", + "String Art", + "Studio Photography", + "Suminagashi", + "Super Friends Art Style", + "Suprematism", + "Surrealism", + "Symbolism", + "Synthwave", + "Tattoo", + "Tattoo Art", + "Tattoo Art Styles", + "Terracotta Warriors", + "Textile Art", + "Texture", + "The Adventures Of Jimmy Neutron", + "The Archies Art Style", + "The Banana Splits Adventure Hour Art Style", + "The Flintstones Art Style", + "The Grim Adventures Of Billy & Mandy Art Style", + "The Herculoids Art Style", + "The Jetsons Art Style", + "The Magic School Bus Art Style", + "The Many Adventures Of Winnie The Pooh Art Style", + "The New Adventures Of Batman Art Style", + "The New Adventures Of Superman Art Style", + "The Powerpuff Girls Art Style", + "The Ren & Stimpy Show Art Style", + "The Road Runner Show Art Style", + "The Rocky and Bullwinkle Show Art Style", + "The Simpsons Art Style", + "The Smurfs Art Style", + "The Woody Woodpecker Show Art Style", + "Theatrical Press Release", + "Thermochromic Painting", + "Thunderbirds Art Style", + "Tie-dye", + "Tiny Toon Adventures Art Style", + "Topiary", + "Trompe-l'�il", + "Typography", + "UV Painting", + "UV Painting ", + "Ukiyo-e", + "Under Electron Microscope", + "Underdog Art Style", + "Unity3D Art", + "Upcycling", + "Vector Art", + "Verre �glomis�", + "Vexel Art", + "Vintage", + "Vintage Art", + "Virtual Reality", + "Voynich Manuscript", + "Wall Painting", + "Watercolor Painting", + "Weaving", + "Wet-on-Wet Oil Painting", + "Wire Sculpture", + "Wire Sculpture ", + "Wood Carving", + "Woodcut", + "X-men", + "Yarn Art", + "Yogi Bear Art Style" +] \ No newline at end of file diff --git a/Workflow/Primere_latest_workflow.json b/Workflow/Primere_latest_workflow.json index 2da96c1..353b0d2 100644 --- a/Workflow/Primere_latest_workflow.json +++ b/Workflow/Primere_latest_workflow.json @@ -149,7 +149,7 @@ "1": 417.1067199707031 }, "flags": {}, - "order": 14, + "order": 3, "mode": 0, "outputs": [ { @@ -224,7 +224,7 @@ "1": 381.5324401855469 }, "flags": {}, - "order": 3, + "order": 4, "mode": 0, "outputs": [ { @@ -299,7 +299,7 @@ "1": 58 }, "flags": {}, - "order": 4, + "order": 5, "mode": 0, "outputs": [ { @@ -334,7 +334,7 @@ "1": 58 }, "flags": {}, - "order": 5, + "order": 6, "mode": 0, "outputs": [ { @@ -369,7 +369,7 @@ "1": 102 }, "flags": {}, - "order": 6, + "order": 7, "mode": 0, "outputs": [ { @@ -414,7 +414,7 @@ "1": 58 }, "flags": {}, - "order": 7, + "order": 8, "mode": 0, "outputs": [ { @@ -448,7 +448,7 @@ "1": 445.68524169921875 }, "flags": {}, - "order": 15, + "order": 9, "mode": 0, "outputs": [ { @@ -523,7 +523,7 @@ "1": 414.56573486328125 }, "flags": {}, - "order": 8, + "order": 10, "mode": 0, "inputs": [ { @@ -594,7 +594,7 @@ "1": 258 }, "flags": {}, - "order": 9, + "order": 11, "mode": 0, "outputs": [ { @@ -669,7 +669,7 @@ "1": 418.6113586425781 }, "flags": {}, - "order": 10, + "order": 12, "mode": 0, "outputs": [ { @@ -744,7 +744,7 @@ "1": 129.9805450439453 }, "flags": {}, - "order": 11, + "order": 13, "mode": 0, "outputs": [ { @@ -790,7 +790,7 @@ "1": 470.09844970703125 }, "flags": {}, - "order": 16, + "order": 14, "mode": 0, "outputs": [ { @@ -865,7 +865,7 @@ "1": 444.4584045410156 }, "flags": {}, - "order": 12, + "order": 15, "mode": 0, "outputs": [ { @@ -940,7 +940,7 @@ "1": 130 }, "flags": {}, - "order": 13, + "order": 16, "mode": 0, "outputs": [ { @@ -1122,7 +1122,7 @@ ], "size": { "0": 342.34326171875, - "1": 414 + "1": 438 }, "flags": {}, "order": 18, @@ -1183,6 +1183,8 @@ 1, "None", 0.6, + "None", + 1, "", "" ], @@ -1201,7 +1203,7 @@ "1": 838 }, "flags": {}, - "order": 21, + "order": 19, "mode": 0, "inputs": [ { @@ -1481,7 +1483,7 @@ 26 ], "flags": {}, - "order": 19, + "order": 20, "mode": 0, "inputs": [ { @@ -1528,7 +1530,7 @@ "1": 270 }, "flags": {}, - "order": 20, + "order": 21, "mode": 0, "inputs": [ {