From 527f50b842ac59b8f9d5a91f26abc3d63e2d7f52 Mon Sep 17 00:00:00 2001 From: Haoming Date: Mon, 18 May 2026 10:10:11 +0800 Subject: [PATCH] typing --- modules/processing.py | 11 +++++++---- modules/shared.py | 13 ++++++------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/modules/processing.py b/modules/processing.py index d5226482..89bdca38 100644 --- a/modules/processing.py +++ b/modules/processing.py @@ -7,7 +7,10 @@ import math import os import random from dataclasses import dataclass, field -from typing import Any +from typing import TYPE_CHECKING, Any + +if TYPE_CHECKING: + from backend.diffusion_engine.base import ForgeDiffusionEngine import cv2 import numpy as np @@ -135,7 +138,7 @@ def txt2img_image_conditioning(sd_model, x, width, height): @dataclass(repr=False) class StableDiffusionProcessing: - sd_model: object = None + sd_model: "ForgeDiffusionEngine" = None outpath_samples: str = None outpath_grids: str = None prompt: str = "" @@ -273,11 +276,11 @@ class StableDiffusionProcessing: self.s_noise = self.s_noise if self.s_noise is not None else opts.s_noise @property - def sd_model(self): + def sd_model(self) -> "ForgeDiffusionEngine": return shared.sd_model @sd_model.setter - def sd_model(self, value): + def sd_model(self, _): pass @property diff --git a/modules/shared.py b/modules/shared.py index 80813312..df7bfd3c 100644 --- a/modules/shared.py +++ b/modules/shared.py @@ -9,7 +9,8 @@ from modules import options, shared_cmd_options, shared_gradio_themes, shared_it from modules.paths_internal import data_path, extensions_builtin_dir, extensions_dir, models_path, script_path # noqa: F401 if TYPE_CHECKING: - from modules import memmon, shared_state, shared_total_tqdm, styles + from backend.diffusion_engine.base import ForgeDiffusionEngine + from modules import face_restoration, memmon, shared_state, shared_total_tqdm, styles, upscaler cmd_opts = shared_cmd_options.cmd_opts parser = shared_cmd_options.parser @@ -30,18 +31,18 @@ state: "shared_state.State" = None prompt_styles: "styles.StyleDatabase" = None -face_restorers = [] +face_restorers: list["face_restoration.FaceRestoration"] = [] options_templates: dict = None opts: options.Options = None restricted_opts: set[str] = None -sd_model = None +sd_model: "ForgeDiffusionEngine" = None settings_components: dict = None """assigned from ui.py, a mapping on setting names to gradio components responsible for those settings""" -tab_names = [] +tab_names: list[str] = [] latent_upscale_default_mode = "Latent" latent_upscale_modes = { @@ -53,9 +54,7 @@ latent_upscale_modes = { "Latent (nearest-exact)": {"mode": "nearest-exact", "antialias": False}, } -sd_upscalers = [] - -clip_model = None +sd_upscalers: list["upscaler.Upscaler"] = [] progress_print_out = sys.stdout