From fc15fb4473bbfd8c8ac6cc0db1df50fee8ad9aab Mon Sep 17 00:00:00 2001 From: AIrjen Date: Sun, 20 Aug 2023 10:03:24 +0200 Subject: [PATCH 1/4] listworks Since it is been a while to do the fun stuff --- build_dynamic_prompt.py | 35 ++++++++++++++++---------- csvfiles/jobs.csv | 3 ++- csvfiles/prints.csv | 5 ++++ csvfiles/special_lists/buildoutfit.csv | 4 ++- csvfiles/waterlocations.csv | 3 ++- prompttester.py | 2 +- 6 files changed, 35 insertions(+), 17 deletions(-) create mode 100644 csvfiles/prints.csv diff --git a/build_dynamic_prompt.py b/build_dynamic_prompt.py index 3bf6bbf..b683d88 100644 --- a/build_dynamic_prompt.py +++ b/build_dynamic_prompt.py @@ -90,9 +90,11 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all containerlist = csv_to_list("containers", antilist) firstnamelist = csv_to_list(csvfilename="firstnames",antilist=antilist,skipheader=True,gender=gender) floralist = csv_to_list("flora", antilist) + printlist = csv_to_list("prints", antilist) humanlist = fictionallist + nonfictionallist + humanoidlist - objecttotallist = objectlist + buildinglist + vehiclelist + foodlist + spacelist + floralist + objecttotallist = objectlist + buildinglist + vehiclelist + foodlist + spacelist + floralist + containerlist + outfitprinttotallist = objecttotallist + locationlist + colorlist + musicgenrelist + seasonlist # build artists list artistlist = [] @@ -1921,6 +1923,7 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all "-artmovement-" in completeprompt or "-malefemale-" in completeprompt or "-objecttotal-" in completeprompt or + "-outfitprinttotal-" in completeprompt or "-bodytype-" in completeprompt or "-minilocation-" in completeprompt or "-minilocationaddition-" in completeprompt or @@ -1966,12 +1969,13 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all "-waterlocation-" in completeprompt or "-container-" in completeprompt or "-firstname-" in completeprompt or - "-flora-" 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-"] - 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] + "-flora-" in completeprompt or + "-print-" 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-"] + 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] - allwildcardslistwithhybrid = ["-material-", "-descriptor-", "-outfit-", "-conceptsuffix-","-culture-", "-objecttotal-"] - allwildcardslistwithhybridlists = [materiallist, descriptorlist,outfitlist,conceptsuffixlist,culturelist, objecttotallist] + allwildcardslistwithhybrid = ["-material-", "-descriptor-", "-outfit-", "-conceptsuffix-","-culture-", "-objecttotal-", "-outfitprinttotal-"] + allwildcardslistwithhybridlists = [materiallist, descriptorlist,outfitlist,conceptsuffixlist,culturelist, objecttotallist, outfitprinttotallist] # keywordsinstring = any(word.lower() in givensubject.lower() for word in keywordslist) @@ -2101,9 +2105,11 @@ def createpromptvariant(prompt = "", insanitylevel = 5, antivalues = "" , gender containerlist = csv_to_list("containers", antilist) firstnamelist = csv_to_list(csvfilename="firstnames",antilist=antilist,skipheader=True,gender=gender) floralist = csv_to_list("flora", antilist) + printlist = csv_to_list("prints", antilist) humanlist = fictionallist + nonfictionallist + humanoidlist + malefemalelist + manwomanlist + manwomanrelationlist - objecttotallist = objectlist + buildinglist + vehiclelist + foodlist + spacelist + floralist + objecttotallist = objectlist + buildinglist + vehiclelist + foodlist + spacelist + floralist + containerlist + outfitprinttotallist = objecttotallist + locationlist + colorlist + musicgenrelist + seasonlist # build artists list artistlist = [] @@ -2357,7 +2363,8 @@ def createpromptvariant(prompt = "", insanitylevel = 5, antivalues = "" , gender prompt = prompt.replace(combination," -firstname- ") if lowercase_combination in [x.lower() for x in floralist] and chance_roll(insanitylevel, "uncommon"): prompt = prompt.replace(combination," -flora- ") - + if lowercase_combination in [x.lower() for x in printlist] and chance_roll(insanitylevel, "uncommon"): + prompt = prompt.replace(combination," -print- ") if lowercase_combination in [x.lower() for x in fantasyartistlist] and chance_roll(insanitylevel, "uncommon"): @@ -2414,6 +2421,7 @@ def createpromptvariant(prompt = "", insanitylevel = 5, antivalues = "" , gender "-artmovement-" in completeprompt or "-malefemale-" in completeprompt or "-objecttotal-" in completeprompt or + "-outfitprinttotal-" in completeprompt or "-bodytype-" in completeprompt or "-minilocation-" in completeprompt or "-minilocationaddition-" in completeprompt or @@ -2457,12 +2465,13 @@ def createpromptvariant(prompt = "", insanitylevel = 5, antivalues = "" , gender "-waterlocation-" in completeprompt or "-container-" in completeprompt or "-firstname-" in completeprompt or - "-flora-" 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-"] - 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] + "-flora-" in completeprompt or + "-print-" 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-"] + 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] - allwildcardslistwithhybrid = ["-material-", "-descriptor-", "-outfit-", "-conceptsuffix-","-culture-", "-objecttotal-"] - allwildcardslistwithhybridlists = [materiallist, descriptorlist,outfitlist,conceptsuffixlist,culturelist, objecttotallist] + allwildcardslistwithhybrid = ["-material-", "-descriptor-", "-outfit-", "-conceptsuffix-","-culture-", "-objecttotal-", "-outfitprinttotal-"] + allwildcardslistwithhybridlists = [materiallist, descriptorlist,outfitlist,conceptsuffixlist,culturelist, objecttotallist, outfitprinttotallist] # keywordsinstring = any(word.lower() in givensubject.lower() for word in keywordslist) diff --git a/csvfiles/jobs.csv b/csvfiles/jobs.csv index d5a27da..800d8bd 100644 --- a/csvfiles/jobs.csv +++ b/csvfiles/jobs.csv @@ -368,4 +368,5 @@ Construction worker Idol Nerd Geek -Muse \ No newline at end of file +Muse +Ballerina \ No newline at end of file diff --git a/csvfiles/prints.csv b/csvfiles/prints.csv new file mode 100644 index 0000000..33af283 --- /dev/null +++ b/csvfiles/prints.csv @@ -0,0 +1,5 @@ +print +patterns +images +details +accessories \ No newline at end of file diff --git a/csvfiles/special_lists/buildoutfit.csv b/csvfiles/special_lists/buildoutfit.csv index 0451d5a..37f77d8 100644 --- a/csvfiles/special_lists/buildoutfit.csv +++ b/csvfiles/special_lists/buildoutfit.csv @@ -15,4 +15,6 @@ -season- -minioutfit- -animal--style -outfit- -minioutfit- designed by -brand- --material- \ No newline at end of file +-material- +-descriptor- -outfit- with -outfitprinttotal- -print- +-material- -minioutfit- with -outfitprinttotal- -print- \ No newline at end of file diff --git a/csvfiles/waterlocations.csv b/csvfiles/waterlocations.csv index 18c64fb..60ac69a 100644 --- a/csvfiles/waterlocations.csv +++ b/csvfiles/waterlocations.csv @@ -29,4 +29,5 @@ Sauna Spa Thermal baths Thermae --culture- bath \ No newline at end of file +-culture- bath +Rainstorm \ No newline at end of file diff --git a/prompttester.py b/prompttester.py index 9d4495e..a6ce53f 100644 --- a/prompttester.py +++ b/prompttester.py @@ -46,4 +46,4 @@ def generateprompts(amount = 1,insanitylevel="5",subject="all", artist="all", im print("") print("All done!") -generateprompts(10,9,"humanoid","all","all",False,"","","PREFIXPROMPT" ,"SUFFIXPROMPT","",1,"","",True,"",100, "all", "all", "all", "all", False, True) \ No newline at end of file +generateprompts(10,8,"humanoid","all","all",False,"","","PREFIXPROMPT" ,"SUFFIXPROMPT","",1,"","",True,"",100, "all", "all", "all", "all", False, True) \ No newline at end of file From 1815232437efd7a5a4038be9a7294093441c22c8 Mon Sep 17 00:00:00 2001 From: AIrjen Date: Sun, 20 Aug 2023 10:29:18 +0200 Subject: [PATCH 2/4] more stuff added --- build_dynamic_prompt.py | 18 ++++++++++++------ csvfiles/directions.csv | 3 ++- csvfiles/hairstyles.csv | 1 + csvfiles/human_activities.csv | 3 ++- csvfiles/objects.csv | 6 ++++-- csvfiles/special_lists/animaladditions.csv | 3 ++- csvfiles/special_lists/humanadditions.csv | 6 +++--- csvfiles/special_lists/miniactivity.csv | 8 ++++++++ csvfiles/special_lists/objectadditions.csv | 3 ++- csvfiles/vomit.csv | 1 + 10 files changed, 37 insertions(+), 15 deletions(-) create mode 100644 csvfiles/special_lists/miniactivity.csv diff --git a/build_dynamic_prompt.py b/build_dynamic_prompt.py index b683d88..3f921e8 100644 --- a/build_dynamic_prompt.py +++ b/build_dynamic_prompt.py @@ -142,6 +142,7 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all minilocationadditionslist = csv_to_list("minilocationadditions", antilist,"./csvfiles/special_lists/") overalladditionlist = csv_to_list("overalladditions", antilist,"./csvfiles/special_lists/") imagetypemodelist = csv_to_list("imagetypemodes", antilist,"./csvfiles/special_lists/") + miniactivitylist = csv_to_list("miniactivity", antilist,"./csvfiles/special_lists/") styleslist = csv_to_list("styles", antilist,"./csvfiles/templates/") @@ -1970,9 +1971,10 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all "-container-" in completeprompt or "-firstname-" in completeprompt or "-flora-" in completeprompt or - "-print-" 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-"] - 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] + "-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] allwildcardslistwithhybrid = ["-material-", "-descriptor-", "-outfit-", "-conceptsuffix-","-culture-", "-objecttotal-", "-outfitprinttotal-"] allwildcardslistwithhybridlists = [materiallist, descriptorlist,outfitlist,conceptsuffixlist,culturelist, objecttotallist, outfitprinttotallist] @@ -2157,6 +2159,7 @@ def createpromptvariant(prompt = "", insanitylevel = 5, antivalues = "" , gender minilocationadditionslist = csv_to_list("minilocationadditions", antilist,"./csvfiles/special_lists/") overalladditionlist = csv_to_list("overalladditions", antilist,"./csvfiles/special_lists/") imagetypemodelist = csv_to_list("imagetypemodes", antilist,"./csvfiles/special_lists/") + miniactivitylist = csv_to_list("miniactivity", antilist,"./csvfiles/special_lists/") prompt = prompt.replace(",", " , ") @@ -2365,6 +2368,8 @@ def createpromptvariant(prompt = "", insanitylevel = 5, antivalues = "" , gender prompt = prompt.replace(combination," -flora- ") if lowercase_combination in [x.lower() for x in printlist] and chance_roll(insanitylevel, "uncommon"): 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 fantasyartistlist] and chance_roll(insanitylevel, "uncommon"): @@ -2466,9 +2471,10 @@ def createpromptvariant(prompt = "", insanitylevel = 5, antivalues = "" , gender "-container-" in completeprompt or "-firstname-" in completeprompt or "-flora-" in completeprompt or - "-print-" 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-"] - 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] + "-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] allwildcardslistwithhybrid = ["-material-", "-descriptor-", "-outfit-", "-conceptsuffix-","-culture-", "-objecttotal-", "-outfitprinttotal-"] allwildcardslistwithhybridlists = [materiallist, descriptorlist,outfitlist,conceptsuffixlist,culturelist, objecttotallist, outfitprinttotallist] diff --git a/csvfiles/directions.csv b/csvfiles/directions.csv index 4da1748..68b84f4 100644 --- a/csvfiles/directions.csv +++ b/csvfiles/directions.csv @@ -17,4 +17,5 @@ Visual novel Movie still Anime screencap Overdetailed art -ultrafine detailed \ No newline at end of file +ultrafine detailed +Fine art \ No newline at end of file diff --git a/csvfiles/hairstyles.csv b/csvfiles/hairstyles.csv index 49c580c..d619eea 100644 --- a/csvfiles/hairstyles.csv +++ b/csvfiles/hairstyles.csv @@ -29,6 +29,7 @@ Curly Curtain bangs Dreadlocks Dreadlocks +Drill Dutch braid Faux hawk Fauxhawk diff --git a/csvfiles/human_activities.csv b/csvfiles/human_activities.csv index 9d6c3de..fdd6125 100644 --- a/csvfiles/human_activities.csv +++ b/csvfiles/human_activities.csv @@ -158,4 +158,5 @@ Rowing Sailing Triathlon -animal-back riding -having a tea party \ No newline at end of file +having a tea party +Lounging \ No newline at end of file diff --git a/csvfiles/objects.csv b/csvfiles/objects.csv index 9371150..e34bdc5 100644 --- a/csvfiles/objects.csv +++ b/csvfiles/objects.csv @@ -281,7 +281,7 @@ Fractal Pentagram -conceptsuffix-potion Roast beef --object- in a bottle +-object- in a -container- Faberge egg Quilt Circlet @@ -321,4 +321,6 @@ Paraboloid Hyperboloid Mobius strip Klein bottle -Sphericon \ No newline at end of file +Sphericon +Totem +-material- Totem \ No newline at end of file diff --git a/csvfiles/special_lists/animaladditions.csv b/csvfiles/special_lists/animaladditions.csv index e84528b..937f271 100644 --- a/csvfiles/special_lists/animaladditions.csv +++ b/csvfiles/special_lists/animaladditions.csv @@ -3,4 +3,5 @@ were giant monster head of a -hybrid \ No newline at end of file +hybrid +anthropomorphic \ No newline at end of file diff --git a/csvfiles/special_lists/humanadditions.csv b/csvfiles/special_lists/humanadditions.csv index c1fa9eb..9534de4 100644 --- a/csvfiles/special_lists/humanadditions.csv +++ b/csvfiles/special_lists/humanadditions.csv @@ -1,8 +1,6 @@ riding a -animal- holding a -object- driving a -vehicle- -visiting a -building- -visiting -location- with a -animal- surrounded by -object-s surrounded by -flora-s @@ -15,7 +13,9 @@ with -color- skin with -material- skin feeling -mood- expression is -mood- -bathing in a -waterlocation- +-miniactivity- in a -waterlocation- +-miniactivity- at a -location- +-miniactivity- in a -building- -pose- under a -waterlocation- , torn -minioutfit- wearing -elaborateoutfit- diff --git a/csvfiles/special_lists/miniactivity.csv b/csvfiles/special_lists/miniactivity.csv new file mode 100644 index 0000000..97cf5d6 --- /dev/null +++ b/csvfiles/special_lists/miniactivity.csv @@ -0,0 +1,8 @@ +Dancing +Walking +Running +Jumping +Visiting +Frolicking +Sitting +Lounging \ No newline at end of file diff --git a/csvfiles/special_lists/objectadditions.csv b/csvfiles/special_lists/objectadditions.csv index 61bcc7c..e6c0d28 100644 --- a/csvfiles/special_lists/objectadditions.csv +++ b/csvfiles/special_lists/objectadditions.csv @@ -11,4 +11,5 @@ intricate details smooth designed by -brand- made from -space- -made from -flora- \ No newline at end of file +made from -flora- +anthropomorphic \ No newline at end of file diff --git a/csvfiles/vomit.csv b/csvfiles/vomit.csv index 861704e..3f907cf 100644 --- a/csvfiles/vomit.csv +++ b/csvfiles/vomit.csv @@ -81,6 +81,7 @@ Movie concept art multidimensional National Geographic opulent +Orton effect otherworldly overlapping compositions overly complex style From 7925cbe765602652d1b9309466959f2ea1693349 Mon Sep 17 00:00:00 2001 From: AIrjen Date: Mon, 21 Aug 2023 19:25:39 +0200 Subject: [PATCH 3/4] 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 From c3dc1f1cc655445cc9bed660757e343ae5aa095d Mon Sep 17 00:00:00 2001 From: AIrjen Date: Mon, 21 Aug 2023 20:32:51 +0200 Subject: [PATCH 4/4] Adding animal stuff and chairs! --- build_dynamic_prompt.py | 21 ++++++++-- csvfiles/accessories.csv | 3 +- csvfiles/chairs.csv | 40 +++++++++++++++++++ csvfiles/prints.csv | 4 +- .../special_lists/animalsuffixadditions.csv | 15 +++++++ csvfiles/special_lists/humanadditions.csv | 6 +-- csvfiles/special_lists/miniactivity.csv | 3 +- csvfiles/special_lists/overalladditions.csv | 1 + prompttester.py | 2 +- 9 files changed, 84 insertions(+), 11 deletions(-) create mode 100644 csvfiles/chairs.csv create mode 100644 csvfiles/special_lists/animalsuffixadditions.csv diff --git a/build_dynamic_prompt.py b/build_dynamic_prompt.py index ec1aba8..aa1896f 100644 --- a/build_dynamic_prompt.py +++ b/build_dynamic_prompt.py @@ -92,6 +92,7 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all floralist = csv_to_list("flora", antilist) printlist = csv_to_list("prints", antilist) patternlist = csv_to_list("patterns", antilist) + chairlist = csv_to_list("chairs", antilist) humanlist = fictionallist + nonfictionallist + humanoidlist objecttotallist = objectlist + buildinglist + vehiclelist + foodlist + spacelist + floralist + containerlist @@ -144,6 +145,7 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all overalladditionlist = csv_to_list("overalladditions", antilist,"./csvfiles/special_lists/") imagetypemodelist = csv_to_list("imagetypemodes", antilist,"./csvfiles/special_lists/") miniactivitylist = csv_to_list("miniactivity", antilist,"./csvfiles/special_lists/") + animalsuffixadditionlist = csv_to_list("animalsuffixadditions", antilist,"./csvfiles/special_lists/") styleslist = csv_to_list("styles", antilist,"./csvfiles/templates/") @@ -1328,6 +1330,8 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all if(animaladdedsomething != 1): completeprompt += "-animal- " + + if(hybridorswap == "hybrid"): if(uncommon_dist(insanitylevel)): completeprompt += "|" + random.choice(hybridlist) + "] " @@ -1345,6 +1349,10 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all # completion of strenght end completeprompt += "-objectstrengthend-" + + if(legendary_dist(insanitylevel)): + animaladdedsomething = 1 + completeprompt += "-animalsuffixaddition- " # if we have a given subject, we should skip making an actual subject if(mainchooser == "humanoid"): @@ -1974,9 +1982,11 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all "-flora-" in completeprompt or "-print-" in completeprompt or "-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] + "-pattern-" in completeprompt or + "-animalsuffixaddition-" in completeprompt or + "-chair-" 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-", "-animalsuffixaddition-", "-chair-"] + 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, animalsuffixadditionlist, chairlist] allwildcardslistwithhybrid = ["-material-", "-descriptor-", "-outfit-", "-conceptsuffix-","-culture-", "-objecttotal-", "-outfitprinttotal-"] allwildcardslistwithhybridlists = [materiallist, descriptorlist,outfitlist,conceptsuffixlist,culturelist, objecttotallist, outfitprinttotallist] @@ -2111,6 +2121,7 @@ def createpromptvariant(prompt = "", insanitylevel = 5, antivalues = "" , gender floralist = csv_to_list("flora", antilist) printlist = csv_to_list("prints", antilist) patternlist = csv_to_list("patterns", antilist) + chairlist = csv_to_list("chairs", antilist) humanlist = fictionallist + nonfictionallist + humanoidlist + malefemalelist + manwomanlist + manwomanrelationlist objecttotallist = objectlist + buildinglist + vehiclelist + foodlist + spacelist + floralist + containerlist @@ -2251,7 +2262,7 @@ def createpromptvariant(prompt = "", insanitylevel = 5, antivalues = "" , gender if lowercase_combination in [x.lower() for x in accessorielist] and chance_roll(insanitylevel, "uncommon"): - prompt = prompt.replace(combination," -accessorie- ") + prompt = prompt.replace(combination," -accessory- ") if lowercase_combination in [x.lower() for x in artmovementlist] and chance_roll(insanitylevel, "uncommon"): @@ -2375,6 +2386,8 @@ def createpromptvariant(prompt = "", insanitylevel = 5, antivalues = "" , gender 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 chairlist] and chance_roll(insanitylevel, "uncommon"): + prompt = prompt.replace(combination," -chair- ") if lowercase_combination in [x.lower() for x in fantasyartistlist] and chance_roll(insanitylevel, "uncommon"): diff --git a/csvfiles/accessories.csv b/csvfiles/accessories.csv index e1e2db3..4d5ef22 100644 --- a/csvfiles/accessories.csv +++ b/csvfiles/accessories.csv @@ -150,4 +150,5 @@ Body Tattoos Face Tattoos Tattoos Tribal Tattoos -Geass \ No newline at end of file +Geass +Shoulder pads \ No newline at end of file diff --git a/csvfiles/chairs.csv b/csvfiles/chairs.csv new file mode 100644 index 0000000..36b9d6e --- /dev/null +++ b/csvfiles/chairs.csv @@ -0,0 +1,40 @@ +Chair +Sofa +Couch +Stool +Bench +Bed +Ottoman +Rocking chair +Recliner +Armchair +Bar stool +Bean bag +Chaise lounge +Dining chair +Loveseat +Window seat +Hammock +Swing +Floor cushion +Pouf +Folding chair +Deck chair +Picnic blanket +Outdoor cushion +Piano bench +Footstool +Inflatable chair +Meditation cushion +Campfire log +Beach chair +Tree stump +Park bench +Porch swing +Throne +Swing chair +Sackcloth +Backless bench +Tire swing +Lounge chair +Clouds \ No newline at end of file diff --git a/csvfiles/prints.csv b/csvfiles/prints.csv index 7635f1c..52ea566 100644 --- a/csvfiles/prints.csv +++ b/csvfiles/prints.csv @@ -5,4 +5,6 @@ details accessories trimmings designs -embroidery \ No newline at end of file +embroidery +ornaments +adornments \ No newline at end of file diff --git a/csvfiles/special_lists/animalsuffixadditions.csv b/csvfiles/special_lists/animalsuffixadditions.csv new file mode 100644 index 0000000..6bdf3bf --- /dev/null +++ b/csvfiles/special_lists/animalsuffixadditions.csv @@ -0,0 +1,15 @@ +with -material- wings +with -material- tail +with -material- ears +-animal- hybrid +with -animal- skin +with -pattern- skin +wearing a -accessory- +with -pattern- -print- +with -color- details +with -material- -minioutfit- +with -descriptor- parts +-miniactivity- at a -location- +-miniactivity- in a -building- +- -humanoid- +looking like a -objecttotal- \ No newline at end of file diff --git a/csvfiles/special_lists/humanadditions.csv b/csvfiles/special_lists/humanadditions.csv index 9534de4..609c9fd 100644 --- a/csvfiles/special_lists/humanadditions.csv +++ b/csvfiles/special_lists/humanadditions.csv @@ -16,10 +16,10 @@ expression is -mood- -miniactivity- in a -waterlocation- -miniactivity- at a -location- -miniactivity- in a -building- --pose- under a -waterlocation- , torn -minioutfit- wearing -elaborateoutfit- -animal- hybrid as -culture- -rpgclass- -sitting in a -descriptor- chair -inside a -container- \ No newline at end of file +sitting in a -descriptor- -chair- +inside a -container- +- -humanoid- \ No newline at end of file diff --git a/csvfiles/special_lists/miniactivity.csv b/csvfiles/special_lists/miniactivity.csv index 1aea272..0202663 100644 --- a/csvfiles/special_lists/miniactivity.csv +++ b/csvfiles/special_lists/miniactivity.csv @@ -7,4 +7,5 @@ Frolicking Sitting Lounging Laying -Standing \ No newline at end of file +Standing +-pose- \ No newline at end of file diff --git a/csvfiles/special_lists/overalladditions.csv b/csvfiles/special_lists/overalladditions.csv index db0b502..9997a1b 100644 --- a/csvfiles/special_lists/overalladditions.csv +++ b/csvfiles/special_lists/overalladditions.csv @@ -21,6 +21,7 @@ in -culture- city street covered in -color- paint, dripping paint designed by -brand- in style of -brand- +forged by -brand- overgrown with plants and -color- flowers cyberpunk style, neo-tokyo, -color- neon highlights designed as a -culture- rug from fiber diff --git a/prompttester.py b/prompttester.py index a6ce53f..740e767 100644 --- a/prompttester.py +++ b/prompttester.py @@ -46,4 +46,4 @@ def generateprompts(amount = 1,insanitylevel="5",subject="all", artist="all", im print("") print("All done!") -generateprompts(10,8,"humanoid","all","all",False,"","","PREFIXPROMPT" ,"SUFFIXPROMPT","",1,"","",True,"",100, "all", "all", "all", "all", False, True) \ No newline at end of file +generateprompts(10,8,"all","all","all",False,"","","PREFIXPROMPT" ,"SUFFIXPROMPT","",1,"","",True,"",100, "all", "all", "all", "all", False, True) \ No newline at end of file