zrb 1.9.10__py3-none-any.whl → 1.9.12__py3-none-any.whl

zrb/task/llm/history.py

@@ -4,8 +4,6 @@ from collections.abc import Callable
 from copy import deepcopy
 from typing import Any, Optional
 
-from pydantic import BaseModel, Field
-
 from zrb.attr.type import StrAttr
 from zrb.context.any_context import AnyContext
 from zrb.context.any_shared_context import AnySharedContext
@@ -16,19 +14,31 @@ from zrb.util.run import run_async
 
 
 # Define the new ConversationHistoryData model
-class ConversationHistoryData(BaseModel):
-    long_term_context: str = Field(
-        default="",
-        description="A markdown-formatted string containing curated, long-term context.",
-    )
-    conversation_summary: str = Field(
-        default="",
-        description="A free-text summary of the conversation history.",
-    )
-    history: ListOfDict = Field(
-        default_factory=list,
-        description="The recent, un-summarized conversation history.",
-    )
+class ConversationHistoryData:
+    def __init__(
+        self,
+        long_term_context: str = "",
+        conversation_summary: str = "",
+        history: Optional[ListOfDict] = None,
+        messages: Optional[ListOfDict] = None,
+    ):
+        self.long_term_context = long_term_context
+        self.conversation_summary = conversation_summary
+        self.history = (
+            history
+            if history is not None
+            else (messages if messages is not None else [])
+        )
+
+    def to_dict(self) -> dict[str, Any]:
+        return {
+            "long_term_context": self.long_term_context,
+            "conversation_summary": self.conversation_summary,
+            "history": self.history,
+        }
+
+    def model_dump_json(self, indent: int = 2) -> str:
+        return json.dumps(self.to_dict(), indent=indent)
 
     @classmethod
     async def read_from_sources(
@@ -81,7 +91,11 @@ class ConversationHistoryData(BaseModel):
                 return data  # Already a valid instance
             if isinstance(data, dict):
                 # This handles both the new format and the old {'context': ..., 'history': ...}
-                return cls.model_validate(data)
+                return cls(
+                    long_term_context=data.get("long_term_context", ""),
+                    conversation_summary=data.get("conversation_summary", ""),
+                    history=data.get("history", data.get("messages")),
+                )
             elif isinstance(data, list):
                 # Handle very old format (just a list) - wrap it
                 ctx.log_warning(
@@ -183,7 +197,7 @@ async def write_conversation_history(
         ctx, conversation_history_file_attr, render_history_file
     )
     if history_file != "":
-        write_file(history_file, history_data.model_dump_json(indent=2))
+        write_file(history_file, json.dumps(history_data.to_dict(), indent=2))
 
 
 def replace_system_prompt_in_history_list(

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/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/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/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]

{zrb-1.9.10.dist-info → zrb-1.9.12.dist-info}/METADATA

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

{zrb-1.9.10.dist-info → zrb-1.9.12.dist-info}/RECORD

@@ -342,7 +342,7 @@ zrb/task/llm/config.py,sha256=TlyH925_fboIlK2Ixf34tynmenqs9s9rfsnPs4jff78,3490
 zrb/task/llm/context.py,sha256=LGGQ_mb1dWorfshHjGgXEW_pRweGj-6MZcIUFq3AHy4,2213
 zrb/task/llm/context_enrichment.py,sha256=djY4fE9C0zUxJPrrb2xDboBXr_2kPUS_b4HjqslVpHg,6051
 zrb/task/llm/error.py,sha256=s5PSK3ibGupMzOM0P81nstHWrMr3205H0FSDwfhWUDA,3662
-zrb/task/llm/history.py,sha256=cpaNqoEzsNAgzZGPPdohA8U5nTrVWmZ3P1Y5RTtXDgc,7986
+zrb/task/llm/history.py,sha256=dqCwJYRoMVrvyMHb4M6-KLcwAUF4tbDCP7qgD1h694s,8540
 zrb/task/llm/history_summarization.py,sha256=V0G1BiISnxxmD8040PrvT0_dfqGE7zbLtk74KUpuqig,6050
 zrb/task/llm/print_node.py,sha256=zocTKi9gZDxl2I6KNu095TmMc13Yip6SNuWYnswS680,4060
 zrb/task/llm/prompt.py,sha256=qhR8qS8RgaQ23D3amaHSHnBNv_NOnFB_1uxaQNc8KFw,3417
@@ -377,8 +377,10 @@ zrb/util/codemod/modify_method.py,sha256=5fioXjqNQmrf4CV2qlTZHpViF9PMnNer4FvuKam
 zrb/util/codemod/modify_module.py,sha256=2mzi_NxJ-kNFo5G0U_Rqb3JoYQl1s6Izt7b_wAl10F0,715
 zrb/util/cron.py,sha256=UWqqhhM7DDTPx6wjCIdBndnVh3NRu-sdKazp8aZkXh8,3833
 zrb/util/file.py,sha256=tm_8qn0vEM8Hz46yXUcvFHfsLtQNqidQaEuB85xqhFE,2806
-zrb/util/git.py,sha256=gS_Y9sQgJbY0PfgSQiowLvV3Nf0y9C8nT3j6z6oEsG8,8186
-zrb/util/git_subtree.py,sha256=E_UB5OIgm8WkHL9beifRxpZ25_BB9p1H578OhLZTgRU,4611
+zrb/util/git.py,sha256=GS08OqE-gs6mN-_VqACN82DbI81nzG3FiXeim_-jVAU,8193
+zrb/util/git_diff_model.py,sha256=Fthl2nyBz3D5fIfbMCPEFBWfXUB6qA4rQWApKaimaI8,131
+zrb/util/git_subtree.py,sha256=AyQWCWEi2EIzEpYXRnYN55157KMUql0WHj70QNw5PHU,4612
+zrb/util/git_subtree_model.py,sha256=mDMUG6mju1_-XXpIE41EqFdu_gmDeeJ3OAxqcJunY7g,196
 zrb/util/group.py,sha256=T82yr3qg9I5k10VPXkMyrIRIqyfzadSH813bqzwKEPI,4718
 zrb/util/init_path.py,sha256=9eN7CkWNGhDBpjTQs2j9YHVMzui7Y8DEb1WP4aTPzeo,659
 zrb/util/load.py,sha256=DK0KYSlu48HCoGPqnW1IxnE3pHrZSPCstfz8Fjyqqv8,2140
@@ -391,7 +393,7 @@ zrb/util/todo.py,sha256=r9_KYF2-hLKMNjsp6AFK9zivykMrywd-kJ4bCwfdafI,19323
 zrb/util/todo_model.py,sha256=0SJ8aLYfJAscDOk5JsH7pXP3h1rAG91VMCS20-c2Y6A,1576
 zrb/xcom/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/xcom/xcom.py,sha256=o79rxR9wphnShrcIushA0Qt71d_p3ZTxjNf7x9hJB78,1571
-zrb-1.9.10.dist-info/METADATA,sha256=naCcHpyKVqi7EqfXhaJPzV4fyjeSClYKXws2yjpyZno,9778
-zrb-1.9.10.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-zrb-1.9.10.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
-zrb-1.9.10.dist-info/RECORD,,
+zrb-1.9.12.dist-info/METADATA,sha256=-DI8RzdASD_NeRQmc2UTza0e2DoLwD-CFQm4YqENtBk,9778
+zrb-1.9.12.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+zrb-1.9.12.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
+zrb-1.9.12.dist-info/RECORD,,