update

README.md

@@ -53,6 +53,11 @@ Installs and updates to latest supported version:
 - Extensions
 - Sub-modules
 
+> ./automatic.sh update
+
+Updates the main repository to the latest version
+Recommended to run `install` after `update`
+
 <br>  
 
 ## Install

automatic.sh

@@ -30,6 +30,9 @@ fi
 
 for i in "$@"; do
   case $i in
+    update)
+      MODE=update
+      ;;
     install)
       MODE=install
       ;;
@@ -80,6 +83,16 @@ git-update () {
     git-version $1
 }
 
+if [ "$MODE" == update ]; then
+  echo "Updating main repository"
+  git-update .
+  "$PYTHON" launch.py --exit
+  echo "Local changes"
+  git status --untracked=no --ignore-submodules=all --short
+  
+  exit 0
+fi
+
 if [ "$MODE" == install ]; then
   "$PYTHON" -m pip --version
 

cli/generate.json

@@ -12,7 +12,7 @@
       "prompt": "dynamic",
       "negative_prompt": "foggy, blurry, blurred, duplicate, ugly, mutilated, mutation, mutated, out of frame, bad anatomy, disfigured, deformed, censored, low res, watermark, text, poorly drawn face, signature",
       "steps": 30,
-      "batch_size": 1,
+      "batch_size": 2,
       "n_iter": 1,
       "seed": -1,
       "sampler_name": "DPM2 Karras",

config.json

@@ -177,7 +177,7 @@
     "sd_hypernetwork_strength": 1.0,
     "sd_hypernetwork": "None",
     "sd_lora": "",
-    "sd_model_checkpoint": "sd-v15-runwayml.ckpt [cc6cb27103]",
+    "sd_model_checkpoint": "photomaxultra-v1.safetensors [c7f1c20497]",
     "sd_vae_as_default": false,
     "sd_vae_checkpoint_cache": 0,
     "sd_vae": "vae-ft-mse-840000-ema-pruned.ckpt",
@@ -213,5 +213,6 @@
     "use_upscaler_name_as_suffix": true,
     "img_max_size_mp": 200.0,
     "image_browser_active_tabs": "txt2img, img2img, txt2img-grids, img2img-grids, Extras, Favorites, Others, Maintenance",
-    "image_browser_enable_maint": true
+    "image_browser_enable_maint": true,
+    "image_browser_ranking_pnginfo": false
 }

modules/api/api.py

@@ -192,8 +192,8 @@ class Api:
 
         populate = txt2imgreq.copy(update={ # Override __init__ params
             "sampler_name": validate_sampler_name(txt2imgreq.sampler_name or txt2imgreq.sampler_index),
-            "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,
+            "do_not_save_samples": txt2imgreq.do_not_save,
+            "do_not_save_grid": txt2imgreq.do_not_save,
             }
         )
         if populate.sampler_name:
@@ -202,8 +202,9 @@ class Api:
         args = vars(populate)
         args.pop('script_name', None)
 
-        send_images = True if not 'do_not_send_images' in args else not args['do_not_send_images']
-        args.pop('do_not_send_images', None)
+        send_images = True if not 'do_not_send' in args else not args['do_not_send']
+        args.pop('do_not_send', None)
+        args.pop('do_not_save', None)
 
         with self.queue_lock:
             p = StableDiffusionProcessingTxt2Img(sd_model=shared.sd_model, **args)
@@ -235,8 +236,8 @@ class Api:
 
         populate = img2imgreq.copy(update={ # Override __init__ params
             "sampler_name": validate_sampler_name(img2imgreq.sampler_name or img2imgreq.sampler_index),
-            "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,
+            "do_not_save_samples": img2imgreq.do_not_save,
+            "do_not_save_grid": img2imgreq.do_not_save,
             "mask": mask
             }
         )
@@ -247,8 +248,9 @@ class Api:
         args.pop('include_init_images', None)  # this is meant to be done by "exclude": True in model, but it's for a reason that I cannot determine.
         args.pop('script_name', None)
 
-        send_images = True if not 'do_not_send_images' in args else not args['do_not_send_images']
-        args.pop('do_not_send_images', None)
+        send_images = True if not 'do_not_send' in args else not args['do_not_send']
+        args.pop('do_not_send', None)
+        args.pop('do_not_save', None)
 
         with self.queue_lock:
             p = StableDiffusionProcessingImg2Img(sd_model=shared.sd_model, **args)

modules/api/models.py

@@ -104,7 +104,8 @@ StableDiffusionTxt2ImgProcessingAPI = PydanticModelGenerator(
         {"key": "sampler_index", "type": str, "default": "Euler"},
         {"key": "script_name", "type": str, "default": None},
         {"key": "script_args", "type": list, "default": []},
-        {"key": "do_not_send_images", "type": bool, "default": False}
+        {"key": "do_not_send", "type": bool, "default": False},
+        {"key": "do_not_save", "type": bool, "default": True}
     ]
 ).generate_model()
 
@@ -119,7 +120,8 @@ StableDiffusionImg2ImgProcessingAPI = PydanticModelGenerator(
         {"key": "include_init_images", "type": bool, "default": False, "exclude" : True},
         {"key": "script_name", "type": str, "default": None},
         {"key": "script_args", "type": list, "default": []},
-        {"key": "do_not_send_images", "type": bool, "default": False}
+        {"key": "do_not_send", "type": bool, "default": False},
+        {"key": "do_not_save", "type": bool, "default": True}
     ]
 ).generate_model()
 

modules/ui.py

@@ -746,7 +746,7 @@ def create_ui():
                     )
 
                 with FormRow():
-                    resize_mode = gr.Radio(label="Resize mode", elem_id="resize_mode", choices=["Just resize", "Crop and resize", "Resize and fill", "Just resize"], type="index", value="Just resize")
+                    resize_mode = gr.Radio(label="Resize mode", elem_id="resize_mode", choices=["Just resize", "Crop and resize", "Resize and fill", "Latent upscale"], type="index", value="Just resize")
 
                 for category in ordered_ui_categories():
                     if category == "sampler":