From 68173980b582e3bb8195ca531f82eaa438acac05 Mon Sep 17 00:00:00 2001 From: Limitex <76650151+Limitex@users.noreply.github.com> Date: Fri, 31 Oct 2025 23:11:42 +0900 Subject: [PATCH] fix: format --- src/di/di.py | 13 +++++++------ src/infra/diffusers/__init__.py | 2 +- src/infra/diffusers/_autoencoder_repository.py | 8 ++++---- src/nodes/_diffusers_pipeline_loader.py | 2 +- src/nodes/_diffusers_vae_loader.py | 2 +- src/nodes/dto/_autoencoder_dto.py | 6 ++---- src/nodes/dto/_pipeline_dto.py | 6 ++---- 7 files changed, 18 insertions(+), 21 deletions(-) diff --git a/src/di/di.py b/src/di/di.py index 103e558..8c68421 100644 --- a/src/di/di.py +++ b/src/di/di.py @@ -1,14 +1,15 @@ +"""Dependency injection container configuration.""" + from dependency_injector import containers, providers -from ..infra.diffusers import DiffusersAutoencoderRepository -from ..infra.diffusers import DiffusersPipelineRepository -from ..service import CreateAutoencoderService -from ..service import CreatePipelineService -from ..ui import AutoencoderHandler -from ..ui import PipelineHandler +from ..infra.diffusers import DiffusersAutoencoderRepository, DiffusersPipelineRepository +from ..service import CreateAutoencoderService, CreatePipelineService +from ..ui import AutoencoderHandler, PipelineHandler class Container(containers.DeclarativeContainer): + """Dependency injection container for the application.""" + # 1. Repositories pipeline_repository = providers.Factory(DiffusersPipelineRepository) autoencoder_repository = providers.Factory(DiffusersAutoencoderRepository) diff --git a/src/infra/diffusers/__init__.py b/src/infra/diffusers/__init__.py index 7e56fea..71049f3 100644 --- a/src/infra/diffusers/__init__.py +++ b/src/infra/diffusers/__init__.py @@ -1,4 +1,4 @@ from ._autoencoder_repository import DiffusersAutoencoderRepository from ._pipeline_repository import DiffusersPipelineRepository -__all__ = ["DiffusersPipelineRepositoryDiffusersAutoencoderRepository"] +__all__ = ["DiffusersPipelineRepository", "DiffusersAutoencoderRepository"] diff --git a/src/infra/diffusers/_autoencoder_repository.py b/src/infra/diffusers/_autoencoder_repository.py index 51ff593..8d5fc8b 100644 --- a/src/infra/diffusers/_autoencoder_repository.py +++ b/src/infra/diffusers/_autoencoder_repository.py @@ -14,6 +14,7 @@ from diffusers.pipelines.stable_diffusion.convert_from_ckpt import ( renew_vae_resnet_paths, ) from omegaconf import OmegaConf +from safetensors import safe_open from ...domain.repositories import IAutoencoderRepository @@ -197,7 +198,8 @@ class DiffusersAutoencoderRepository(IAutoencoderRepository): ) -> str: # Only support V1 r = requests.get( - "https://raw.githubusercontent.com/CompVis/stable-diffusion/main/configs/stable-diffusion/v1-inference.yaml" + "https://raw.githubusercontent.com/CompVis/stable-diffusion/main/configs/stable-diffusion/v1-inference.yaml", + timeout=30, ) io_obj = io.BytesIO(r.content) @@ -205,11 +207,9 @@ class DiffusersAutoencoderRepository(IAutoencoderRepository): image_size = 512 device = "cuda" if torch.cuda.is_available() else "cpu" if checkpoint_path.endswith("safetensors"): - from safetensors import safe_open - checkpoint: dict[str, Any] = {} with safe_open(checkpoint_path, framework="pt", device="cpu") as f: # type: ignore[no-untyped-call] - for key in f.keys(): + for key in f: checkpoint[key] = f.get_tensor(key) else: checkpoint = torch.load(checkpoint_path, map_location=device)["state_dict"] diff --git a/src/nodes/_diffusers_pipeline_loader.py b/src/nodes/_diffusers_pipeline_loader.py index 2d17470..38edf10 100644 --- a/src/nodes/_diffusers_pipeline_loader.py +++ b/src/nodes/_diffusers_pipeline_loader.py @@ -11,7 +11,7 @@ class DiffusersPipelineLoader: pass @classmethod - def INPUT_TYPES(s) -> dict[str, dict[str, tuple[tuple[str, ...], ...]]]: + def INPUT_TYPES(cls) -> dict[str, dict[str, tuple[tuple[str, ...], ...]]]: return { "required": { "checkpoint_name": (folder_paths.get_filename_list("checkpoints"),), diff --git a/src/nodes/_diffusers_vae_loader.py b/src/nodes/_diffusers_vae_loader.py index 02a1f2a..ab5408b 100644 --- a/src/nodes/_diffusers_vae_loader.py +++ b/src/nodes/_diffusers_vae_loader.py @@ -11,7 +11,7 @@ class DiffusersVaeLoader: pass @classmethod - def INPUT_TYPES(s) -> dict[str, dict[str, tuple[tuple[str, ...], ...]]]: + def INPUT_TYPES(cls) -> dict[str, dict[str, tuple[tuple[str, ...], ...]]]: return { "required": { "vae_name": (folder_paths.get_filename_list("vae"),), diff --git a/src/nodes/dto/_autoencoder_dto.py b/src/nodes/dto/_autoencoder_dto.py index cb88439..ff2614d 100644 --- a/src/nodes/dto/_autoencoder_dto.py +++ b/src/nodes/dto/_autoencoder_dto.py @@ -8,8 +8,7 @@ from ...domain.model import AutoencoderModel @dataclass class ComfyUIAutoencoderDTO: - """ - Data Transfer Object for Diffusers Autoencoder in ComfyUI. + """Data Transfer Object for Diffusers Autoencoder in ComfyUI. This DTO is designed to be used across different custom nodes. Other node developers can import and use this type for autoencoder operations. @@ -47,8 +46,7 @@ class ComfyUIAutoencoderDTO: @classmethod def from_domain(cls, model: AutoencoderModel) -> "ComfyUIAutoencoderDTO": - """ - Create DTO from domain model. + """Create DTO from domain model. Args: model: AutoencoderModel from domain layer diff --git a/src/nodes/dto/_pipeline_dto.py b/src/nodes/dto/_pipeline_dto.py index c74134e..8176f86 100644 --- a/src/nodes/dto/_pipeline_dto.py +++ b/src/nodes/dto/_pipeline_dto.py @@ -8,8 +8,7 @@ from ...domain.model import PipelineModel @dataclass class ComfyUIPipelineDTO: - """ - Data Transfer Object for Diffusers Pipeline in ComfyUI. + """Data Transfer Object for Diffusers Pipeline in ComfyUI. This DTO is designed to be used across different custom nodes. Other node developers can import and use this type for pipeline operations. @@ -46,8 +45,7 @@ class ComfyUIPipelineDTO: @classmethod def from_domain(cls, model: PipelineModel) -> "ComfyUIPipelineDTO": - """ - Create DTO from domain model. + """Create DTO from domain model. Args: model: PipelineModel from domain layer