Update onebuttonprompt.py
small fixes regarding "automatic"mode
This commit is contained in:
@@ -668,6 +668,8 @@ class Script(scripts.Script):
|
||||
print("Starting generating the prompt")
|
||||
preppedprompt = ""
|
||||
|
||||
artistcopy = artist
|
||||
|
||||
if(ANDtoggle == "automatic"):
|
||||
preppedprompt += prefixprompt + ", "
|
||||
if(artist != "none"):
|
||||
@@ -680,6 +682,10 @@ class Script(scripts.Script):
|
||||
preppedprompt += ", " + promptcompounderlevel + " animals"
|
||||
if(subject == "object"):
|
||||
preppedprompt += ", " + promptcompounderlevel + " objects"
|
||||
#sneaky! If we are running on automatic, we don't want "artists" to show up during the rest of the prompt, so set it to none, but only temporary!
|
||||
|
||||
artist = "none"
|
||||
|
||||
|
||||
if(ANDtoggle != "none" and ANDtoggle != "automatic"):
|
||||
preppedprompt += prefixprompt
|
||||
@@ -691,10 +697,14 @@ class Script(scripts.Script):
|
||||
preppedprompt += " \n , "
|
||||
else:
|
||||
preppedprompt += " \n " + seperator + " "
|
||||
|
||||
|
||||
|
||||
#Here is where we build a "normal" prompt
|
||||
preppedprompt += build_dynamic_prompt(insanitylevel,subject,artist, imagetype, False, antistring, prefixprompt, suffixprompt,promptcompounderlevel, seperator,givensubject,smartsubject,giventypeofimage)
|
||||
|
||||
# set the artist mode back when done (for automatic mode)
|
||||
artist = artistcopy
|
||||
|
||||
# set everything ready
|
||||
p.prompt = preppedprompt
|
||||
p.negative_prompt = negativeprompt
|
||||
|
||||
Reference in New Issue
Block a user