zrb 1.9.10__tar.gz → 1.9.11__tar.gz

{zrb-1.9.10 → zrb-1.9.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zrb
-Version: 1.9.10
+Version: 1.9.11
 Summary: Your Automation Powerhouse
 Home-page: https://github.com/state-alchemists/zrb
 License: AGPL-3.0-or-later

{zrb-1.9.10 → zrb-1.9.11}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "zrb"
-version = "1.9.10"
+version = "1.9.11"
 description = "Your Automation Powerhouse"
 authors = ["Go Frendi Gunawan <gofrendiasgard@gmail.com>"]
 license = "AGPL-3.0-or-later"

{zrb-1.9.10 → zrb-1.9.11}/src/zrb/util/git.py

@@ -1,16 +1,11 @@
 import os
 from collections.abc import Callable
-from typing import Any
-
-from pydantic import BaseModel
+from typing import TYPE_CHECKING, Any
 
 from zrb.util.cmd.command import run_command
 
-
-class DiffResult(BaseModel):
-    created: list[str]
-    removed: list[str]
-    updated: list[str]
+if TYPE_CHECKING:
+    from zrb.util.git_diff_model import DiffResult
 
 
 async def get_diff(
@@ -18,7 +13,7 @@ async def get_diff(
     source_commit: str,
     current_commit: str,
     print_method: Callable[..., Any] = print,
-) -> DiffResult:
+) -> "DiffResult":
     """
     Get the difference between two commits in a Git repository.
 
@@ -34,6 +29,8 @@ async def get_diff(
     Raises:
         Exception: If the git command returns a non-zero exit code.
     """
+    from zrb.util.git_diff_model import DiffResult
+
     cmd_result, exit_code = await run_command(
         cmd=["git", "diff", source_commit, current_commit],
         cwd=repo_dir,

zrb-1.9.11/src/zrb/util/git_diff_model.py

@@ -0,0 +1,7 @@
+from pydantic import BaseModel
+
+
+class DiffResult(BaseModel):
+    created: list[str]
+    removed: list[str]
+    updated: list[str]

{zrb-1.9.10 → zrb-1.9.11}/src/zrb/util/git_subtree.py

@@ -1,24 +1,15 @@
 import os
 from collections.abc import Callable
-from typing import Any
-
-from pydantic import BaseModel
+from typing import TYPE_CHECKING, Any
 
 from zrb.util.cmd.command import run_command
 from zrb.util.file import read_file, write_file
 
+if TYPE_CHECKING:
+    from zrb.util.git_subtree_model import SubTreeConfig
 
-class SingleSubTreeConfig(BaseModel):
-    repo_url: str
-    branch: str
-    prefix: str
-
-
-class SubTreeConfig(BaseModel):
-    data: dict[str, SingleSubTreeConfig]
 
-
-def load_config(repo_dir: str) -> SubTreeConfig:
+def load_config(repo_dir: str):
     """
     Load the subtree configuration from subtrees.json.
 
@@ -28,13 +19,15 @@ def load_config(repo_dir: str) -> SubTreeConfig:
     Returns:
         SubTreeConfig: The loaded subtree configuration.
     """
+    from zrb.util.git_subtree_model import SubTreeConfig
+
     file_path = os.path.join(repo_dir, "subtrees.json")
     if not os.path.exists(file_path):
         return SubTreeConfig(data={})
     return SubTreeConfig.model_validate_json(read_file(file_path))
 
 
-def save_config(repo_dir: str, config: SubTreeConfig):
+def save_config(repo_dir: str, config: "SubTreeConfig"):
     """
     Save the subtree configuration to subtrees.json.
 
@@ -70,6 +63,8 @@ async def add_subtree(
             name already exists.
         Exception: If the git command returns a non-zero exit code.
     """
+    from zrb.util.git_subtree_model import SingleSubTreeConfig
+
     config = load_config(repo_dir)
     if os.path.isdir(prefix):
         raise ValueError(f"Directory exists: {prefix}")

zrb-1.9.11/src/zrb/util/git_subtree_model.py

@@ -0,0 +1,11 @@
+from pydantic import BaseModel
+
+
+class SingleSubTreeConfig(BaseModel):
+    repo_url: str
+    branch: str
+    prefix: str
+
+
+class SubTreeConfig(BaseModel):
+    data: dict[str, SingleSubTreeConfig]