From eb10da8bb74a0f664c01052f04168837387598b2 Mon Sep 17 00:00:00 2001 From: Andray Date: Mon, 11 Mar 2024 05:15:09 +0400 Subject: [PATCH 1/2] type hinting in shared.py --- modules/shared.py | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/modules/shared.py b/modules/shared.py index b4ba14ad7c6..8d179153257 100644 --- a/modules/shared.py +++ b/modules/shared.py @@ -7,6 +7,10 @@ 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 import util +falseVar = False # avoid circular import for type hinting +if falseVar: + from modules import shared_state, styles, interrogate, shared_total_tqdm, memmon + cmd_opts = shared_cmd_options.cmd_opts parser = shared_cmd_options.parser @@ -16,11 +20,11 @@ config_filename = cmd_opts.ui_settings_file hide_dirs = {"visible": not cmd_opts.hide_ui_dir_config} -demo = None +demo: gr.Blocks = None -device = None +device: str = None -weight_load_location = None +weight_load_location: str = None xformers_available = False @@ -28,21 +32,21 @@ loaded_hypernetworks = [] -state = None +state: 'shared_state.State' = None -prompt_styles = None +prompt_styles: 'styles.StyleDatabase' = None -interrogator = None +interrogator: 'interrogate.InterrogateModels' = None face_restorers = [] -options_templates = None -opts = None -restricted_opts = None +options_templates: dict = None +opts: options.Options = None +restricted_opts: set[str] = None sd_model: sd_models_types.WebuiSdModel = None -settings_components = None +settings_components: dict = None """assigned from ui.py, a mapping on setting names to gradio components repsponsible for those settings""" tab_names = [] @@ -65,9 +69,9 @@ gradio_theme = gr.themes.Base() -total_tqdm = None +total_tqdm: 'shared_total_tqdm.TotalTQDM' = None -mem_mon = None +mem_mon: 'memmon.MemUsageMonitor' = None options_section = options.options_section OptionInfo = options.OptionInfo From 2d57a2df660ec096969c89eb1ec72ebaa9a34636 Mon Sep 17 00:00:00 2001 From: Andray <33491867+light-and-ray@users.noreply.github.com> Date: Mon, 11 Mar 2024 07:40:15 +0400 Subject: [PATCH 2/2] Update modules/shared.py Co-authored-by: catboxanon <122327233+catboxanon@users.noreply.github.com> --- modules/shared.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/shared.py b/modules/shared.py index 8d179153257..4cf7f6a81be 100644 --- a/modules/shared.py +++ b/modules/shared.py @@ -6,9 +6,9 @@ from modules import shared_cmd_options, shared_gradio_themes, options, shared_items, sd_models_types 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 import util +from typing import TYPE_CHECKING -falseVar = False # avoid circular import for type hinting -if falseVar: +if TYPE_CHECKING: from modules import shared_state, styles, interrogate, shared_total_tqdm, memmon cmd_opts = shared_cmd_options.cmd_opts