From 7925cbe765602652d1b9309466959f2ea1693349 Mon Sep 17 00:00:00 2001 From: AIrjen Date: Mon, 21 Aug 2023 19:25:39 +0200 Subject: [PATCH] Added patterns and stuff Lots of brands! --- build_dynamic_prompt.py | 22 +++++--- csvfiles/brands.csv | 51 ++++++++++++++++- csvfiles/human_activities.csv | 3 +- csvfiles/patterns.csv | 64 ++++++++++++++++++++++ csvfiles/prints.csv | 5 +- csvfiles/special_lists/buildoutfit.csv | 4 +- csvfiles/special_lists/miniactivity.csv | 4 +- csvfiles/special_lists/objectadditions.csv | 3 +- csvfiles/waterlocations.csv | 6 +- 9 files changed, 147 insertions(+), 15 deletions(-) create mode 100644 csvfiles/patterns.csv diff --git a/build_dynamic_prompt.py b/build_dynamic_prompt.py index 3f921e8..ec1aba8 100644 --- a/build_dynamic_prompt.py +++ b/build_dynamic_prompt.py @@ -91,10 +91,11 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all firstnamelist = csv_to_list(csvfilename="firstnames",antilist=antilist,skipheader=True,gender=gender) floralist = csv_to_list("flora", antilist) printlist = csv_to_list("prints", antilist) + patternlist = csv_to_list("patterns", antilist) humanlist = fictionallist + nonfictionallist + humanoidlist objecttotallist = objectlist + buildinglist + vehiclelist + foodlist + spacelist + floralist + containerlist - outfitprinttotallist = objecttotallist + locationlist + colorlist + musicgenrelist + seasonlist + outfitprinttotallist = objecttotallist + locationlist + colorlist + musicgenrelist + seasonlist + animallist + patternlist # build artists list artistlist = [] @@ -1972,9 +1973,10 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all "-firstname-" in completeprompt or "-flora-" in completeprompt or "-print-" in completeprompt or - "-miniactivity-" in completeprompt): - allwildcardslistnohybrid = [ "-color-","-object-", "-animal-", "-fictional-","-nonfictional-","-building-","-vehicle-","-location-","-conceptprefix-","-food-","-haircolor-","-hairstyle-","-job-", "-accessory-", "-humanoid-", "-manwoman-", "-human-", "-colorscheme-", "-mood-", "-genderdescription-", "-artmovement-", "-malefemale-", "-bodytype-", "-minilocation-", "-minilocationaddition-", "-pose-", "-season-", "-minioutfit-", "-elaborateoutfit-", "-minivomit-", "-vomit-", "-rpgclass-", "-subjectfromfile-", "-brand-", "-space-", "-artist-", "-imagetype-", "-othertype-", "-quality-", "-lighting-", "-camera-", "-lens-","-imagetypequality-", "-poemline-", "-songline-", "-greatwork-", "-artistfantasy-", "-artistpopular-", "-artistromanticism-", "-artistphotography-", "-emoji-", "-timeperiod-", "-shotsize-", "-musicgenre-", "-animaladdition-", "-addontolocationinside-", "-addontolocation-", "-objectaddition-", "-humanaddition-", "-overalladdition-", "-focus-", "-direction-", "-styletilora-", "-manwomanrelation-", "-waterlocation-", "-container-", "-firstname-", "-flora-", "-print-", "-miniactivity-"] - allwildcardslistnohybridlists = [colorlist, objectlist, animallist, fictionallist, nonfictionallist, buildinglist, vehiclelist, locationlist,conceptprefixlist,foodlist,haircolorlist, hairstylelist,joblist, accessorielist, humanoidlist, manwomanlist, humanlist, colorschemelist, moodlist, genderdescriptionlist, artmovementlist, malefemalelist, bodytypelist, minilocationlist, minilocationadditionslist, poselist, seasonlist, minioutfitlist, elaborateoutfitlist, minivomitlist, vomitlist, rpgclasslist, customsubjectslist, brandlist, spacelist, artistlist, imagetypelist, othertypelist, qualitylist, lightinglist, cameralist, lenslist, imagetypequalitylist, poemlinelist, songlinelist, greatworklist, fantasyartistlist, popularartistlist, romanticismartistlist, photographyartistlist, emojilist, timeperiodlist, shotsizelist, musicgenrelist, animaladditionlist, addontolocationinsidelist, addontolocationlist, objectadditionslist, humanadditionlist, overalladditionlist, focuslist, directionlist, stylestiloralist, manwomanrelationlist, waterlocationlist, containerlist, firstnamelist, floralist, printlist, miniactivitylist] + "-miniactivity-" in completeprompt or + "-pattern-" in completeprompt): + allwildcardslistnohybrid = [ "-color-","-object-", "-animal-", "-fictional-","-nonfictional-","-building-","-vehicle-","-location-","-conceptprefix-","-food-","-haircolor-","-hairstyle-","-job-", "-accessory-", "-humanoid-", "-manwoman-", "-human-", "-colorscheme-", "-mood-", "-genderdescription-", "-artmovement-", "-malefemale-", "-bodytype-", "-minilocation-", "-minilocationaddition-", "-pose-", "-season-", "-minioutfit-", "-elaborateoutfit-", "-minivomit-", "-vomit-", "-rpgclass-", "-subjectfromfile-", "-brand-", "-space-", "-artist-", "-imagetype-", "-othertype-", "-quality-", "-lighting-", "-camera-", "-lens-","-imagetypequality-", "-poemline-", "-songline-", "-greatwork-", "-artistfantasy-", "-artistpopular-", "-artistromanticism-", "-artistphotography-", "-emoji-", "-timeperiod-", "-shotsize-", "-musicgenre-", "-animaladdition-", "-addontolocationinside-", "-addontolocation-", "-objectaddition-", "-humanaddition-", "-overalladdition-", "-focus-", "-direction-", "-styletilora-", "-manwomanrelation-", "-waterlocation-", "-container-", "-firstname-", "-flora-", "-print-", "-miniactivity-", "-pattern-"] + allwildcardslistnohybridlists = [colorlist, objectlist, animallist, fictionallist, nonfictionallist, buildinglist, vehiclelist, locationlist,conceptprefixlist,foodlist,haircolorlist, hairstylelist,joblist, accessorielist, humanoidlist, manwomanlist, humanlist, colorschemelist, moodlist, genderdescriptionlist, artmovementlist, malefemalelist, bodytypelist, minilocationlist, minilocationadditionslist, poselist, seasonlist, minioutfitlist, elaborateoutfitlist, minivomitlist, vomitlist, rpgclasslist, customsubjectslist, brandlist, spacelist, artistlist, imagetypelist, othertypelist, qualitylist, lightinglist, cameralist, lenslist, imagetypequalitylist, poemlinelist, songlinelist, greatworklist, fantasyartistlist, popularartistlist, romanticismartistlist, photographyartistlist, emojilist, timeperiodlist, shotsizelist, musicgenrelist, animaladditionlist, addontolocationinsidelist, addontolocationlist, objectadditionslist, humanadditionlist, overalladditionlist, focuslist, directionlist, stylestiloralist, manwomanrelationlist, waterlocationlist, containerlist, firstnamelist, floralist, printlist, miniactivitylist, patternlist] allwildcardslistwithhybrid = ["-material-", "-descriptor-", "-outfit-", "-conceptsuffix-","-culture-", "-objecttotal-", "-outfitprinttotal-"] allwildcardslistwithhybridlists = [materiallist, descriptorlist,outfitlist,conceptsuffixlist,culturelist, objecttotallist, outfitprinttotallist] @@ -2108,10 +2110,11 @@ def createpromptvariant(prompt = "", insanitylevel = 5, antivalues = "" , gender firstnamelist = csv_to_list(csvfilename="firstnames",antilist=antilist,skipheader=True,gender=gender) floralist = csv_to_list("flora", antilist) printlist = csv_to_list("prints", antilist) + patternlist = csv_to_list("patterns", antilist) humanlist = fictionallist + nonfictionallist + humanoidlist + malefemalelist + manwomanlist + manwomanrelationlist objecttotallist = objectlist + buildinglist + vehiclelist + foodlist + spacelist + floralist + containerlist - outfitprinttotallist = objecttotallist + locationlist + colorlist + musicgenrelist + seasonlist + outfitprinttotallist = objecttotallist + locationlist + colorlist + musicgenrelist + seasonlist + animallist + patternlist # build artists list artistlist = [] @@ -2370,6 +2373,8 @@ def createpromptvariant(prompt = "", insanitylevel = 5, antivalues = "" , gender prompt = prompt.replace(combination," -print- ") if lowercase_combination in [x.lower() for x in miniactivitylist] and chance_roll(insanitylevel, "uncommon"): prompt = prompt.replace(combination," -miniactivity- ") + if lowercase_combination in [x.lower() for x in patternlist] and chance_roll(insanitylevel, "uncommon"): + prompt = prompt.replace(combination," -pattern- ") if lowercase_combination in [x.lower() for x in fantasyartistlist] and chance_roll(insanitylevel, "uncommon"): @@ -2472,9 +2477,10 @@ def createpromptvariant(prompt = "", insanitylevel = 5, antivalues = "" , gender "-firstname-" in completeprompt or "-flora-" in completeprompt or "-print-" in completeprompt or - "-miniactivity-" in completeprompt): - allwildcardslistnohybrid = [ "-color-","-object-", "-animal-", "-fictional-","-nonfictional-","-building-","-vehicle-","-location-","-conceptprefix-","-food-","-haircolor-","-hairstyle-","-job-", "-accessory-", "-humanoid-", "-manwoman-", "-human-", "-colorscheme-", "-mood-", "-genderdescription-", "-artmovement-", "-malefemale-", "-bodytype-", "-minilocation-", "-minilocationaddition-", "-pose-", "-season-", "-minioutfit-", "-elaborateoutfit-", "-minivomit-", "-vomit-", "-rpgclass-", "-subjectfromfile-", "-brand-", "-space-", "-artist-", "-imagetype-", "-othertype-", "-quality-", "-lighting-", "-camera-", "-lens-","-imagetypequality-", "-poemline-", "-songline-", "-greatwork-", "-artistfantasy-", "-artistpopular-", "-artistromanticism-", "-artistphotography-", "-emoji-", "-timeperiod-", "-shotsize-", "-musicgenre-", "-animaladdition-", "-objectaddition-", "-humanaddition-", "-overalladdition-", "-focus-", "-direction-", "-styletilora-", "-manwomanrelation-", "-waterlocation-", "-container-", "-firstname-", "-flora-", "-print-", "-miniactivity-"] - allwildcardslistnohybridlists = [colorlist, objectlist, animallist, fictionallist, nonfictionallist, buildinglist, vehiclelist, locationlist,conceptprefixlist,foodlist,haircolorlist, hairstylelist,joblist, accessorielist, humanoidlist, manwomanlist, humanlist, colorschemelist, moodlist, genderdescriptionlist, artmovementlist, malefemalelist, bodytypelist, minilocationlist, minilocationadditionslist, poselist, seasonlist, minioutfitlist, elaborateoutfitlist, minivomitlist, vomitlist, rpgclasslist, customsubjectslist, brandlist, spacelist, artistlist, imagetypelist, othertypelist, qualitylist, lightinglist, cameralist, lenslist, imagetypequalitylist, poemlinelist, songlinelist, greatworklist, fantasyartistlist, popularartistlist, romanticismartistlist, photographyartistlist, emojilist, timeperiodlist, shotsizelist, musicgenrelist, animaladditionlist, objectadditionslist, humanadditionlist, overalladditionlist, focuslist, directionlist, stylestiloralist, manwomanrelationlist, waterlocationlist, containerlist, firstnamelist, floralist, printlist, miniactivitylist] + "-miniactivity-" in completeprompt or + "-pattern-" in completeprompt): + allwildcardslistnohybrid = [ "-color-","-object-", "-animal-", "-fictional-","-nonfictional-","-building-","-vehicle-","-location-","-conceptprefix-","-food-","-haircolor-","-hairstyle-","-job-", "-accessory-", "-humanoid-", "-manwoman-", "-human-", "-colorscheme-", "-mood-", "-genderdescription-", "-artmovement-", "-malefemale-", "-bodytype-", "-minilocation-", "-minilocationaddition-", "-pose-", "-season-", "-minioutfit-", "-elaborateoutfit-", "-minivomit-", "-vomit-", "-rpgclass-", "-subjectfromfile-", "-brand-", "-space-", "-artist-", "-imagetype-", "-othertype-", "-quality-", "-lighting-", "-camera-", "-lens-","-imagetypequality-", "-poemline-", "-songline-", "-greatwork-", "-artistfantasy-", "-artistpopular-", "-artistromanticism-", "-artistphotography-", "-emoji-", "-timeperiod-", "-shotsize-", "-musicgenre-", "-animaladdition-", "-objectaddition-", "-humanaddition-", "-overalladdition-", "-focus-", "-direction-", "-styletilora-", "-manwomanrelation-", "-waterlocation-", "-container-", "-firstname-", "-flora-", "-print-", "-miniactivity-", "-pattern-"] + allwildcardslistnohybridlists = [colorlist, objectlist, animallist, fictionallist, nonfictionallist, buildinglist, vehiclelist, locationlist,conceptprefixlist,foodlist,haircolorlist, hairstylelist,joblist, accessorielist, humanoidlist, manwomanlist, humanlist, colorschemelist, moodlist, genderdescriptionlist, artmovementlist, malefemalelist, bodytypelist, minilocationlist, minilocationadditionslist, poselist, seasonlist, minioutfitlist, elaborateoutfitlist, minivomitlist, vomitlist, rpgclasslist, customsubjectslist, brandlist, spacelist, artistlist, imagetypelist, othertypelist, qualitylist, lightinglist, cameralist, lenslist, imagetypequalitylist, poemlinelist, songlinelist, greatworklist, fantasyartistlist, popularartistlist, romanticismartistlist, photographyartistlist, emojilist, timeperiodlist, shotsizelist, musicgenrelist, animaladditionlist, objectadditionslist, humanadditionlist, overalladditionlist, focuslist, directionlist, stylestiloralist, manwomanrelationlist, waterlocationlist, containerlist, firstnamelist, floralist, printlist, miniactivitylist, patternlist] allwildcardslistwithhybrid = ["-material-", "-descriptor-", "-outfit-", "-conceptsuffix-","-culture-", "-objecttotal-", "-outfitprinttotal-"] allwildcardslistwithhybridlists = [materiallist, descriptorlist,outfitlist,conceptsuffixlist,culturelist, objecttotallist, outfitprinttotallist] diff --git a/csvfiles/brands.csv b/csvfiles/brands.csv index 7651aed..39c3f1d 100644 --- a/csvfiles/brands.csv +++ b/csvfiles/brands.csv @@ -14,6 +14,7 @@ Mercedes-Benz Audi Tesla Jaguar +Toyota Aston Martin Rolls-Royce Bugatti @@ -29,4 +30,52 @@ The Hunger Games Pirates of the Caribbean Star Trek Studio Ghibli -Akira manga \ No newline at end of file +Akira manga +Lego +Nike +Adidas +ZARA +H&M +Dior +UNIQLO +Cartier +Rolex +Ray-Ban +Victoria's Secret +Levi's +Apple computers +Amazon +Microsoft +Coca-Cola +Disney +McDonalds +Samsung +Facebook +Starbucks +Pepsi +Visa +Intel +Netflix +Google +Nintendo +Vans +Rockstar games +Xbox +Playstation +Tesla +Nvidia +Audi +Red bull +Sephora +Adobe +Unilever +Bungie +Hilton +Bose +Warner Brothers +Elves +Dwarves +Orcs +Trolls +Gnomes +Goblins \ No newline at end of file diff --git a/csvfiles/human_activities.csv b/csvfiles/human_activities.csv index fdd6125..2b4b34b 100644 --- a/csvfiles/human_activities.csv +++ b/csvfiles/human_activities.csv @@ -159,4 +159,5 @@ Sailing Triathlon -animal-back riding having a tea party -Lounging \ No newline at end of file +Lounging +Bathing in a -waterlocation- \ No newline at end of file diff --git a/csvfiles/patterns.csv b/csvfiles/patterns.csv new file mode 100644 index 0000000..278e68f --- /dev/null +++ b/csvfiles/patterns.csv @@ -0,0 +1,64 @@ +stripes +horizontal stripes +vertical stripes +diagonal stripes +pinstripe +herringbone +regimental +barcode +awning +bayadere +argyle +Basketweave +Plaid +Checkerboard +Harlequin +Tartan +Dupplin +Houndstooth +Tattersall +Madras +Cheetah +Leopard +Peacock +Snake +Tiger +Giraffe +Tortoise shell +Zebra +Jaguar +Floral +Abstract +Calico +Anthemion +Ditsy +Retro +Damask +Acanthus +Paisley +Vintage +Art Nouveau +Baroque +Western +Liberty +Botanical +Mandala +Wreath +Mathematical +Circles +Squares +Triangles +Celtic knot +Scales +Zellige +Geometric +Network +Trellis +Boteh +Chevron +croquis +zalij +Dots +Dotted swiss +smooth +Edgy \ No newline at end of file diff --git a/csvfiles/prints.csv b/csvfiles/prints.csv index 33af283..7635f1c 100644 --- a/csvfiles/prints.csv +++ b/csvfiles/prints.csv @@ -2,4 +2,7 @@ print patterns images details -accessories \ No newline at end of file +accessories +trimmings +designs +embroidery \ No newline at end of file diff --git a/csvfiles/special_lists/buildoutfit.csv b/csvfiles/special_lists/buildoutfit.csv index 37f77d8..3d7cc62 100644 --- a/csvfiles/special_lists/buildoutfit.csv +++ b/csvfiles/special_lists/buildoutfit.csv @@ -17,4 +17,6 @@ -minioutfit- designed by -brand- -material- -descriptor- -outfit- with -outfitprinttotal- -print- --material- -minioutfit- with -outfitprinttotal- -print- \ No newline at end of file +-material- -minioutfit- with -outfitprinttotal- -print- +-color- -outfit- with -material- -print- +-outfit- in -pattern- -print- \ No newline at end of file diff --git a/csvfiles/special_lists/miniactivity.csv b/csvfiles/special_lists/miniactivity.csv index 97cf5d6..1aea272 100644 --- a/csvfiles/special_lists/miniactivity.csv +++ b/csvfiles/special_lists/miniactivity.csv @@ -5,4 +5,6 @@ Jumping Visiting Frolicking Sitting -Lounging \ No newline at end of file +Lounging +Laying +Standing \ No newline at end of file diff --git a/csvfiles/special_lists/objectadditions.csv b/csvfiles/special_lists/objectadditions.csv index e6c0d28..d2f5dfe 100644 --- a/csvfiles/special_lists/objectadditions.csv +++ b/csvfiles/special_lists/objectadditions.csv @@ -12,4 +12,5 @@ smooth designed by -brand- made from -space- made from -flora- -anthropomorphic \ No newline at end of file +anthropomorphic +with -pattern- -print- \ No newline at end of file diff --git a/csvfiles/waterlocations.csv b/csvfiles/waterlocations.csv index 60ac69a..1cbdace 100644 --- a/csvfiles/waterlocations.csv +++ b/csvfiles/waterlocations.csv @@ -30,4 +30,8 @@ Spa Thermal baths Thermae -culture- bath -Rainstorm \ No newline at end of file +Rainstorm +Laguna +Island +Archipelago +Reef \ No newline at end of file