zrb 1.9.11__tar.gz → 1.9.13__tar.gz

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

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

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

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

{zrb-1.9.11 → zrb-1.9.13}/src/zrb/task/llm/error.py

@@ -1,18 +1,23 @@
 import json
 from typing import TYPE_CHECKING, Optional
 
-from pydantic import BaseModel
-
 if TYPE_CHECKING:
     from openai import APIError
 
 
 # Define a structured error model for tool execution failures
-class ToolExecutionError(BaseModel):
-    tool_name: str
-    error_type: str
-    message: str
-    details: Optional[str] = None
+class ToolExecutionError:
+    def __init__(
+        self,
+        tool_name: str,
+        error_type: str,
+        message: str,
+        details: Optional[str] = None,
+    ):
+        self.tool_name = tool_name
+        self.error_type = error_type
+        self.message = message
+        self.details = details
 
 
 def extract_api_error_details(error: "APIError") -> str:

{zrb-1.9.11 → zrb-1.9.13}/src/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-1.9.13/src/zrb/util/git_diff_model.py

@@ -0,0 +1,10 @@
+class DiffResult:
+    def __init__(
+        self,
+        created: list[str] | None = None,
+        removed: list[str] | None = None,
+        updated: list[str] | None = None,
+    ):
+        self.created = created if created is not None else []
+        self.removed = removed if removed is not None else []
+        self.updated = updated if updated is not None else []

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

@@ -0,0 +1,10 @@
+class SingleSubTreeConfig:
+    def __init__(self, repo_url: str, branch: str, prefix: str):
+        self.repo_url = repo_url
+        self.branch = branch
+        self.prefix = prefix
+
+
+class SubTreeConfig:
+    def __init__(self, data: dict[str, SingleSubTreeConfig]):
+        self.data = data

zrb-1.9.13/src/zrb/util/todo_model.py

@@ -0,0 +1,46 @@
+import datetime
+import re
+
+
+class TodoTaskModel:
+    def __init__(
+        self,
+        description: str,
+        priority: str | None = "D",
+        completed: bool = False,
+        projects: list[str] | None = None,
+        contexts: list[str] | None = None,
+        keyval: dict[str, str] | None = None,
+        creation_date: datetime.date | None = None,
+        completion_date: datetime.date | None = None,
+    ):
+        if priority is not None and not re.match(r"^[A-Z]$", priority):
+            raise ValueError("Invalid priority format")
+        if completion_date and not creation_date:
+            raise ValueError(
+                "creation_date must be specified if completion_date is set."
+            )
+        self.priority = priority
+        self.completed = completed
+        self.description = description
+        self.projects = projects if projects is not None else []
+        self.contexts = contexts if contexts is not None else []
+        self.keyval = keyval if keyval is not None else {}
+        self.creation_date = creation_date
+        self.completion_date = completion_date
+
+    def get_additional_info_length(self):
+        """
+        Calculate the length of the additional information string (projects, contexts, keyval).
+
+        Returns:
+            int: The length of the combined additional information string.
+        """
+        results = []
+        for project in self.projects:
+            results.append(f"@{project}")
+        for context in self.contexts:
+            results.append(f"+{context}")
+        for key, val in self.keyval.items():
+            results.append(f"{key}:{val}")
+        return len(", ".join(results))

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

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

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

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

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

@@ -1,40 +0,0 @@
-import datetime
-
-from pydantic import BaseModel, Field, model_validator
-
-
-class TodoTaskModel(BaseModel):
-    priority: str | None = Field("D", pattern=r"^[A-Z]$")  # Priority like A, B, ...
-    completed: bool = False  # True if completed, False otherwise
-    description: str  # Main task description
-    projects: list[str] = []  # List of projects (e.g., +Project)
-    contexts: list[str] = []  # List of contexts (e.g., @Context)
-    keyval: dict[str, str] = {}  # Special key (e.g., due:2016-05-30)
-    creation_date: datetime.date | None = None  # Creation date
-    completion_date: datetime.date | None = None  # Completion date
-
-    @model_validator(mode="before")
-    def validate_dates(cls, values):
-        completion_date = values.get("completion_date")
-        creation_date = values.get("creation_date")
-        if completion_date and not creation_date:
-            raise ValueError(
-                "creation_date must be specified if completion_date is set."
-            )
-        return values
-
-    def get_additional_info_length(self):
-        """
-        Calculate the length of the additional information string (projects, contexts, keyval).
-
-        Returns:
-            int: The length of the combined additional information string.
-        """
-        results = []
-        for project in self.projects:
-            results.append(f"@{project}")
-        for context in self.contexts:
-            results.append(f"+{context}")
-        for key, val in self.keyval.items():
-            results.append(f"{key}:{val}")
-        return len(", ".join(results))