style: rename
This commit is contained in:
+7
-7
@@ -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,
|
||||
)
|
||||
|
||||
@@ -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",
|
||||
]
|
||||
|
||||
@@ -4,6 +4,6 @@ from diffusers import AutoencoderKL
|
||||
|
||||
|
||||
@dataclass
|
||||
class AutoencoderModel:
|
||||
class Autoencoder:
|
||||
autoencoder: AutoencoderKL
|
||||
path: str
|
||||
|
||||
@@ -4,6 +4,6 @@ from diffusers import StableDiffusionPipeline
|
||||
|
||||
|
||||
@dataclass
|
||||
class PipelineModel:
|
||||
class Pipeline:
|
||||
pipeline: StableDiffusionPipeline
|
||||
path: str
|
||||
|
||||
@@ -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"]
|
||||
|
||||
+1
-1
@@ -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
|
||||
+1
-1
@@ -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
|
||||
@@ -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`)
|
||||
|
||||
@@ -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()
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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"]
|
||||
|
||||
@@ -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)
|
||||
@@ -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)
|
||||
@@ -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}")
|
||||
|
||||
@@ -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}")
|
||||
|
||||
Reference in New Issue
Block a user