Merge pull request #1619 from easydiffusion/beta

Beta
This commit is contained in:
cmdr2 2023-10-03 12:39:29 +05:30 committed by GitHub
commit ce24a05909
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 4 deletions

View File

@ -21,7 +21,7 @@ os_name = platform.system()
modules_to_check = { modules_to_check = {
"torch": ("1.11.0", "1.13.1", "2.0.0", "2.0.1"), "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"), "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", "stable-diffusion-sdkit": "2.1.4",
"rich": "12.6.0", "rich": "12.6.0",
"uvicorn": "0.19.0", "uvicorn": "0.19.0",

View File

@ -225,6 +225,7 @@ def read_web_data_internal(key: str = None, **kwargs):
"hosts": app.getIPConfig(), "hosts": app.getIPConfig(),
"default_output_dir": output_dir, "default_output_dir": output_dir,
"enforce_output_dir": ("force_save_path" in config), "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") system_info["devices"]["config"] = config.get("render_devices", "auto")
return JSONResponse(system_info, headers=NOCACHE_HEADERS) return JSONResponse(system_info, headers=NOCACHE_HEADERS)

View File

@ -525,6 +525,10 @@ async function getAppConfig() {
customHeightField.step = IMAGE_STEP_SIZE customHeightField.step = IMAGE_STEP_SIZE
} }
if (config.force_save_metadata) {
metadataOutputFormatField.value = config.force_save_metadata
}
console.log("get config status response", config) console.log("get config status response", config)
return config return config
@ -736,11 +740,13 @@ async function getSystemInfo() {
force = res["enforce_output_dir"] force = res["enforce_output_dir"]
if (force == true) { if (force == true) {
saveToDiskField.checked = true saveToDiskField.checked = true
metadataOutputFormatField.disabled = false metadataOutputFormatField.disabled = res["enforce_output_metadata"]
metadataOutputFormatField.value = "json" diskPathField.disabled = true
} }
saveToDiskField.disabled = force saveToDiskField.disabled = force
diskPathField.disabled = force } else {
diskPathField.disabled = !saveToDiskField.checked
metadataOutputFormatField.disabled = !saveToDiskField.checked
} }
setDiskPath(res["default_output_dir"], force) setDiskPath(res["default_output_dir"], force)
} catch (e) { } catch (e) {