diff --git a/csv_reader.py b/csv_reader.py index 170ff9b..ee71719 100644 --- a/csv_reader.py +++ b/csv_reader.py @@ -86,7 +86,7 @@ def csv_to_list(csvfilename, antilist=[], directory="./csvfiles/", lowerandstrip if(directory=="./csvfiles/" or directory=="./csvfiles/special_lists/"): if(os.path.isfile(userfilesfolder + csvfilename + "_addon" + ".csv")): with open(userfilesfolder + csvfilename + "_addon" + ".csv", "r", newline="",encoding="utf8") as file: - reader = csv.reader(file, delimiter=",") + reader = csv.reader(file, delimiter=delimiter) if(skipheader==True): next(reader) if(listoflistmode==True): diff --git a/csvfiles/concept_prefix.csv b/csvfiles/concept_prefix.csv index 5b5ce7a..18cf0c4 100644 --- a/csvfiles/concept_prefix.csv +++ b/csvfiles/concept_prefix.csv @@ -163,4 +163,9 @@ Manifestation Celebration End Death -Genesis \ No newline at end of file +Genesis +Engram +Dimensional Portal +Orb +Vessel +Flower \ No newline at end of file diff --git a/csvfiles/humanexpressions.csv b/csvfiles/humanexpressions.csv index 2790689..42d71ff 100644 --- a/csvfiles/humanexpressions.csv +++ b/csvfiles/humanexpressions.csv @@ -33,7 +33,7 @@ OR(;-heshe- is ;uncommon) looking away OR(;-heshe- is ;uncommon) in awe OR(;-heshe- is ;uncommon) OR(;very;normal) curious OR(;-heshe- is ;uncommon) OR(;very;normal) bored -OR(;-heshe- is ;uncommon) OR(;very;normal) embarresed +OR(;-heshe- is ;uncommon) OR(;very;normal) embarrased OR(;-heshe- is ;uncommon) OR(;very;normal) in love OR(;-heshe- is ;uncommon) feeling OR(;very;normal) melancholy OR(;-heshe- is ;uncommon) feeling OR(;very;normal) proud diff --git a/csvfiles/special_lists/buildoutfit.csv b/csvfiles/special_lists/buildoutfit.csv index fc82c34..b53346f 100644 --- a/csvfiles/special_lists/buildoutfit.csv +++ b/csvfiles/special_lists/buildoutfit.csv @@ -10,4 +10,4 @@ , -heshe- is OR(wearing a;dressed in a) OR(;-outfitdescriptor-;normal) OR(;-color-;uncommon) OR(;-culture-;uncommon) OR(;-material-;rare) -outfit- that was OR(designed;made;inspired;forged) by -brand-, It is OR(;very;rare) OR(-outfitdescriptor-;-color-;normal) OR(;and OR(-outfitdescriptor-;-color-;normal);normal) OR(;, The -sameoutfit- looks OR(;very;rare) -outfitdescriptor- on -himher-,;unique) , OR(wearing;dressed in;in;normal) OR(;a very;rare) OR(;-outfitdescriptor-;normal) OR(-minioutfit-;-outfit-;uncommon), OR(-hisher-;The;normal) -sameoutfit- -outfitvomit- , -heshe- is OR(wearing a;dressed in) OR(;-hisher-;-hisher- -outfitdescriptor-;rare) -outfit-, OR(-hisher-;The;normal) -sameoutfit- OR(is tailored by -fashiondesigner- OR(; and -fashiondesigner-;uncommon);is inspired by the -charactertype- OR(;and -charactertype-;uncommon)) -, -heshe- is OR(wearing a;dressed in) OR(;-hisher-;-hisher- -outfitdescriptor-;rare) -artmovement- fashion style -outfit \ No newline at end of file +, -heshe- is OR(wearing a;dressed in) OR(;-hisher-;-hisher- -outfitdescriptor-;rare) -artmovement- fashion style -outfit- \ No newline at end of file diff --git a/csvfiles/templates/templates.csv b/csvfiles/templates/templates.csv index ef6c6af..4c564f9 100644 --- a/csvfiles/templates/templates.csv +++ b/csvfiles/templates/templates.csv @@ -501,4 +501,4 @@ Closeup face portrait of a -descriptor- -malefemale- -culture- -subject-, -hairc magical -subject- of -culture- glowing in universe -space-, octane render, 8k, extremely detailed;openart;gallery;object;-building- Epic -artist- [detailed color pencil:photo shoot:0.3] by -fantasyartist- and (-romanticismartist-:0.5) and (-romanticismartist-:0.5), HQ, 8K, hyper detailed, The -subject- surrounded by -objecttotal-s (face looking -mood-:1.5), -descriptor-, -descriptor-, -descriptor-, -timeperiod-, timeless realization of the facts of life and our time is limited on this earth, Action, cinematic dramatic lighting, bokeh, shot on Canon 5D,masterpiece [oil painting:hyperrealism:0.3] in the style of (-photographyartist-:0.5);eric richards;offical;humanoid;-malefemale- Epic realistic [detailed color pencil:photo shoot:0.3] by -artist- and (-fantasyartist-:0.5) and (-romanticismartist-:0.5) The beautiful -descriptor- -subject- surrounded by -descriptor- -objecttotal-s (face looking -mood-:1.2), -descriptor-, -descriptor-, -descriptor-, -timeperiod-, -location-, action shot -pose-, Action, cinematic dramatic lighting, dark, high contrast, bokeh, HQ, 8K, HDR, hyper detailed, -shotsize-, photograph shot on -camera-, masterpiece [oil painting:hyperrealism:0.3] photo in the style of (-photographyartist-:0.5);eric richards;offical;humanoid;-malefemale- --imagetypequality- 16k, 8k, 4k, 4k UHD, ultra HDR, perfect quality, insane quality, extreme quality, intricate, ultra quality, super quality, perfect detail, very high detail, insanely detailed, extremely detailed, intricate detail, ultra detail, super detail, perfect resolution, very high resolution, insane resolution, (cinematic shot:1.6), depth of field, rule of thirds, ((-artmovement-)) , (masterpiece art by -artist- ) and (-romanticismartist-:0.25) of -poemline- -descriptor- beautiful -subject- (face looking -mood-:1.3) surrounded by -objecttotal-s while -songline-, -timeperiod-, -descriptor-, -descriptor-, -descriptor-, cinematic dramatic lighting, bokeh, HQ, sharp focus, -shotsize-, DSLR photo, -imagetype-;eric richards;offical;humanoid;-malefemale- +-imagetypequality- 16k, 8k, 4k, 4k UHD, ultra HDR, perfect quality, insane quality, extreme quality, intricate, ultra quality, super quality, perfect detail, very high detail, insanely detailed, extremely detailed, intricate detail, ultra detail, super detail, perfect resolution, very high resolution, insane resolution, (cinematic shot:1.6), depth of field, rule of thirds, ((-artmovement-)) , (masterpiece art by -artist- ) and (-romanticismartist-:0.25) of -poemline- -descriptor- beautiful -subject- (face looking -mood-:1.3) surrounded by -objecttotal-s while -songline-, -timeperiod-, -descriptor-, -descriptor-, -descriptor-, cinematic dramatic lighting, bokeh, HQ, sharp focus, -shotsize-, DSLR photo, -imagetype-;eric richards;offical;humanoid;-malefemale- \ No newline at end of file diff --git a/prompttester.py b/prompttester.py index fcfe5ff..61e956c 100644 --- a/prompttester.py +++ b/prompttester.py @@ -39,6 +39,12 @@ def generateprompts(amount = 1,insanitylevel="5",subject="all", artist="all", im print(result) break + if(overrideoutfit != "" and overrideoutfit not in result ): + print("The outfit override is not showing up!") + print("") + print(result) + break + if(" OR " in result or ";" in result): print("There is a mistake in a OR statement") print("") @@ -82,8 +88,8 @@ def generateprompts(amount = 1,insanitylevel="5",subject="all", artist="all", im print("") print("All done!") -generateprompts(10,5 - ,"concept" # subject +generateprompts(100,5 + ,"" # subject ,"all" # artists ,"all" # image type "only other types", "only templates mode", "art blaster mode", "quality vomit mode", "color cannon mode", "unique art mode", "massive madness mode", "photo fantasy mode", "subject only mode", "fixed styles mode" , False # only artists @@ -96,9 +102,9 @@ generateprompts(10,5 , "all" # gender , "all" # object types , "all" # humanoid types -- all,generic humans,generic human relations, multiple humans, celebrities e.a.,fictional,humanoids, based on job or title,based on first name - , "episode titles from tv shows" # concept types + , "all" # concept types , False # prompt switching , True # Turn off emojis , 0 # seed - , "" #outfit override + , "TEST" #outfit override ) \ No newline at end of file