Merge remote-tracking branch 'origin/master'

5 files changed, 28 insertions, 4 deletions

diff --git a/javascript/hints.js b/javascript/hints.js
index 96cd24d5..84694eeb 100644
--- a/javascript/hints.js
+++ b/javascript/hints.js
@@ -58,8 +58,8 @@ titles = {
 
     "Interrogate": "Reconstruct prompt from existing image and put it into the prompt field.",
 
-    "Images filename pattern": "Use following tags to define how filenames for images are chosen: [steps], [cfg], [prompt], [prompt_spaces], [width], [height], [styles], [sampler], [seed], [model_hash], [prompt_words], [date], [datetime], [job_timestamp]; leave empty for default.",
-    "Directory name pattern": "Use following tags to define how subdirectories for images and grids are chosen: [steps], [cfg], [prompt], [prompt_spaces], [width], [height], [styles], [sampler], [seed], [model_hash], [prompt_words], [date], [datetime], [job_timestamp]; leave empty for default.",
+    "Images filename pattern": "Use following tags to define how filenames for images are chosen: [steps], [cfg], [prompt], [prompt_no_styles], [prompt_spaces], [width], [height], [styles], [sampler], [seed], [model_hash], [prompt_words], [date], [datetime], [job_timestamp]; leave empty for default.",
+    "Directory name pattern": "Use following tags to define how subdirectories for images and grids are chosen: [steps], [cfg], [prompt], [prompt_no_styles], [prompt_spaces], [width], [height], [styles], [sampler], [seed], [model_hash], [prompt_words], [date], [datetime], [job_timestamp]; leave empty for default.",
     "Max prompt words": "Set the maximum number of words to be used in the [prompt_words] option; ATTENTION: If the words are too long, they may exceed the maximum length of the file path that the system can handle",
 
     "Loopback": "Process an image, use it as an input, repeat.",
diff --git a/modules/images.py b/modules/images.py
index 8f34dcc1..f1aed5d6 100644
--- a/modules/images.py
+++ b/modules/images.py
@@ -289,6 +289,16 @@ def apply_filename_pattern(x, p, seed, prompt):
 

     if prompt is not None:

         x = x.replace("[prompt]", sanitize_filename_part(prompt))

+        if "[prompt_no_styles]" in x:

+            prompt_no_style = prompt

+            for style in shared.prompt_styles.get_style_prompts(p.styles):

+                if len(style) > 0:

+                    style_parts = [y for y in style.split("{prompt}")]

+                    for part in style_parts:

+                        prompt_no_style = prompt_no_style.replace(part, "").replace(", ,", ",").strip().strip(',')                        

+            prompt_no_style = prompt_no_style.replace(style, "").strip().strip(',').strip()

+            x = x.replace("[prompt_no_styles]", sanitize_filename_part(prompt_no_style, replace_spaces=False))

+

         x = x.replace("[prompt_spaces]", sanitize_filename_part(prompt, replace_spaces=False))

         if "[prompt_words]" in x:

             words = [x for x in re_nonletters.split(prompt or "") if len(x) > 0]

@@ -301,7 +311,7 @@ def apply_filename_pattern(x, p, seed, prompt):
         x = x.replace("[cfg]", str(p.cfg_scale))

         x = x.replace("[width]", str(p.width))

         x = x.replace("[height]", str(p.height))

-        x = x.replace("[styles]", sanitize_filename_part(", ".join(p.styles), replace_spaces=False))

+        x = x.replace("[styles]", sanitize_filename_part(", ".join([x for x in p.styles if not x == "None"]), replace_spaces=False))

         x = x.replace("[sampler]", sanitize_filename_part(sd_samplers.samplers[p.sampler_index].name, replace_spaces=False))

 

     x = x.replace("[model_hash]", shared.sd_model.sd_model_hash)

diff --git a/modules/styles.py b/modules/styles.py
index eeedcd08..d44dfc1a 100644
--- a/modules/styles.py
+++ b/modules/styles.py
@@ -53,6 +53,12 @@ class StyleDatabase:
                 negative_prompt = row.get("negative_prompt", "")

                 self.styles[row["name"]] = PromptStyle(row["name"], prompt, negative_prompt)

 

+    def get_style_prompts(self, styles):

+        return [self.styles.get(x, self.no_style).prompt for x in styles]

+

+    def get_negative_style_prompts(self, styles):

+        return [self.styles.get(x, self.no_style).negative_prompt for x in styles]

+

     def apply_styles_to_prompt(self, prompt, styles):

         return apply_styles_to_prompt(prompt, [self.styles.get(x, self.no_style).prompt for x in styles])

 

diff --git a/webui-user.sh b/webui-user.sh
index 0ce41d3f..30646f5c 100644
--- a/webui-user.sh
+++ b/webui-user.sh
@@ -21,6 +21,9 @@ export COMMANDLINE_ARGS=""
 # python3 venv without trailing slash (defaults to ${install_dir}/${clone_dir}/venv)
 #venv_dir="venv"
 
+# script to launch to start the app
+#export LAUNCH_SCRIPT="launch.py"
+
 # install command for torch
 #export TORCH_COMMAND="pip install torch==1.12.1+cu113 --extra-index-url https://download.pytorch.org/whl/cu113"
 
diff --git a/webui.sh b/webui.sh
index 8355c9df..05ca497d 100755
--- a/webui.sh
+++ b/webui.sh
@@ -41,6 +41,11 @@ then
     venv_dir="venv"
 fi
 
+if [[ -z "${LAUNCH_SCRIPT}" ]]
+then
+    LAUNCH_SCRIPT="launch.py"
+fi
+
 # Disable sentry logging
 export ERROR_REPORTING=FALSE
 
@@ -133,4 +138,4 @@ fi
 printf "\n%s\n" "${delimiter}"
 printf "Launching launch.py..."
 printf "\n%s\n" "${delimiter}"
-"${python_cmd}" launch.py
+"${python_cmd}" "${LAUNCH_SCRIPT}"