From 1f9028a6f0707aaa4ec3c4a12e3cbcf3e1db317f Mon Sep 17 00:00:00 2001 From: Limitex <76650151+Limitex@users.noreply.github.com> Date: Fri, 31 Oct 2025 23:45:05 +0900 Subject: [PATCH] style: rename --- src/di/di.py | 14 +++++++------- src/domain/model/__init__.py | 8 ++++---- src/domain/model/_autoencoder.py | 2 +- src/domain/model/_pipeline.py | 2 +- src/domain/repositories/__init__.py | 6 +++--- ...er_repository.py => _autoencoder_repository.py} | 2 +- ...eline_repository.py => _pipeline_repository.py} | 2 +- src/infra/diffusers/_autoencoder_repository.py | 6 +++--- src/infra/diffusers/_pipeline_repository.py | 4 ++-- src/nodes/dto/_autoencoder_dto.py | 8 ++++---- src/nodes/dto/_pipeline_dto.py | 8 ++++---- src/service/__init__.py | 6 +++--- ...oencoder_service.py => _autoencoder_service.py} | 12 ++++++------ ...te_pipeline_service.py => _pipeline_service.py} | 12 ++++++------ src/ui/_autoencoder_handler.py | 10 +++++----- src/ui/_pipeline_handler.py | 10 +++++----- 16 files changed, 56 insertions(+), 56 deletions(-) rename src/domain/repositories/{_i_autoencoder_repository.py => _autoencoder_repository.py} (90%) rename src/domain/repositories/{_i_pipeline_repository.py => _pipeline_repository.py} (92%) rename src/service/{_create_autoencoder_service.py => _autoencoder_service.py} (68%) rename src/service/{_create_pipeline_service.py => _pipeline_service.py} (70%) diff --git a/src/di/di.py b/src/di/di.py index 8c68421..915143a 100644 --- a/src/di/di.py +++ b/src/di/di.py @@ -3,7 +3,7 @@ from dependency_injector import containers, providers from ..infra.diffusers import DiffusersAutoencoderRepository, DiffusersPipelineRepository -from ..service import CreateAutoencoderService, CreatePipelineService +from ..service import AutoencoderService, PipelineService from ..ui import AutoencoderHandler, PipelineHandler @@ -15,21 +15,21 @@ class Container(containers.DeclarativeContainer): autoencoder_repository = providers.Factory(DiffusersAutoencoderRepository) # 2. Services - create_pipeline_service = providers.Factory( - CreatePipelineService, + pipeline_service = providers.Factory( + PipelineService, pipeline_repo=pipeline_repository, ) - create_autoencoder_service = providers.Factory( - CreateAutoencoderService, + autoencoder_service = providers.Factory( + AutoencoderService, autoencoder_repo=autoencoder_repository, ) # 3. Handler pipeline_handler = providers.Factory( PipelineHandler, - create_pipeline_service=create_pipeline_service, + pipeline_service=pipeline_service, ) autoencoder_handler = providers.Factory( AutoencoderHandler, - create_autoencoder_service=create_autoencoder_service, + autoencoder_service=autoencoder_service, ) diff --git a/src/domain/model/__init__.py b/src/domain/model/__init__.py index 8c98978..3b30e52 100644 --- a/src/domain/model/__init__.py +++ b/src/domain/model/__init__.py @@ -1,7 +1,7 @@ -from ._autoencoder import AutoencoderModel -from ._pipeline import PipelineModel +from ._autoencoder import Autoencoder +from ._pipeline import Pipeline __all__ = [ - "PipelineModel", - "AutoencoderModel", + "Pipeline", + "Autoencoder", ] diff --git a/src/domain/model/_autoencoder.py b/src/domain/model/_autoencoder.py index cdaba2a..e3b703f 100644 --- a/src/domain/model/_autoencoder.py +++ b/src/domain/model/_autoencoder.py @@ -4,6 +4,6 @@ from diffusers import AutoencoderKL @dataclass -class AutoencoderModel: +class Autoencoder: autoencoder: AutoencoderKL path: str diff --git a/src/domain/model/_pipeline.py b/src/domain/model/_pipeline.py index b7fe875..3641a9c 100644 --- a/src/domain/model/_pipeline.py +++ b/src/domain/model/_pipeline.py @@ -4,6 +4,6 @@ from diffusers import StableDiffusionPipeline @dataclass -class PipelineModel: +class Pipeline: pipeline: StableDiffusionPipeline path: str diff --git a/src/domain/repositories/__init__.py b/src/domain/repositories/__init__.py index 8781c41..8e067bd 100644 --- a/src/domain/repositories/__init__.py +++ b/src/domain/repositories/__init__.py @@ -1,4 +1,4 @@ -from ._i_autoencoder_repository import IAutoencoderRepository -from ._i_pipeline_repository import IPipelineRepository +from ._autoencoder_repository import AutoencoderRepository +from ._pipeline_repository import PipelineRepository -__all__ = ["IPipelineRepository", "IAutoencoderRepository"] +__all__ = ["PipelineRepository", "AutoencoderRepository"] diff --git a/src/domain/repositories/_i_autoencoder_repository.py b/src/domain/repositories/_autoencoder_repository.py similarity index 90% rename from src/domain/repositories/_i_autoencoder_repository.py rename to src/domain/repositories/_autoencoder_repository.py index 37830da..d2deff8 100644 --- a/src/domain/repositories/_i_autoencoder_repository.py +++ b/src/domain/repositories/_autoencoder_repository.py @@ -4,7 +4,7 @@ import torch from diffusers import AutoencoderKL -class IAutoencoderRepository(ABC): +class AutoencoderRepository(ABC): @abstractmethod def convert_and_save_from_single_file(self, checkpoint_path: str) -> str: pass diff --git a/src/domain/repositories/_i_pipeline_repository.py b/src/domain/repositories/_pipeline_repository.py similarity index 92% rename from src/domain/repositories/_i_pipeline_repository.py rename to src/domain/repositories/_pipeline_repository.py index 4d34729..9693043 100644 --- a/src/domain/repositories/_i_pipeline_repository.py +++ b/src/domain/repositories/_pipeline_repository.py @@ -4,7 +4,7 @@ import torch from diffusers import StableDiffusionPipeline -class IPipelineRepository(ABC): +class PipelineRepository(ABC): @abstractmethod def convert_and_save_from_single_file(self, checkpoint_path: str, dtype: torch.dtype) -> str: pass diff --git a/src/infra/diffusers/_autoencoder_repository.py b/src/infra/diffusers/_autoencoder_repository.py index 9721561..bc0af7b 100644 --- a/src/infra/diffusers/_autoencoder_repository.py +++ b/src/infra/diffusers/_autoencoder_repository.py @@ -16,10 +16,10 @@ from diffusers.pipelines.stable_diffusion.convert_from_ckpt import ( from omegaconf import OmegaConf from safetensors import safe_open -from ...domain.repositories import IAutoencoderRepository +from ...domain.repositories import AutoencoderRepository -class DiffusersAutoencoderRepository(IAutoencoderRepository): +class DiffusersAutoencoderRepository(AutoencoderRepository): def __init__(self) -> None: self.cache_dir = folder_paths.get_temp_directory() @@ -38,7 +38,7 @@ class DiffusersAutoencoderRepository(IAutoencoderRepository): cache_dir=self.cache_dir, ) return vae - + # --- TECHNICAL DEBT & RISK WARNING --- # # The following methods (`_custom_convert_ldm_vae_checkpoint` and `_vae_pt_to_vae_diffuser`) diff --git a/src/infra/diffusers/_pipeline_repository.py b/src/infra/diffusers/_pipeline_repository.py index bc83eec..dde10c0 100644 --- a/src/infra/diffusers/_pipeline_repository.py +++ b/src/infra/diffusers/_pipeline_repository.py @@ -4,10 +4,10 @@ import folder_paths # pyright: ignore[reportMissingImports] import torch from diffusers import StableDiffusionPipeline -from ...domain.repositories import IPipelineRepository +from ...domain.repositories import PipelineRepository -class DiffusersPipelineRepository(IPipelineRepository): +class DiffusersPipelineRepository(PipelineRepository): def __init__(self) -> None: self.cache_dir = folder_paths.get_temp_directory() diff --git a/src/nodes/dto/_autoencoder_dto.py b/src/nodes/dto/_autoencoder_dto.py index ff2614d..7e1fdfd 100644 --- a/src/nodes/dto/_autoencoder_dto.py +++ b/src/nodes/dto/_autoencoder_dto.py @@ -3,7 +3,7 @@ from typing import ClassVar from diffusers import AutoencoderKL -from ...domain.model import AutoencoderModel +from ...domain.model import Autoencoder @dataclass @@ -45,13 +45,13 @@ class ComfyUIAutoencoderDTO: path: str @classmethod - def from_domain(cls, model: AutoencoderModel) -> "ComfyUIAutoencoderDTO": + def from_domain(cls, autoencoder: Autoencoder) -> "ComfyUIAutoencoderDTO": """Create DTO from domain model. Args: - model: AutoencoderModel from domain layer + autoencoder: Autoencoder from domain layer Returns: ComfyUIAutoencoderDTO instance """ - return cls(autoencoder=model.autoencoder, path=model.path) + return cls(autoencoder=autoencoder.autoencoder, path=autoencoder.path) diff --git a/src/nodes/dto/_pipeline_dto.py b/src/nodes/dto/_pipeline_dto.py index 8176f86..f43a6f3 100644 --- a/src/nodes/dto/_pipeline_dto.py +++ b/src/nodes/dto/_pipeline_dto.py @@ -3,7 +3,7 @@ from typing import ClassVar from diffusers import StableDiffusionPipeline -from ...domain.model import PipelineModel +from ...domain.model import Pipeline @dataclass @@ -44,13 +44,13 @@ class ComfyUIPipelineDTO: path: str @classmethod - def from_domain(cls, model: PipelineModel) -> "ComfyUIPipelineDTO": + def from_domain(cls, pipeline: Pipeline) -> "ComfyUIPipelineDTO": """Create DTO from domain model. Args: - model: PipelineModel from domain layer + pipeline: Pipeline from domain layer Returns: ComfyUIPipelineDTO instance """ - return cls(pipeline=model.pipeline, path=model.path) + return cls(pipeline=pipeline.pipeline, path=pipeline.path) diff --git a/src/service/__init__.py b/src/service/__init__.py index 7cfaf38..d35cd52 100644 --- a/src/service/__init__.py +++ b/src/service/__init__.py @@ -1,4 +1,4 @@ -from ._create_autoencoder_service import CreateAutoencoderService -from ._create_pipeline_service import CreatePipelineService +from ._autoencoder_service import AutoencoderService +from ._pipeline_service import PipelineService -__all__ = ["CreatePipelineService", "CreateAutoencoderService"] +__all__ = ["PipelineService", "AutoencoderService"] diff --git a/src/service/_create_autoencoder_service.py b/src/service/_autoencoder_service.py similarity index 68% rename from src/service/_create_autoencoder_service.py rename to src/service/_autoencoder_service.py index 98f9375..88347ef 100644 --- a/src/service/_create_autoencoder_service.py +++ b/src/service/_autoencoder_service.py @@ -2,16 +2,16 @@ import os import torch -from ..domain.model import AutoencoderModel -from ..domain.repositories import IAutoencoderRepository +from ..domain.model import Autoencoder +from ..domain.repositories import AutoencoderRepository -class CreateAutoencoderService: - def __init__(self, autoencoder_repo: IAutoencoderRepository) -> None: +class AutoencoderService: + def __init__(self, autoencoder_repo: AutoencoderRepository) -> None: self.autoencoder_repo = autoencoder_repo self.dtype = torch.float32 - def create_from_checkpoint(self, checkpoint_full_path: str) -> AutoencoderModel: + def create_from_checkpoint(self, checkpoint_full_path: str) -> Autoencoder: path = self.autoencoder_repo.convert_and_save_from_single_file(checkpoint_full_path) if not os.path.exists(path): raise RuntimeError(f"Failed to convert VAE checkpoint: {checkpoint_full_path}") @@ -22,4 +22,4 @@ class CreateAutoencoderService: f"Failed to create autoencoder from checkpoint: {checkpoint_full_path}" ) - return AutoencoderModel(autoencoder=vae, path=path) + return Autoencoder(autoencoder=vae, path=path) diff --git a/src/service/_create_pipeline_service.py b/src/service/_pipeline_service.py similarity index 70% rename from src/service/_create_pipeline_service.py rename to src/service/_pipeline_service.py index 9bb20d8..83af727 100644 --- a/src/service/_create_pipeline_service.py +++ b/src/service/_pipeline_service.py @@ -2,16 +2,16 @@ import os import torch -from ..domain.model import PipelineModel -from ..domain.repositories import IPipelineRepository +from ..domain.model import Pipeline +from ..domain.repositories import PipelineRepository -class CreatePipelineService: - def __init__(self, pipeline_repo: IPipelineRepository) -> None: +class PipelineService: + def __init__(self, pipeline_repo: PipelineRepository) -> None: self.pipeline_repo = pipeline_repo self.dtype = torch.float32 - def create_from_checkpoint(self, checkpoint_full_path: str) -> PipelineModel: + def create_from_checkpoint(self, checkpoint_full_path: str) -> Pipeline: path = self.pipeline_repo.convert_and_save_from_single_file( checkpoint_full_path, self.dtype ) @@ -22,4 +22,4 @@ class CreatePipelineService: if pipe is None: raise RuntimeError(f"Failed to create pipeline from checkpoint: {checkpoint_full_path}") - return PipelineModel(pipeline=pipe, path=path) + return Pipeline(pipeline=pipe, path=path) diff --git a/src/ui/_autoencoder_handler.py b/src/ui/_autoencoder_handler.py index fd80ea5..c546177 100644 --- a/src/ui/_autoencoder_handler.py +++ b/src/ui/_autoencoder_handler.py @@ -2,15 +2,15 @@ import os import folder_paths # pyright: ignore[reportMissingImports] -from ..domain.model import AutoencoderModel -from ..service import CreateAutoencoderService +from ..domain.model import Autoencoder +from ..service import AutoencoderService class AutoencoderHandler: - def __init__(self, create_autoencoder_service: CreateAutoencoderService) -> None: - self.create_autoencoder_service = create_autoencoder_service + def __init__(self, autoencoder_service: AutoencoderService) -> None: + self.create_autoencoder_service = autoencoder_service - def create(self, checkpoint_name: str) -> AutoencoderModel: + def create(self, checkpoint_name: str) -> Autoencoder: checkpoint_path = folder_paths.get_full_path("vae", checkpoint_name) if not os.path.exists(checkpoint_path): raise FileNotFoundError(f"VAE file not found: {checkpoint_name}") diff --git a/src/ui/_pipeline_handler.py b/src/ui/_pipeline_handler.py index dee509e..02eaefd 100644 --- a/src/ui/_pipeline_handler.py +++ b/src/ui/_pipeline_handler.py @@ -2,15 +2,15 @@ import os import folder_paths # pyright: ignore[reportMissingImports] -from ..domain.model import PipelineModel -from ..service import CreatePipelineService +from ..domain.model import Pipeline +from ..service import PipelineService class PipelineHandler: - def __init__(self, create_pipeline_service: CreatePipelineService) -> None: - self.create_pipeline_service = create_pipeline_service + def __init__(self, pipeline_service: PipelineService) -> None: + self.create_pipeline_service = pipeline_service - def create(self, checkpoint_name: str) -> PipelineModel: + def create(self, checkpoint_name: str) -> Pipeline: checkpoint_path = folder_paths.get_full_path("checkpoints", checkpoint_name) if not os.path.exists(checkpoint_path): raise FileNotFoundError(f"Checkpoint file not found: {checkpoint_name}")