diff --git a/extensions-builtin/Lora/lora.py b/extensions-builtin/Lora/lora.py index 481ccd629..f45595cf6 100644 --- a/extensions-builtin/Lora/lora.py +++ b/extensions-builtin/Lora/lora.py @@ -281,7 +281,7 @@ def load_loras(names, multipliers=None): if len(failed_to_load_loras) > 0: sd_hijack.model_hijack.comments.append("Failed to find Loras: " + ", ".join(failed_to_load_loras)) - + if recompile_model: shared.log.info("Lora: Recompiling model") sd_models.compile_diffusers(shared.sd_model) diff --git a/html/locale_en.json b/html/locale_en.json index 0238f9a67..e26871b17 100644 --- a/html/locale_en.json +++ b/html/locale_en.json @@ -63,7 +63,7 @@ {"id":"","label":"UI position","localized":"","hint":"Location of extra networks"}, {"id":"","label":"cover","localized":"","hint":"cover full area"}, {"id":"","label":"inline","localized":"","hint":"inline with all additional elelemtns (scrollable)"}, - {"id":"","label":"sidebar","localized":"","hint":"sidebar on the right side of the screen"}, + {"id":"","label":"sidebar","localized":"","hint":"sidebar on the right side of the screen"}, {"id":"","label":"UI height (%)","localized":"","hint":""}, {"id":"","label":"UI sidebar width (%)","localized":"","hint":""}, {"id":"","label":"UI card preview lazy loading","localized":"","hint":""}, diff --git a/javascript/midnight-barbie.css b/javascript/midnight-barbie.css index a52980c27..1ee4d7f10 100644 --- a/javascript/midnight-barbie.css +++ b/javascript/midnight-barbie.css @@ -314,4 +314,4 @@ svg.feather.feather-image, .feather .feather-image { display: none } --size-9: 64px; --size-14: 64px; } -/*Midnight-Barbie, By Nyxxia*/ \ No newline at end of file +/*Midnight-Barbie, By Nyxxia*/ diff --git a/javascript/style.css b/javascript/style.css index e06d61642..52554cca3 100644 --- a/javascript/style.css +++ b/javascript/style.css @@ -249,8 +249,8 @@ table.settings-value-table td { padding: 0.4em; border: 1px solid #ccc; max-widt .extra-network-cards .card:hover .overlay .tags { display: block; } .extra-network-cards .card:hover .overlay .description { display: block; } .extra-network-cards .card:hover .preview { box-shadow: none; filter: grayscale(100%); } -#txt2img_description, #img2img_description { max-height: 63px; overflow-y: auto !important; } -#txt2img_description > label > textarea, #img2img_description > label > textarea { font-size: 0.9em } +#txt2img_description, #img2img_description { max-height: 63px; overflow-y: auto !important; } +#txt2img_description > label > textarea, #img2img_description > label > textarea { font-size: 0.9em } /* controlnet */ .controlnet_control_type .controlnet_control_type_filter_group .wrap:last-of-type { display: grid; grid-auto-flow: row; grid-template-columns: repeat(4, minmax(0, 1fr)); } diff --git a/modules/processing.py b/modules/processing.py index 7f3a46b43..69f77d919 100644 --- a/modules/processing.py +++ b/modules/processing.py @@ -462,7 +462,8 @@ def create_infotext(p: StableDiffusionProcessing, all_prompts, all_seeds, all_su if all_negative_prompts is None: all_negative_prompts = p.all_negative_prompts comment = ', '.join(comments) if comments is not None and type(comments) is list else None - + ops = list(set(p.ops)) + ops.reverse() args = { # basic "Steps": p.steps, @@ -488,7 +489,7 @@ def create_infotext(p: StableDiffusionProcessing, all_prompts, all_seeds, all_su "Backend": 'Diffusers' if shared.backend == shared.Backend.DIFFUSERS else 'Original', "Version": git_commit, "Comment": comment, - "Operations": '; '.join(p.ops).replace('"', '') if len(p.ops) > 0 else 'none', + "Operations": '; '.join(ops).replace('"', '') if len(p.ops) > 0 else 'none', } if 'txt2img' in p.ops: pass diff --git a/modules/scripts.py b/modules/scripts.py index 697798975..5e15f1c19 100644 --- a/modules/scripts.py +++ b/modules/scripts.py @@ -71,7 +71,7 @@ class Script: """For AlwaysVisible scripts, this function is called when the processing object is set up, before any processing starts. args contains all values returned by components from ui(). """ - pass + pass # pylint: disable=unnecessary-pass def before_process(self, p, *args): """ @@ -79,7 +79,7 @@ class Script: You can modify the processing object (p) here, inject hooks, etc. args contains all values returned by components from ui() """ - pass + pass # pylint: disable=unnecessary-pass def process(self, p, *args): """ diff --git a/modules/shared.py b/modules/shared.py index bed228abf..a3bde1288 100644 --- a/modules/shared.py +++ b/modules/shared.py @@ -486,14 +486,13 @@ options_templates.update(options_section(('saving-images', "Image Options"), { "n_rows": OptionInfo(-1, "Grid row count", gr.Slider, {"minimum": -1, "maximum": 16, "step": 1}), "save_sep_options": OptionInfo("

Intermediate Image Saving

", "", gr.HTML), - "save_init_img": OptionInfo(True, "Save copy of img2img init images"), + "save_init_img": OptionInfo(False, "Save copy of img2img init images"), "save_images_before_highres_fix": OptionInfo(False, "Save copy of image before applying highres fix"), "save_images_before_refiner": OptionInfo(False, "Save copy of image before running refiner"), "save_images_before_face_restoration": OptionInfo(False, "Save copy of image before doing face restoration"), "save_images_before_color_correction": OptionInfo(False, "Save copy of image before applying color correction"), "save_mask": OptionInfo(False, "Save copy of the inpainting greyscale mask"), "save_mask_composite": OptionInfo(False, "Save copy of inpainting masked composite"), - })) options_templates.update(options_section(('saving-paths', "Image Naming & Paths"), { @@ -521,7 +520,6 @@ options_templates.update(options_section(('saving-paths', "Image Naming & Paths" "outdir_grids": OptionInfo("", "Output directory for grids", component_args=hide_dirs, folder=True), "outdir_txt2img_grids": OptionInfo("outputs/grids", 'Output directory for txt2img grids', component_args=hide_dirs, folder=True), "outdir_img2img_grids": OptionInfo("outputs/grids", 'Output directory for img2img grids', component_args=hide_dirs, folder=True), - })) options_templates.update(options_section(('ui', "User Interface"), { diff --git a/modules/ui_extra_networks_textual_inversion.py b/modules/ui_extra_networks_textual_inversion.py index 82b7e45c9..438ce86f1 100644 --- a/modules/ui_extra_networks_textual_inversion.py +++ b/modules/ui_extra_networks_textual_inversion.py @@ -39,7 +39,7 @@ class ExtraNetworksPageTextualInversion(ui_extra_networks.ExtraNetworksPage): embeddings = list(sd_models.model_data.sd_model.embedding_db.word_embeddings.values()) else: embeddings = [] - embeddings = list(sorted(embeddings, key=lambda emb: emb.filename)) + embeddings = sorted(embeddings, key=lambda emb: emb.filename) for embedding in embeddings: path, _ext = os.path.splitext(embedding.filename) tags = {} diff --git a/webui.bat b/webui.bat index 022be1367..2d12762c6 100755 --- a/webui.bat +++ b/webui.bat @@ -28,7 +28,7 @@ if %ERRORLEVEL% == 0 goto :activate_venv for /f "delims=" %%i in ('CALL %PYTHON% -c "import sys; print(sys.executable)"') do set PYTHON_FULLNAME="%%i" echo Using python: %PYTHON_FULLNAME% -echo Creating VENV: %VENV_DIR% +echo Creating VENV: %VENV_DIR% %PYTHON_FULLNAME% -m venv "%VENV_DIR%" >tmp/stdout.txt 2>tmp/stderr.txt if %ERRORLEVEL% == 0 goto :activate_venv echo Failed creating VENV: "%VENV_DIR%"