From 92076efdc391a383077364c2e4acebd202f13565 Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Sat, 4 Mar 2023 18:14:56 -0500 Subject: [PATCH] update --- README.md | 5 +++++ automatic.sh | 13 +++++++++++++ cli/generate.json | 2 +- config.json | 5 +++-- extensions-builtin/clip-interrogator-ext | 2 +- extensions-builtin/sd-extension-system-info | 2 +- extensions-builtin/sd-webui-controlnet | 2 +- .../stable-diffusion-webui-images-browser | 2 +- modules/api/api.py | 18 ++++++++++-------- modules/api/models.py | 6 ++++-- modules/lora | 2 +- modules/ui.py | 2 +- wiki | 2 +- 13 files changed, 43 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index ffb1138a2..9e9f63760 100644 --- a/README.md +++ b/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` +
## Install diff --git a/automatic.sh b/automatic.sh index 58d0e6814..da1151dc6 100755 --- a/automatic.sh +++ b/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 diff --git a/cli/generate.json b/cli/generate.json index 46f27fd57..0bbcb1439 100644 --- a/cli/generate.json +++ b/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", diff --git a/config.json b/config.json index 5a9802939..b1e5c65ba 100644 --- a/config.json +++ b/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 } \ No newline at end of file diff --git a/extensions-builtin/clip-interrogator-ext b/extensions-builtin/clip-interrogator-ext index e2f7b7f22..d99548fc8 160000 --- a/extensions-builtin/clip-interrogator-ext +++ b/extensions-builtin/clip-interrogator-ext @@ -1 +1 @@ -Subproject commit e2f7b7f22f3097fafc5532e21516fa2741c2ca36 +Subproject commit d99548fc83c920feacbc54dcb2bb2a1c3e3ac7bd diff --git a/extensions-builtin/sd-extension-system-info b/extensions-builtin/sd-extension-system-info index 2e76b13e0..4677d7ae1 160000 --- a/extensions-builtin/sd-extension-system-info +++ b/extensions-builtin/sd-extension-system-info @@ -1 +1 @@ -Subproject commit 2e76b13e054c57ebb28224207e5d455bacc5a90f +Subproject commit 4677d7ae1f8cd665d3837c0c873cfd31209ab550 diff --git a/extensions-builtin/sd-webui-controlnet b/extensions-builtin/sd-webui-controlnet index 1031a902f..2ff1154f4 160000 --- a/extensions-builtin/sd-webui-controlnet +++ b/extensions-builtin/sd-webui-controlnet @@ -1 +1 @@ -Subproject commit 1031a902f3a97cdb676472147cb4e582908a7a42 +Subproject commit 2ff1154f469c456188f77f6665916fc01cc1cd47 diff --git a/extensions-builtin/stable-diffusion-webui-images-browser b/extensions-builtin/stable-diffusion-webui-images-browser index d658368e3..9e1222d4a 160000 --- a/extensions-builtin/stable-diffusion-webui-images-browser +++ b/extensions-builtin/stable-diffusion-webui-images-browser @@ -1 +1 @@ -Subproject commit d658368e31c1ca5420da2d85239225d62a284d58 +Subproject commit 9e1222d4a9c33113a705a8f16fa5fab6605380b9 diff --git a/modules/api/api.py b/modules/api/api.py index d930aa59f..e9299d58f 100644 --- a/modules/api/api.py +++ b/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) diff --git a/modules/api/models.py b/modules/api/models.py index aa4ea5d5f..2b66e1f03 100644 --- a/modules/api/models.py +++ b/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() diff --git a/modules/lora b/modules/lora index 45945f698..4d9292e50 160000 --- a/modules/lora +++ b/modules/lora @@ -1 +1 @@ -Subproject commit 45945f698a7c57b83564e7ad3845c7b677899a5b +Subproject commit 4d9292e50a7724908bce29bd1907ed0f5f5e211b diff --git a/modules/ui.py b/modules/ui.py index 6342ca459..b174ce4e4 100644 --- a/modules/ui.py +++ b/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": diff --git a/wiki b/wiki index 073528a10..0b2fa9b81 160000 --- a/wiki +++ b/wiki @@ -1 +1 @@ -Subproject commit 073528a10fafa6466d33a78739dd21ea532447b7 +Subproject commit 0b2fa9b81fd30809528c196d8d6d927691e15410