From 73254a12f649805cec20fa3bbbcbeb43a7e9bf55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leander=20Nei=C3=9F?=
 <1871704+lanice@users.noreply.github.com>
Date: Sat, 8 Jul 2023 12:15:40 +0200
Subject: [PATCH] Replace -artist- wildcards when building prompt with
 onlyartists==True. Don't prepend ', ' to prompts in automatic prompt
 separator mode

---
 build_dynamic_prompt.py    | 3 +++
 scripts/onebuttonprompt.py | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/build_dynamic_prompt.py b/build_dynamic_prompt.py
index a56d458..755e8d4 100644
--- a/build_dynamic_prompt.py
+++ b/build_dynamic_prompt.py
@@ -820,6 +820,9 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all
 
 
             if(onlyartists == True):
+
+                # replace artist wildcards
+                completeprompt = replacewildcard(completeprompt, insanitylevel, "-artist-", artistlist, False)
                     
                 # clean it up
                 completeprompt = cleanup(completeprompt)
diff --git a/scripts/onebuttonprompt.py b/scripts/onebuttonprompt.py
index c1c9517..b83e55b 100644
--- a/scripts/onebuttonprompt.py
+++ b/scripts/onebuttonprompt.py
@@ -718,7 +718,6 @@ class Script(scripts.Script):
                 prefixpromptcopy = prefixprompt
                 
                 if(ANDtoggle == "automatic"):
-                    preppedprompt += prefixprompt + ", "
                     if(artist != "none"):
                         preppedprompt += build_dynamic_prompt(insanitylevel,subject,artist, imagetype, True, antistring) 
                     if(subject == "humanoid"):