allow saving of images via api

ljingv · Mar 3, 2023 · 23d4fb5 · 23d4fb5
1 parent 0cc0ee1
commit 23d4fb5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/modules/api/api.py b/modules/api/api.py
@@ -180,8 +180,8 @@ def text2imgapi(self, txt2imgreq: StableDiffusionTxt2ImgProcessingAPI):
 
         populate = txt2imgreq.copy(update={ # Override __init__ params
             "sampler_name": validate_sampler_name(txt2imgreq.sampler_name or txt2imgreq.sampler_index),
-            "do_not_save_samples": True,
-            "do_not_save_grid": True
+            "do_not_save_samples": True if not 'do_not_save_samples' in vars(txt2imgreq) else txt2imgreq.do_not_save_samples,
+            "do_not_save_grid": True if not 'do_not_save_grid' in vars(txt2imgreq) else txt2imgreq.do_not_save_grid,
             }
         )
         if populate.sampler_name:
@@ -220,8 +220,8 @@ def img2imgapi(self, img2imgreq: StableDiffusionImg2ImgProcessingAPI):
 
         populate = img2imgreq.copy(update={ # Override __init__ params
             "sampler_name": validate_sampler_name(img2imgreq.sampler_name or img2imgreq.sampler_index),
-            "do_not_save_samples": True,
-            "do_not_save_grid": True,
+            "do_not_save_samples": True if not 'do_not_save_samples' in img2imgreq else img2imgreq.do_not_save_samples,
+            "do_not_save_grid": True if not 'do_not_save_grid' in img2imgreq else img2imgreq.do_not_save_grid,
             "mask": mask
             }
         )

diff --git a/modules/api/models.py b/modules/api/models.py
@@ -14,8 +14,8 @@
     "outpath_samples",
     "outpath_grids",
     "sampler_index",
-    "do_not_save_samples",
-    "do_not_save_grid",
+    # "do_not_save_samples",
+    # "do_not_save_grid",
     "extra_generation_params",
     "overlay_images",
     "do_not_reload_embeddings",

diff --git a/modules/images.py b/modules/images.py
@@ -489,6 +489,9 @@ def save_image(image, path, basename, seed=None, prompt=None, extension='png', i
     """
     namegen = FilenameGenerator(p, seed, prompt, image)
 
+    if path is None: # set default path to avoid errors when functions are triggered manually or via api and param is not set
+        path = opts.outdir_save
+
     if save_to_dirs is None:
         save_to_dirs = (grid and opts.grid_save_to_dirs) or (not grid and opts.save_to_dirs and not no_prompt)