nodes/AIrjen-OneButtonPrompt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

List improvements

Browse Source 
Adding coverings as well
This commit is contained in:
AIrjen
2023-09-23 14:09:43 +02:00
parent 34cee9b2cc
commit 6e10c38bca
10 changed files with 91 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build_dynamic_prompt.py
+12 -6
View File
@@ -104,6 +104,7 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all
patternlist = csv_to_list("patterns", antilist)
chairlist = csv_to_list("chairs", antilist)
cardnamelist = csv_to_list("card_names", antilist)
coveringlist = csv_to_list("coverings", antilist)
humanlist = fictionallist + nonfictionallist + humanoidlist
objecttotallist = objectlist + buildinglist + vehiclelist + foodlist + spacelist + floralist + containerlist
@@ -2020,9 +2021,10 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all
"-pattern-" in completeprompt or
"-animalsuffixaddition-" in completeprompt or
"-chair-" in completeprompt or
"-cardname-" 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-", "-cardname-"]
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, cardnamelist]
"-cardname-" in completeprompt or
"-covering-" 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-", "-cardname-", "-covering-"]
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, cardnamelist, coveringlist]
allwildcardslistwithhybrid = ["-material-", "-descriptor-", "-outfit-", "-conceptsuffix-","-culture-", "-objecttotal-", "-outfitprinttotal-"]
allwildcardslistwithhybridlists = [materiallist, descriptorlist,outfitlist,conceptsuffixlist,culturelist, objecttotallist, outfitprinttotallist]
@@ -2173,6 +2175,7 @@ def createpromptvariant(prompt = "", insanitylevel = 5, antivalues = "" , gender
patternlist = csv_to_list("patterns", antilist)
chairlist = csv_to_list("chairs", antilist)
cardnamelist = csv_to_list("card_names", antilist)
coveringlist = csv_to_list("coverings", antilist)
humanlist = fictionallist + nonfictionallist + humanoidlist + malefemalelist + manwomanlist + manwomanrelationlist
objecttotallist = objectlist + buildinglist + vehiclelist + foodlist + spacelist + floralist + containerlist
@@ -2441,6 +2444,8 @@ def createpromptvariant(prompt = "", insanitylevel = 5, antivalues = "" , gender
prompt = prompt.replace(combination," -chair- ")
if lowercase_combination in [x.lower() for x in cardnamelist] and chance_roll(insanitylevel, "uncommon"):
prompt = prompt.replace(combination," -cardname- ")
if lowercase_combination in [x.lower() for x in coveringlist] and chance_roll(insanitylevel, "uncommon"):
prompt = prompt.replace(combination," -covering- ")
if lowercase_combination in [x.lower() for x in fantasyartistlist] and chance_roll(insanitylevel, "uncommon"):
@@ -2546,9 +2551,10 @@ def createpromptvariant(prompt = "", insanitylevel = 5, antivalues = "" , gender
"-miniactivity-" in completeprompt or
"-pattern-" in completeprompt or
"-chair-" in completeprompt or
"-cardname-" 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-", "-chair-", "-cardname-"]
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, chairlist, cardnamelist]
"-cardname-" in completeprompt or
"-covering-" 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-", "-chair-", "-cardname-", "-covering-"]
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, chairlist, cardnamelist, coveringlist]
allwildcardslistwithhybrid = ["-material-", "-descriptor-", "-outfit-", "-conceptsuffix-","-culture-", "-objecttotal-", "-outfitprinttotal-"]
allwildcardslistwithhybridlists = [materiallist, descriptorlist,outfitlist,conceptsuffixlist,culturelist, objecttotallist, outfitprinttotallist]
csvfiles/brands.csv
+4 -1
View File
@@ -78,4 +78,7 @@ Dwarves
Orcs
Trolls
Gnomes
Goblins
Goblins
Blizzard entertainment
Riot games
Mugler
1 Gucci
78 Orcs
79 Trolls
80 Gnomes
81 Goblins
82 Blizzard entertainment
83 Riot games
84 Mugler
csvfiles/containers.csv
+2 -1
View File
@@ -25,4 +25,5 @@ Paperweight
Glass canister
Machine
Glass case
Display case
Display case
Museum glass
1 Bottle
25 Glass canister
26 Machine
27 Glass case
28 Display case
29 Museum glass
csvfiles/coverings.csv
+45
View File
@@ -0,0 +1,45 @@
Runes
Snow
Foam
Water
Colors
Mud
Dirt
Spikes
Jewels
Flowers
Flora
Fire
Frost
Ash
Sand
Leaves
Fur
Insects
Rust
Ice
Soot
Paint
Vines
Cobwebs
Tar
Glitter
Graffiti
Fabric
Moss
Fog
Powder
Stickers
Posters
Vinyl
Decals
Stencils
Ink
Stains
Graffiti
Feathers
Oil
Dust
Rubble
Seashells
Flames
1 Runes
2 Snow
3 Foam
4 Water
5 Colors
6 Mud
7 Dirt
8 Spikes
9 Jewels
10 Flowers
11 Flora
12 Fire
13 Frost
14 Ash
15 Sand
16 Leaves
17 Fur
18 Insects
19 Rust
20 Ice
21 Soot
22 Paint
23 Vines
24 Cobwebs
25 Tar
26 Glitter
27 Graffiti
28 Fabric
29 Moss
30 Fog
31 Powder
32 Stickers
33 Posters
34 Vinyl
35 Decals
36 Stencils
37 Ink
38 Stains
39 Graffiti
40 Feathers
41 Oil
42 Dust
43 Rubble
44 Seashells
45 Flames
csvfiles/cultures.csv
+14 -1
View File
@@ -219,4 +219,17 @@ Elvish
Dwarven
Peasant
hip-hop
Urban
Urban
Parisien
Cosplayer
Gamer
Steerage
Preppy
Rasta
Punks
Metalhead
Skater
Hipster
Northern
Southern
Arcadian
1 Japanese
219 Dwarven
220 Peasant
221 hip-hop
222 Urban
223 Parisien
224 Cosplayer
225 Gamer
226 Steerage
227 Preppy
228 Rasta
229 Punks
230 Metalhead
231 Skater
232 Hipster
233 Northern
234 Southern
235 Arcadian
csvfiles/lighting.csv
+5 -1
View File
@@ -44,4 +44,8 @@ Candle light
Beautifully Lit
Ethereal Lighting
Starlight
Neon Light
Neon Light
Light and shadow plays
Dramatic spotlight
Cold Lighting
Warm lighting
1 natural lighting
44 Beautifully Lit
45 Ethereal Lighting
46 Starlight
47 Neon Light
48 Light and shadow plays
49 Dramatic spotlight
50 Cold Lighting
51 Warm lighting
csvfiles/shotsizes.csv
+4 -1
View File
@@ -48,4 +48,7 @@ top-down view
two shot angle
wide angle
wide shot
zoomed out
zoomed out
profile
side-profile
upper body shot
1 3/4 view
48 two shot angle
49 wide angle
50 wide shot
51 zoomed out
52 profile
53 side-profile
54 upper body shot
csvfiles/special_lists/objectadditions.csv
+2 -1
View File
@@ -3,4 +3,5 @@ OR(detailed;engraved;rare) with OR(-material-;-color-;-descriptor-;-pattern-) OR
OR(intricate details;smooth;sleek)
designed by -brand-
anthropomorphic OR(;with a face;normal)
with OR(-pattern-;-color-;-descriptor-;rare) -print-
with OR(-pattern-;-color-;-descriptor-;rare) -print-
covered in -covering-
1 made from OR(-material-;-space-;-flora-)
3 OR(intricate details;smooth;sleek)
4 designed by -brand-
5 anthropomorphic OR(;with a face;normal)
6 with OR(-pattern-;-color-;-descriptor-;rare) -print-
7 covered in -covering-
csvfiles/special_lists/overalladditions.csv
+2 -1
View File
@@ -33,4 +33,5 @@ clean, soap bubbles, iridescent
and the genre is -musicgenre-
displayed in a rainbow pattern
inside a -container-
-flora-, -flora-, -flora-, -flora-
-flora-, -flora-, -flora-, -flora-
covered in -covering-
1 OR(floating;flying) OR(; in space; in -space-; over -minilocation-;normal)
33 and the genre is -musicgenre-
34 displayed in a rainbow pattern
35 inside a -container-
36 -flora-, -flora-, -flora-, -flora-
37 covered in -covering-
prompttester.py
+1 -1
View File
@@ -51,4 +51,4 @@ def generateprompts(amount = 1,insanitylevel="5",subject="all", artist="all", im
print("")
print("All done!")
generateprompts(1000,5,"all","all","all",False,"","","PREFIXPROMPT" ,"SUFFIXPROMPT","",1,"","",True,"",100, "all", "all", "all", "all", False, True)
generateprompts(10,5,"all","all","all",False,"","","PREFIXPROMPT" ,"SUFFIXPROMPT","",1,"","-objecttotal- covered in -covering-",True,"",100, "all", "all", "all", "all", False, True)