Merge pull request #10578 from anonCantCode/dev

Preserve Python 3.9 compatibility
This commit is contained in:
AUTOMATIC1111 2023-05-20 22:11:03 +03:00 committed by GitHub
commit db1ce5aa26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -15,6 +15,7 @@ import modules.devices as devices
from modules import localization, script_loading, errors, ui_components, shared_items, cmd_args from modules import localization, script_loading, errors, ui_components, shared_items, cmd_args
from modules.paths_internal import models_path, script_path, data_path, sd_configs_path, sd_default_config, sd_model_file, default_sd_model_file, extensions_dir, extensions_builtin_dir # noqa: F401 from modules.paths_internal import models_path, script_path, data_path, sd_configs_path, sd_default_config, sd_model_file, default_sd_model_file, extensions_dir, extensions_builtin_dir # noqa: F401
from ldm.models.diffusion.ddpm import LatentDiffusion from ldm.models.diffusion.ddpm import LatentDiffusion
from typing import Optional
demo = None demo = None
@ -113,7 +114,7 @@ class State:
time_start = None time_start = None
server_start = None server_start = None
_server_command_signal = threading.Event() _server_command_signal = threading.Event()
_server_command: str | None = None _server_command: Optional[str] = None
@property @property
def need_restart(self) -> bool: def need_restart(self) -> bool:
@ -131,14 +132,14 @@ class State:
return self._server_command return self._server_command
@server_command.setter @server_command.setter
def server_command(self, value: str | None) -> None: def server_command(self, value: Optional[str]) -> None:
""" """
Set the server command to `value` and signal that it's been set. Set the server command to `value` and signal that it's been set.
""" """
self._server_command = value self._server_command = value
self._server_command_signal.set() self._server_command_signal.set()
def wait_for_server_command(self, timeout: float | None = None) -> str | None: def wait_for_server_command(self, timeout: Optional[float] = None) -> Optional[str]:
""" """
Wait for server command to get set; return and clear the value and signal. Wait for server command to get set; return and clear the value and signal.
""" """