restructured the code to understand the composition in service object

Author: mayankne

__init__.py

@@ -3,8 +3,17 @@
 Expose commonly used factories and types for simpler imports.
 """
 
-from .builders.core import BuilderFactory, BuilderType
-from .deployers.core import DeployerFactory, DeployerType, DeployerEnv
+from .builders.factory import BuilderFactory, BuilderType
+from .deployers.deployer import DeployerFactory, DeployerType, DeployerEnv
 from .service import Service
+from .repo import Repo
 
-__all__ = ["BuilderFactory", "BuilderType", "DeployerFactory", "DeployerType", "DeployerEnv", "Service"]
+__all__ = [
+    "BuilderFactory",
+    "BuilderType",
+    "DeployerFactory",
+    "DeployerType",
+    "DeployerEnv",
+    "Service",
+    "Repo",
+]

builders/__init__.py

@@ -1,19 +1,2 @@
-"""Builder package: core types and plugin registry.
-Import builders.{core,docker,bake,...} for specific implementations.
-Re-exports core types for backward compatibility."""
-
-from .core import (  # noqa: F401
-    BuilderType,
-    Builder,
-    BuilderFactory,
-    register_builder,
-)
-
-import pkgutil
-from importlib import import_module
-
-__all__ = []
-for finder, name, ispkg in pkgutil.iter_modules(__path__):
-    if name != "core":  # core already imported above
-        import_module(f"{__name__}.{name}")
-        __all__.append(name)
+from .builder import Builder  # type: ignore
+from .factory import BuilderFactory, BuilderType  # type: ignore

builders/bake.py

@@ -1,11 +1,8 @@
-from .core import Builder, BuilderType, register_builder
+from .builder import Builder
 
 
 class BakeBuilder(Builder):
     """Bake (Buildx Bake) builder example."""
 
     def build(self) -> None:
         print("setting the bake builder")
-
-
-register_builder(BuilderType.BAKE, BakeBuilder)

builders/builder.py

@@ -0,0 +1,23 @@
+"""Builder types and plugin registry.
+See sibling modules for concrete implementations."""
+
+from enum import Enum, auto
+from dataclasses import dataclass
+from abc import abstractmethod
+
+# DockerBuilder will be imported dynamically to avoid circular dependency
+
+
+class BuilderType(Enum):
+    DOCKER = auto()
+    BAKE = auto()
+    GCLOUD = auto()
+    HELM = auto()
+
+
+@dataclass
+class Builder:
+    type: BuilderType
+
+    @abstractmethod
+    def build(self) -> None: ...

builders/core.py

@@ -1,12 +1,18 @@
-from .core import Builder, BuilderType, register_builder
+from dataclasses import dataclass
 
+from .builder import Builder
 
+
+@dataclass
 class DockerBuilder(Builder):
     """Dockerfile-based builder example."""
 
+    dockerfile: str
+    dockerfile_path: str
+    context_path: str
+    registry: str
+    tags: list[str]
+    push: bool
+
     def build(self) -> None:
         print("setting the docker builder")
-
-
-# register on import
-register_builder(BuilderType.DOCKER, DockerBuilder)

builders/docker.py

@@ -0,0 +1,34 @@
+from typing import Any, Type
+
+from .builder import BuilderType, Builder
+from .docker import DockerBuilder
+from .helm import HelmBuilder
+from .gcloud import GCloudBuilder
+
+_BUILDER_DISPATCH: dict[BuilderType, Type[Builder]] = {
+    BuilderType.DOCKER: DockerBuilder,
+    BuilderType.HELM: HelmBuilder,
+    BuilderType.GCLOUD: GCloudBuilder,
+}
+
+
+class BuilderFactory:
+    @staticmethod
+    def create_builder(builder_type: str, **kwargs: Any | dict[str, Any]) -> Builder:
+        builder_class = _BUILDER_DISPATCH.get(BuilderType[builder_type.upper()])
+        if not builder_class:
+            raise ValueError(f"Unknown builder type: {builder_type}")
+        return builder_class(type=BuilderType[builder_type.upper()], **kwargs)
+
+
+def main() -> None:
+    builder = BuilderFactory.create_builder(
+        builder_type="gcloud",
+    )
+
+    print(f"Created builder: {builder}")
+    builder.build()
+
+
+if __name__ == "__main__":
+    main()

builders/factory.py

@@ -1,11 +1,8 @@
-from .core import Builder, BuilderType, register_builder
+from .builder import Builder
 
 
 class GCloudBuilder(Builder):
     """Google Cloud Build builder example."""
 
     def build(self) -> None:
         print("setting the gcloud builder")
-
-
-register_builder(BuilderType.GCloudBuild, GCloudBuilder)

builders/gcloud.py

@@ -1,11 +1,15 @@
-from .core import Builder, BuilderType, register_builder
+from dataclasses import dataclass
 
+from .builder import Builder
 
+
+@dataclass
 class HelmBuilder(Builder):
-    """Helm builder example."""
+    chart_directory: str
+    app_version: str
+    chart_version: str
+    registry: str
+    push: bool
 
     def build(self) -> None:
         print("setting the helm builder")
-
-
-register_builder(BuilderType.HELM, HelmBuilder)

builders/helm.py

@@ -1,20 +1,2 @@
-"""Deployer package: core types and plugin registry.
-Import deployers.{core,kustomize,argocd,...} for specific implementations.
-Re-exports core types for backward compatibility."""
-
-from .core import (  # noqa: F401
-    DeployerType,
-    DeployerEnv,
-    Deployer,
-    DeployerFactory,
-    register_deployer,
-)
-
-import pkgutil
-from importlib import import_module
-
-__all__ = []
-for finder, name, ispkg in pkgutil.iter_modules(__path__):
-    if name != "core":  # core already imported above
-        import_module(f"{__name__}.{name}")
-        __all__.append(name)
+from .deployer import Deployer  # type: ignore
+from .factory import DeployerFactory  # type: ignore