diff --git a/scripts/check_modules.py b/scripts/check_modules.py index aa96acb3..ede8d75c 100644 --- a/scripts/check_modules.py +++ b/scripts/check_modules.py @@ -21,7 +21,7 @@ os_name = platform.system() modules_to_check = { "torch": ("1.11.0", "1.13.1", "2.0.0", "2.0.1"), "torchvision": ("0.12.0", "0.14.1", "0.15.1", "0.15.2"), - "sdkit": "2.0.12", + "sdkit": "2.0.14", "stable-diffusion-sdkit": "2.1.4", "rich": "12.6.0", "uvicorn": "0.19.0", diff --git a/ui/easydiffusion/server.py b/ui/easydiffusion/server.py index 5ca4f452..a251ede6 100644 --- a/ui/easydiffusion/server.py +++ b/ui/easydiffusion/server.py @@ -225,6 +225,7 @@ def read_web_data_internal(key: str = None, **kwargs): "hosts": app.getIPConfig(), "default_output_dir": output_dir, "enforce_output_dir": ("force_save_path" in config), + "enforce_output_metadata": ("force_save_metadata" in config), } system_info["devices"]["config"] = config.get("render_devices", "auto") return JSONResponse(system_info, headers=NOCACHE_HEADERS) diff --git a/ui/media/js/parameters.js b/ui/media/js/parameters.js index a3206167..97b7a96d 100644 --- a/ui/media/js/parameters.js +++ b/ui/media/js/parameters.js @@ -525,6 +525,10 @@ async function getAppConfig() { customHeightField.step = IMAGE_STEP_SIZE } + if (config.force_save_metadata) { + metadataOutputFormatField.value = config.force_save_metadata + } + console.log("get config status response", config) return config @@ -736,11 +740,13 @@ async function getSystemInfo() { force = res["enforce_output_dir"] if (force == true) { saveToDiskField.checked = true - metadataOutputFormatField.disabled = false - metadataOutputFormatField.value = "json" + metadataOutputFormatField.disabled = res["enforce_output_metadata"] + diskPathField.disabled = true } saveToDiskField.disabled = force - diskPathField.disabled = force + } else { + diskPathField.disabled = !saveToDiskField.checked + metadataOutputFormatField.disabled = !saveToDiskField.checked } setDiskPath(res["default_output_dir"], force) } catch (e) {