diff --git a/config.json b/config.json index 4ad0141a5..6ac2cbf57 100644 --- a/config.json +++ b/config.json @@ -11,7 +11,7 @@ "always_discard_next_to_last_sigma": false, "clean_temp_dir_at_start": true, "CLIP_stop_at_last_layers": 1, - "code_former_weight": 0.15, + "code_former_weight": 0.2, "comma_padding_backtrack": 20, "control_net_model_config": "models/cldm_v15.yaml", "control_net_model_adapter_config": "models/sketch_adapter_v14.yaml", @@ -173,7 +173,7 @@ "save_training_settings_to_txt": true, "save_txt": false, "sd_checkpoint_cache": 0, - "sd_checkpoint_hash": "cc6cb27103417325ff94f52b7a5d2dde45a7515b25c255d8e396c90014281516", + "sd_checkpoint_hash": "7b58853a2f8435c51dedd82f0a1e5571851919a7b230d473afd45a41dec3debe", "sd_hypernetwork_strength": 1.0, "sd_hypernetwork": "None", "sd_lora": "", @@ -185,7 +185,7 @@ "send_size": true, "show_progress_every_n_steps": -1, "show_progress_grid": true, - "show_progress_in_title": true, + "show_progress_in_title": false, "show_progress_type": "Full", "show_progressbar": true, "show_warnings": false, @@ -211,7 +211,7 @@ "use_original_name_batch": true, "use_save_to_dirs_for_ui": false, "use_upscaler_name_as_suffix": true, - "img_max_size_mp": 200.0, + "img_max_size_mp": 500.0, "image_browser_active_tabs": "txt2img, img2img, txt2img-grids, img2img-grids, Extras, Favorites, Others, Maintenance", "image_browser_enable_maint": false, "image_browser_ranking_pnginfo": false, diff --git a/extensions-builtin/sd-extension-system-info b/extensions-builtin/sd-extension-system-info index 2fce25755..ef06472be 160000 --- a/extensions-builtin/sd-extension-system-info +++ b/extensions-builtin/sd-extension-system-info @@ -1 +1 @@ -Subproject commit 2fce2575584a7b92459a9a2e0cc2ab8e1fc6a5a1 +Subproject commit ef06472be3f1de9296e2dda67baabbf5f57bd069 diff --git a/extensions-builtin/sd-webui-controlnet b/extensions-builtin/sd-webui-controlnet index 6a5580ca7..c73c9451c 160000 --- a/extensions-builtin/sd-webui-controlnet +++ b/extensions-builtin/sd-webui-controlnet @@ -1 +1 @@ -Subproject commit 6a5580ca7c144e04220d1e12c1e0cc92eca8bccb +Subproject commit c73c9451cfd7f7ada93d7bd37e118255d419c2f1 diff --git a/modules/shared.py b/modules/shared.py index a77fb791b..2d72e4d4d 100644 --- a/modules/shared.py +++ b/modules/shared.py @@ -36,7 +36,7 @@ parser.add_argument("--no-half-vae", action='store_true', help="do not switch th parser.add_argument("--no-progressbar-hiding", action='store_true', help="do not hide progressbar in gradio UI (we hide it because it slows down ML if you have hardware acceleration in browser)") parser.add_argument("--max-batch-count", type=int, default=16, help="maximum batch count value for the UI") parser.add_argument("--embeddings-dir", type=str, default=os.path.join(data_path, 'embeddings'), help="embeddings directory for textual inversion (default: embeddings)") -parser.add_argument("--textual-inversion-templates-dir", type=str, default=os.path.join(script_path, 'textual_inversion_templates'), help="directory with textual inversion templates") +parser.add_argument("--textual-inversion-templates-dir", type=str, default=os.path.join(script_path, 'train/templates'), help="directory with textual inversion templates") parser.add_argument("--hypernetwork-dir", type=str, default=os.path.join(models_path, 'hypernetworks'), help="hypernetwork directory") parser.add_argument("--localizations-dir", type=str, default=os.path.join(script_path, 'localizations'), help="localizations directory") parser.add_argument("--allow-code", action='store_true', help="allow custom script execution from webui") @@ -72,7 +72,7 @@ parser.add_argument("--opt-split-attention-v1", action='store_true', help="enabl parser.add_argument("--opt-sdp-attention", action='store_true', help="enable scaled dot product cross-attention layer optimization; requires PyTorch 2.*") parser.add_argument("--opt-sdp-no-mem-attention", action='store_true', help="enable scaled dot product cross-attention layer optimization without memory efficient attention, makes image generation deterministic; requires PyTorch 2.*") parser.add_argument("--disable-opt-split-attention", action='store_true', help="force-disables cross-attention layer optimization") -parser.add_argument("--disable-nan-check", action='store_true', help="do not check if produced images/latent spaces have nans; useful for running without a checkpoint in CI") +parser.add_argument("--disable-nan-check", action='store_true', help="do not check if produced images/latent spaces have nans; useful for running without a checkpoint in CI", default=True) parser.add_argument("--use-cpu", nargs='+', help="use CPU as torch device for specified modules", default=[], type=str.lower) parser.add_argument("--listen", action='store_true', help="launch gradio with 0.0.0.0 as server name, allowing to respond to network requests") parser.add_argument("--port", type=int, help="launch gradio with given server port, you need root/admin rights for ports < 1024, defaults to 7860 if available", default=None) @@ -89,13 +89,13 @@ parser.add_argument("--gradio-inpaint-tool", type=str, help="does not do anythin parser.add_argument("--opt-channelslast", action='store_true', help="change memory type for stable diffusion to channels last") parser.add_argument("--styles-file", type=str, help="filename to use for styles", default=os.path.join(data_path, 'styles.csv')) parser.add_argument("--autolaunch", action='store_true', help="open the webui URL in the system's default browser upon launch", default=False) -parser.add_argument("--theme", type=str, help="launches the UI with light or dark theme", default=None) +parser.add_argument("--theme", type=str, help="launches the UI with light or dark theme", default='dark') parser.add_argument("--use-textbox-seed", action='store_true', help="use textbox for seeds in UI (no up/down, but possible to input long seeds)", default=False) -parser.add_argument("--disable-console-progressbars", action='store_true', help="do not output progressbars to console", default=False) +parser.add_argument("--disable-console-progressbars", action='store_true', help="do not output progressbars to console", default=True) parser.add_argument("--enable-console-prompts", action='store_true', help="print prompts to console when generating with txt2img and img2img", default=False) parser.add_argument('--vae-path', type=str, help='Checkpoint to use as VAE; setting this argument disables all settings related to VAE', default=None) -parser.add_argument("--disable-safe-unpickle", action='store_true', help="disable checking pytorch models for malicious code", default=False) -parser.add_argument("--api", action='store_true', help="use api=True to launch the API together with the webui (use --nowebui instead for only the API)") +parser.add_argument("--disable-safe-unpickle", action='store_true', help="disable checking pytorch models for malicious code", default=True) +parser.add_argument("--api", action='store_true', help="use api=True to launch the API together with the webui (use --nowebui instead for only the API)", default=True) parser.add_argument("--api-auth", type=str, help='Set authentication for API like "username:password"; or comma-delimit multiple like "u1:p1,u2:p2,u3:p3"', default=None) parser.add_argument("--api-log", action='store_true', help="use api-log=True to enable logging of all API requests") parser.add_argument("--nowebui", action='store_true', help="use api=True to launch the API instead of the webui") @@ -107,7 +107,7 @@ parser.add_argument("--cors-allow-origins-regex", type=str, help="Allowed CORS o parser.add_argument("--tls-keyfile", type=str, help="Partially enables TLS, requires --tls-certfile to fully function", default=None) parser.add_argument("--tls-certfile", type=str, help="Partially enables TLS, requires --tls-keyfile to fully function", default=None) parser.add_argument("--server-name", type=str, help="Sets hostname of server", default=None) -parser.add_argument("--gradio-queue", action='store_true', help="Uses gradio queue; experimental option; breaks restart UI button") +parser.add_argument("--gradio-queue", action='store_true', help="Uses gradio queue; experimental option; breaks restart UI button", default=True) parser.add_argument("--skip-version-check", action='store_true', help="Do not check versions of torch and xformers") parser.add_argument("--no-hashing", action='store_true', help="disable sha256 hashing of checkpoints to help loading performance", default=False) parser.add_argument("--no-download-sd-model", action='store_true', help="don't download SD1.5 model even if no model is found in --ckpt-dir", default=False) diff --git a/ui-config.json b/ui-config.json index 237d688d5..ebde1231b 100644 --- a/ui-config.json +++ b/ui-config.json @@ -1339,5 +1339,97 @@ "customscript/seed_travel.py/txt2img/SSIM minimum substep/visible": true, "customscript/seed_travel.py/txt2img/SSIM minimum substep/value": 0.0001, "customscript/seed_travel.py/img2img/SSIM minimum substep/visible": true, - "customscript/seed_travel.py/img2img/SSIM minimum substep/value": 0.0001 + "customscript/seed_travel.py/img2img/SSIM minimum substep/value": 0.0001, + "txt2img/Enable/visible": true, + "txt2img/Enable/value": false, + "txt2img/Invert Input Color/visible": true, + "txt2img/Invert Input Color/value": false, + "txt2img/RGB to BGR/visible": true, + "txt2img/RGB to BGR/value": false, + "txt2img/Low VRAM/visible": true, + "txt2img/Low VRAM/value": false, + "txt2img/Guess Mode/visible": true, + "txt2img/Guess Mode/value": false, + "txt2img/Preprocessor/visible": true, + "txt2img/Preprocessor/value": "none", + "txt2img/Model/visible": true, + "txt2img/Model/value": "None", + "txt2img/Weight/visible": true, + "txt2img/Weight/value": 1.0, + "txt2img/Weight/minimum": 0.0, + "txt2img/Weight/maximum": 2.0, + "txt2img/Weight/step": 0.05, + "txt2img/Guidance Start (T)/visible": true, + "txt2img/Guidance Start (T)/value": 0.0, + "txt2img/Guidance Start (T)/minimum": 0.0, + "txt2img/Guidance Start (T)/maximum": 1.0, + "txt2img/Guidance Start (T)/step": 0.01, + "txt2img/Guidance End (T)/visible": true, + "txt2img/Guidance End (T)/value": 1.0, + "txt2img/Guidance End (T)/minimum": 0.0, + "txt2img/Guidance End (T)/maximum": 1.0, + "txt2img/Guidance End (T)/step": 0.01, + "txt2img/Annotator resolution/visible": true, + "txt2img/Annotator resolution/value": 64, + "txt2img/Annotator resolution/minimum": 64, + "txt2img/Annotator resolution/maximum": 2048, + "txt2img/Annotator resolution/step": 10, + "txt2img/Threshold A/visible": true, + "txt2img/Threshold A/value": 64, + "txt2img/Threshold A/minimum": 64, + "txt2img/Threshold A/maximum": 1024, + "txt2img/Threshold A/step": 1, + "txt2img/Threshold B/visible": true, + "txt2img/Threshold B/value": 64, + "txt2img/Threshold B/minimum": 64, + "txt2img/Threshold B/maximum": 1024, + "txt2img/Threshold B/step": 1, + "txt2img/Resize Mode/visible": true, + "txt2img/Resize Mode/value": "Scale to Fit (Inner Fit)", + "img2img/Enable/visible": true, + "img2img/Enable/value": false, + "img2img/Invert Input Color/visible": true, + "img2img/Invert Input Color/value": false, + "img2img/RGB to BGR/visible": true, + "img2img/RGB to BGR/value": false, + "img2img/Low VRAM/visible": true, + "img2img/Low VRAM/value": false, + "img2img/Guess Mode/visible": true, + "img2img/Guess Mode/value": false, + "img2img/Preprocessor/visible": true, + "img2img/Preprocessor/value": "none", + "img2img/Model/visible": true, + "img2img/Model/value": "None", + "img2img/Weight/visible": true, + "img2img/Weight/value": 1.0, + "img2img/Weight/minimum": 0.0, + "img2img/Weight/maximum": 2.0, + "img2img/Weight/step": 0.05, + "img2img/Guidance Start (T)/visible": true, + "img2img/Guidance Start (T)/value": 0.0, + "img2img/Guidance Start (T)/minimum": 0.0, + "img2img/Guidance Start (T)/maximum": 1.0, + "img2img/Guidance Start (T)/step": 0.01, + "img2img/Guidance End (T)/visible": true, + "img2img/Guidance End (T)/value": 1.0, + "img2img/Guidance End (T)/minimum": 0.0, + "img2img/Guidance End (T)/maximum": 1.0, + "img2img/Guidance End (T)/step": 0.01, + "img2img/Annotator resolution/visible": true, + "img2img/Annotator resolution/value": 64, + "img2img/Annotator resolution/minimum": 64, + "img2img/Annotator resolution/maximum": 2048, + "img2img/Annotator resolution/step": 10, + "img2img/Threshold A/visible": true, + "img2img/Threshold A/value": 64, + "img2img/Threshold A/minimum": 64, + "img2img/Threshold A/maximum": 1024, + "img2img/Threshold A/step": 1, + "img2img/Threshold B/visible": true, + "img2img/Threshold B/value": 64, + "img2img/Threshold B/minimum": 64, + "img2img/Threshold B/maximum": 1024, + "img2img/Threshold B/step": 1, + "img2img/Resize Mode/visible": true, + "img2img/Resize Mode/value": "Scale to Fit (Inner Fit)" } \ No newline at end of file