CodeCow/stable-diffusion-webui-forge
1
0
Fork 0
mirror of https://github.com/lllyasviel/stable-diffusion-webui-forge.git synced 2026-07-21 21:01:24 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "temp_dir"

Browse Source 
This reverts commit 223d2171d8.
This commit is contained in:
Haoming 2026-02-25 10:38:21 +08:00
parent 223d2171d8
commit 671ae9daba
4 changed files with 31 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
launch.py
View File

@ -35,7 +35,6 @@ def main():
exit(0)
launch_utils.verify_version()
launch_utils.setup_temp_dir() # needed before import gradio
launch_utils.startup_timer.record("initial startup")

15
modules/launch_utils.py
View File

@ -609,18 +609,3 @@ def verify_version():
print("\n\n")
input("Press Enter to Continue...")
def setup_temp_dir():
settings_file: os.PathLike = args.ui_settings_file
if not os.path.isfile(settings_file):
return
with open(settings_file, "r", encoding="utf8") as file:
settings: dict[str, str] = json.load(file)
if not (path := settings.get("temp_dir", "").strip()):
return
os.makedirs(path, exist_ok=True)
os.environ.setdefault("GRADIO_TEMP_DIR", path)

2
modules/shared_options.py
View File

@ -70,7 +70,7 @@ options_templates.update(
"use_original_name_batch": OptionInfo(True, "During batch process in Extras tab, use the input filename for output filename"),
"save_selected_only": OptionInfo(True, 'When using the "Save" button, only save the selected image'),
"save_write_log_csv": OptionInfo(True, 'Write the generation parameters to a log.csv when saving images using the "Save" button'),
"temp_dir": OptionInfo(util.truncate_path(os.path.join(data_path, "tmp")), "Directory for temporary images; leave empty to use the system TEMP folder").info("for intermediate/interrupted images").needs_restart(),
"temp_dir": OptionInfo(util.truncate_path(os.path.join(data_path, "tmp")), "Directory for temporary images; leave empty to use the system TEMP folder").info("only used for intermediate/interrupted images"),
"clean_temp_dir_at_start": OptionInfo(True, "Clean up the temporary directory above when starting webui").info("only when the directory is not the system TEMP"),
"save_incomplete_images": OptionInfo(False, "Save Interrupted Images"),
"notification_audio": OptionInfo(True, "Play a notification sound after image generation").info('a "notification.mp3" file is required in the root directory').needs_reload_ui(),

47
modules/ui_tempdir.py
View File

@ -3,48 +3,50 @@ import tempfile
from collections import namedtuple
from pathlib import Path
import gradio.components
import gradio as gr
import gradio.components # noqa
from PIL import PngImagePlugin
from modules import shared
Savedfile = namedtuple("Savedfile", ["name"])
def register_tmp_file(gradio_app, filename):
if hasattr(gradio_app, "temp_file_sets"): # gradio 3.15
if hasattr(gr.utils, "abspath"): # gradio 4.19
if hasattr(gradio_app, 'temp_file_sets'): # gradio 3.15
if hasattr(gr.utils, 'abspath'): # gradio 4.19
filename = gr.utils.abspath(filename)
else:
filename = os.path.abspath(filename)
gradio_app.temp_file_sets[0] = gradio_app.temp_file_sets[0] | {filename}
if hasattr(gradio_app, "temp_dirs"): # gradio 3.9
if hasattr(gradio_app, 'temp_dirs'): # gradio 3.9
gradio_app.temp_dirs = gradio_app.temp_dirs | {os.path.abspath(os.path.dirname(filename))}
def check_tmp_file(gradio_app, filename):
if hasattr(gradio_app, "temp_file_sets"):
if hasattr(gr.utils, "abspath"): # gradio 4.19
if hasattr(gradio_app, 'temp_file_sets'):
if hasattr(gr.utils, 'abspath'): # gradio 4.19
filename = gr.utils.abspath(filename)
else:
filename = os.path.abspath(filename)
return any(filename in fileset for fileset in gradio_app.temp_file_sets)
if hasattr(gradio_app, "temp_dirs"):
if hasattr(gradio_app, 'temp_dirs'):
return any(Path(temp_dir).resolve() in Path(filename).resolve().parents for temp_dir in gradio_app.temp_dirs)
return False
def save_pil_to_file(pil_image, cache_dir=None, format="png"):
already_saved_as = getattr(pil_image, "already_saved_as", None)
already_saved_as = getattr(pil_image, 'already_saved_as', None)
if already_saved_as and os.path.isfile(already_saved_as):
register_tmp_file(shared.demo, already_saved_as)
filename_with_mtime = f"{already_saved_as}?{os.path.getmtime(already_saved_as)}"
filename_with_mtime = f'{already_saved_as}?{os.path.getmtime(already_saved_as)}'
register_tmp_file(shared.demo, filename_with_mtime)
return filename_with_mtime
@ -83,15 +85,16 @@ async def async_move_files_to_cache(data, block, postprocess=False, check_in_upl
"""
from gradio import FileData
from gradio.data_classes import GradioModel, GradioRootModel
from gradio.utils import get_upload_folder, is_in_or_equal, is_static_file
from gradio.data_classes import GradioRootModel
from gradio.data_classes import GradioModel
from gradio_client import utils as client_utils
from gradio.utils import get_upload_folder, is_in_or_equal, is_static_file
async def _move_to_cache(d: dict):
payload = FileData(**d)
# EDITED
payload.path = payload.path.rsplit("?", 1)[0]
payload.path = payload.path.rsplit('?', 1)[0]
# If the gradio app developer is returning a URL from
# postprocess, it means the component can display a URL
@ -107,12 +110,18 @@ async def async_move_files_to_cache(data, block, postprocess=False, check_in_upl
temp_file_path = payload.path
else:
# If the file is on a remote server, do not move it to cache.
if check_in_upload_folder and not client_utils.is_http_url_like(payload.path):
if check_in_upload_folder and not client_utils.is_http_url_like(
payload.path
):
path = os.path.abspath(payload.path)
if not is_in_or_equal(path, get_upload_folder()):
raise ValueError(f"File {path} is not in the upload folder and cannot be accessed.")
raise ValueError(
f"File {path} is not in the upload folder and cannot be accessed."
)
if not payload.is_stream:
temp_file_path = await block.async_move_resource_to_block_cache(payload.path)
temp_file_path = await block.async_move_resource_to_block_cache(
payload.path
)
if temp_file_path is None:
raise ValueError("Did not determine a file path for the resource.")
payload.path = temp_file_path
@ -123,7 +132,9 @@ async def async_move_files_to_cache(data, block, postprocess=False, check_in_upl
if block.proxy_url:
proxy_url = block.proxy_url.rstrip("/")
url = f"/proxy={proxy_url}{url_prefix}{payload.path}"
elif client_utils.is_http_url_like(payload.path) or payload.path.startswith(f"{url_prefix}"):
elif client_utils.is_http_url_like(payload.path) or payload.path.startswith(
f"{url_prefix}"
):
url = payload.path
else:
url = f"{url_prefix}{payload.path}"
@ -134,7 +145,9 @@ async def async_move_files_to_cache(data, block, postprocess=False, check_in_upl
if isinstance(data, (GradioRootModel, GradioModel)):
data = data.model_dump()
return await client_utils.async_traverse(data, _move_to_cache, client_utils.is_file_obj)
return await client_utils.async_traverse(
data, _move_to_cache, client_utils.is_file_obj
)
def install_ui_tempdir_override():