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

zrb/builtin/llm/chat_session.py

@@ -6,6 +6,7 @@ conversation flow via XCom.
 """
 
 import asyncio
+import sys
 
 from zrb.config.llm_config import llm_config
 from zrb.context.any_context import AnyContext
@@ -15,45 +16,26 @@ from zrb.util.cli.style import stylize_bold_yellow, stylize_faint
 async def read_user_prompt(ctx: AnyContext) -> str:
     """
     Reads user input from the CLI for an interactive chat session.
-
-    Handles special commands like /bye, /multi, /end, and /help.
-    Triggers the LLM task and waits for the result.
-
-    Args:
-        ctx: The context object for the task.
-
-    Returns:
-        The final result from the LLM session.
+    Orchestrates the session by calling helper functions.
     """
-    from prompt_toolkit import PromptSession
-
     _show_info(ctx)
-    final_result = ""
-    ctx.print("💬 >>", plain=True)
-    ctx.print(ctx.input.message, plain=True)
-    ctx.print("", plain=True)
-    result = await _trigger_ask_and_wait_for_result(
-        ctx,
-        user_prompt=ctx.input.message,
-        previous_session_name=ctx.input.previous_session,
-        start_new=ctx.input.start_new,
-    )
-    if result is not None:
-        final_result = result
-    if ctx.env.get("_ZRB_WEB_ENV", "0") != "0":
-        # On web environment this won't be interactive
+    is_web = ctx.env.get("_ZRB_WEB_ENV", "0") == "1"
+    final_result = await _handle_initial_message(ctx)
+    if is_web:
         return final_result
+    is_interactive = sys.stdin.isatty()
+    reader = await _setup_input_reader(is_interactive)
     multiline_mode = False
     user_inputs = []
-    user_input_session = PromptSession()
     while True:
         await asyncio.sleep(0.01)
+        # Get user input based on mode
         if not multiline_mode:
             ctx.print("💬 >>", plain=True)
-        user_input = await user_input_session.prompt_async()
+        user_input = await _read_next_line(is_interactive, reader, ctx)
         if not multiline_mode:
             ctx.print("", plain=True)
-        # Handle special input
+        # Handle user input
         if user_input.strip().lower() in ("/bye", "/quit", "/q", "/exit"):
             user_prompt = "\n".join(user_inputs)
             user_inputs = []
@@ -86,6 +68,67 @@ async def read_user_prompt(ctx: AnyContext) -> str:
     return final_result
 
 
+def _show_info(ctx: AnyContext):
+    """
+    Displays the available chat session commands to the user.
+    Args:
+        ctx: The context object for the task.
+    """
+    ctx.print(
+        (
+            f"  {stylize_bold_yellow('/bye')}   {stylize_faint('Quit from chat session')}\n"
+            f"  {stylize_bold_yellow('/multi')} {stylize_faint('Start multiline input')}\n"
+            f"  {stylize_bold_yellow('/end')}   {stylize_faint('End multiline input')}\n"
+            f"  {stylize_bold_yellow('/help')}  {stylize_faint('Show this message')}\n"
+        ),
+        plain=True,
+    )
+
+
+async def _handle_initial_message(ctx: AnyContext) -> str:
+    """Processes the initial message from the command line."""
+    if not ctx.input.message or ctx.input.message.strip() == "":
+        return ""
+    ctx.print("💬 >>", plain=True)
+    ctx.print(ctx.input.message, plain=True)
+    ctx.print("", plain=True)
+    result = await _trigger_ask_and_wait_for_result(
+        ctx,
+        user_prompt=ctx.input.message,
+        previous_session_name=ctx.input.previous_session,
+        start_new=ctx.input.start_new,
+    )
+    return result if result is not None else ""
+
+
+async def _setup_input_reader(is_interactive: bool):
+    """Sets up and returns the appropriate asynchronous input reader."""
+    if is_interactive:
+        from prompt_toolkit import PromptSession
+
+        return PromptSession()
+
+    loop = asyncio.get_event_loop()
+    reader = asyncio.StreamReader(loop=loop)
+    protocol = asyncio.StreamReaderProtocol(reader)
+    await loop.connect_read_pipe(lambda: protocol, sys.stdin)
+    return reader
+
+
+async def _read_next_line(is_interactive: bool, reader, ctx: AnyContext) -> str:
+    """Reads one line of input using the provided reader."""
+    if is_interactive:
+        return await reader.prompt_async()
+
+    line_bytes = await reader.readline()
+    if not line_bytes:
+        return "/bye"  # Signal to exit
+
+    user_input = line_bytes.decode().strip()
+    ctx.print(user_input, plain=True)
+    return user_input
+
+
 async def _trigger_ask_and_wait_for_result(
     ctx: AnyContext,
     user_prompt: str,
@@ -211,21 +254,3 @@ async def _wait_ask_session_name(ctx: AnyContext) -> str:
     while "ask_session_name" not in ctx.xcom or len(ctx.xcom.ask_session_name) == 0:
         await asyncio.sleep(0.1)
     return ctx.xcom.ask_session_name.pop()
-
-
-def _show_info(ctx: AnyContext):
-    """
-    Displays the available chat session commands to the user.
-
-    Args:
-        ctx: The context object for the task.
-    """
-    ctx.print(
-        (
-            f"  {stylize_bold_yellow('/bye')}   {stylize_faint('Quit from chat session')}\n"
-            f"  {stylize_bold_yellow('/multi')} {stylize_faint('Start multiline input')}\n"
-            f"  {stylize_bold_yellow('/end')}   {stylize_faint('End multiline input')}\n"
-            f"  {stylize_bold_yellow('/help')}  {stylize_faint('Show this message')}\n"
-        ),
-        plain=True,
-    )

zrb/config/llm_config.py

@@ -8,207 +8,139 @@ if TYPE_CHECKING:
     from pydantic_ai.settings import ModelSettings
 
 
-_DEFAULT_PERSONA = (
-    "You are a helpful and efficient AI agent specializing in CLI " "interaction."
-)
+_DEFAULT_PERSONA = "You are a helpful and efficient AI agent."
 
 _DEFAULT_INTERACTIVE_SYSTEM_PROMPT = (
-    "This is an interactive CLI session. Your standard response format is\n"
-    "GitHub-flavored Markdown. You MUST follow this thinking process:\n\n"
-    "1.  **Analyze Request, Scope & Identify Gaps:** Use the `Scratchpad`\n"
-    "    and `Narrative Summary` to fully understand the user's request.\n"
-    "    - **Determine Scope:** Critically assess if the request is a\n"
-    "      one-time command or a standing order that should affect future\n"
-    "      interactions (e.g., 'From now on...'). Resolve contextual\n"
-    "      references like 'it' or 'that' to the immediate topic.\n"
-    "    - **Identify Gaps:** Assess if you have enough information to\n"
-    "      proceed. If not, identify the missing information as an\n"
-    "      'information gap'.\n\n"
-    "2.  **Fill Information Gaps:** Before planning, you MUST proactively use\n"
-    "    your tools to fill any identified information gaps. Be persistent.\n"
-    "    If one tool or approach fails, try another until you have the\n"
-    "    necessary information or determine it's impossible to obtain.\n\n"
-    "3.  **Plan & Verify Pre-conditions:** Create a step-by-step plan. Before\n"
-    "    executing, use read-only tools to check the current state. For\n"
-    "    example, if the plan is to create a file, check if it already\n"
-    "    exists. If pre-conditions are not as expected, inform the user.\n\n"
-    "4.  **Assess Consent & Execute:**\n"
-    "    - **You have standing consent to use any read-only tools** for\n"
-    "      information gathering, planning, and verification. You do not\n"
-    "      need to ask for permission for these actions.\n"
-    "    - If the user's last instruction was an explicit command (e.g.,\n"
-    '      "create file X", "delete Y"), you have consent. Proceed with the\n'
-    "      action.\n"
-    '    - If the request was general (e.g., "fix the bug") and your plan\n'
-    "      involves a potentially altering action, you MUST explain the\n"
-    "      action and ask for user approval before proceeding.\n\n"
-    "5.  **Verify Outcome:** After executing the action, use read-only tools to\n"
-    "    confirm it was successful. Report the outcome to the user.\n\n"
+    "You are an expert AI agent in a CLI. You MUST follow this workflow for "
+    "this interactive session. Respond in GitHub-flavored Markdown.\n\n"
+    "1.  **Analyze and Clarify:** Understand the user's goal. If the request "
+    "is ambiguous, ask clarifying questions. Use your tools to gather "
+    "necessary information before proceeding.\n\n"
+    "2.  **Assess and Decide:**\n"
+    "    *   For **read-only** actions, proceed directly.\n"
+    "    *   For **destructive** actions (modifying or deleting data), you "
+    "MUST evaluate the risk. Consider the command's nature, the target's "
+    "importance (e.g., temp file vs. project file vs. system file), and the "
+    "user's specificity. Based on your assessment, decide the appropriate "
+    "course of action:\n"
+    "        *   **Low Risk:** Proceed directly.\n"
+    "        *   **Moderate Risk:** Proceed, but issue a warning.\n"
+    "        *   **High Risk or Vague Request:** Formulate a plan and ask "
+    "for approval.\n"
+    "        *   **Extreme Risk (e.g., operating on critical system "
+    "files):** Refuse and explain the danger.\n\n"
+    "3.  **Execute and Verify (The E+V Loop):**\n"
+    "    *   Execute the action.\n"
+    "    *   **CRITICAL:** Immediately after execution, you MUST use a tool "
+    "to verify the outcome (e.g., after `write_file`, use `read_file`; "
+    "after `rm`, use `ls` to confirm absence).\n\n"
+    "4.  **Report Results:**\n"
+    "    *   Provide a concise summary of the action taken.\n"
+    "    *   **You MUST explicitly state how you verified the action** (e.g., "
+    "'I have deleted the file and verified its removal by listing the "
+    "directory.').\n"
+    "    *   If an error occurs, report the error and the failed verification "
+    "step."
 ).strip()
 
 _DEFAULT_SYSTEM_PROMPT = (
-    "This is a one-shot CLI session. Your final answer MUST be in\n"
-    "GitHub-flavored Markdown. You MUST follow this thinking process:\n\n"
-    "1.  **Analyze Request, Scope & Identify Gaps:** Use the `Scratchpad`\n"
-    "    and `Narrative Summary` to fully understand the user's request.\n"
-    "    - **Determine Scope:** Critically assess if the request is a\n"
-    "      one-time command or a standing order that should affect future\n"
-    "      interactions (e.g., 'From now on...'). Resolve contextual\n"
-    "      references like 'it' or 'that' to the immediate topic.\n"
-    "    - **Identify Gaps:** Assess if you have enough information to\n"
-    "      proceed. If not, identify the missing information as an\n"
-    "      'information gap'.\n\n"
-    "2.  **Fill Information Gaps:** Before planning, you MUST proactively use\n"
-    "    your tools to fill any identified information gaps. Be persistent.\n"
-    "    If one tool or approach fails, try another until you have the\n"
-    "    necessary information or determine it's impossible to obtain.\n\n"
-    "3.  **Plan & Verify Pre-conditions:** Create a step-by-step plan. Before\n"
-    "    executing, use read-only tools to check the current state. For\n"
-    "    example, if the plan is to create a file, check if it already\n"
-    "    exists. If pre-conditions are not as expected, state that and stop.\n\n"
-    "4.  **Assess Consent & Execute:**\n"
-    "    - **You have standing consent to use any read-only tools** for\n"
-    "      information gathering, planning, and verification. You do not\n"
-    "      need to ask for permission for these actions.\n"
-    "    - If the user's last instruction was an explicit command (e.g.,\n"
-    '      "create file X", "delete Y"), you have consent. Proceed with the\n'
-    "      action.\n"
-    '    - If the request was general (e.g., "fix the bug") and your plan\n'
-    "      involves a potentially altering action, you MUST explain the\n"
-    "      action and ask for user approval before proceeding.\n\n"
-    "5.  **Verify Outcome:** After executing the action, use read-only tools to\n"
-    "    confirm it was successful. Report the outcome to the user.\n\n"
+    "You are an expert AI agent executing a one-shot CLI command. You MUST "
+    "follow this workflow. Your final output MUST be in GitHub-flavored "
+    "Markdown.\n\n"
+    "1.  **Plan:** Internally devise a step-by-step plan. This plan MUST "
+    "include verification steps for each action.\n\n"
+    "2.  **Execute and Verify (The E+V Loop):**\n"
+    "    *   Execute each step of your plan.\n"
+    "    *   **CRITICAL:** After each step, you MUST use a tool to verify "
+    "the outcome (e.g., check exit codes, read back file contents, check "
+    "system state).\n\n"
+    "3.  **Report Final Outcome:**\n"
+    "    *   Provide a concise summary of the result.\n"
+    "    *   **You MUST explicitly state how you verified the final state** "
+    "(e.g., 'The script was executed, and I verified its success by checking "
+    "for the presence of the output file `results.txt`.').\n"
+    "    *   If an error occurred, report the error and the failed "
+    "verification step."
 ).strip()
 
 _DEFAULT_SPECIAL_INSTRUCTION_PROMPT = (
-    "## Software Engineering Tasks\n"
-    "When requested to perform tasks like fixing bugs, adding features,\n"
-    "refactoring, or explaining code, follow this sequence:\n"
-    "1. **Understand:** Think about the user's request and the relevant\n"
-    "codebase context. Use your tools to understand file structures,\n"
-    "existing code patterns, and conventions.\n"
-    "2. **Plan:** Build a coherent and grounded plan. Share an extremely\n"
-    "concise yet clear plan with the user.\n"
-    "3. **Implement:** Use the available tools to act on the plan, strictly\n"
-    "adhering to the project's established conventions.\n"
-    "4. **Verify (Tests):** If applicable and feasible, verify the changes\n"
-    "using the project's testing procedures. Identify the correct test\n"
-    "commands and frameworks by examining 'README' files, build/package\n"
-    "configuration, or existing test execution patterns. NEVER assume\n"
-    "standard test commands.\n"
-    "5. **Verify (Standards):** After making code changes, execute the\n"
-    "project-specific build, linting and type-checking commands. This\n"
-    "ensures code quality and adherence to standards.\n\n"
-    "## Shell Command Guidelines\n"
-    "NEVER use backticks (`` ` ``) for command substitution; use `$(...)` "
-    "instead. Always enclose literal strings and paths in single quotes (`'`) "
-    "to prevent unintended interpretation of special characters.\n\n"
-    "## New Applications\n"
-    "When asked to create a new application, follow this workflow:\n"
-    "1. **Understand Requirements:** Analyze the user's request to identify\n"
-    "core features, application type, and constraints.\n"
-    "2. **Propose Plan:** Formulate a development plan. Present a clear,\n"
-    "concise, high-level summary to the user, including technologies to be\n"
-    "used.\n"
-    "3. **User Approval:** Obtain user approval for the proposed plan.\n"
-    "4. **Implementation:** Autonomously implement each feature and design\n"
-    "element per the approved plan.\n"
-    "5. **Verify:** Review work against the original request and the approved\n"
-    "plan. Ensure the application builds and runs without errors.\n"
-    "6. **Solicit Feedback:** Provide instructions on how to start the\n"
-    "application and request user feedback.\n\n"
-    "## Git Repository\n"
-    "If you are in a git repository, you can be asked to commit changes:\n"
-    "- Use `git status` to ensure all relevant files are tracked and staged.\n"
-    "- Use `git diff HEAD` to review all changes.\n"
-    "- Use `git log -n 3` to review recent commit messages and match their\n"
-    "style.\n"
-    "- Propose a draft commit message. Never just ask the user to give you\n"
-    "the full commit message.\n\n"
-    "## Researching\n"
-    "When asked to research a topic, follow this workflow:\n"
-    "1. **Understand:** Clarify the research question and the desired output\n"
-    "format (e.g., summary, list of key points).\n"
-    "2. **Search:** Use your tools to gather information from multiple reputable \n"
-    "sources.\n"
-    "3. **Synthesize & Cite:** Present the information in the requested\n"
-    "format. For every piece of information, you MUST provide a citation\n"
-    "with the source URL."
+    "## Guiding Principles\n"
+    "- **Safety First:** Never run commands that are destructive or could "
+    "compromise the system without explicit user confirmation. When in "
+    "doubt, ask.\n"
+    "- **Adhere to Conventions:** When working within a project, analyze "
+    "existing code, files, and configuration to match its style and "
+    "conventions.\n"
+    "- **Efficiency:** Use your tools to get the job done with the minimum "
+    "number of steps. Combine commands where possible.\n\n"
+    "## Common Task Workflows\n\n"
+    "**File System Operations:**\n"
+    "1.  **Analyze:** Before modifying, read the file or list the "
+    "directory.\n"
+    "2.  **Execute:** Perform the write, delete, or move operation.\n"
+    "3.  **Verify:** Check that the file/directory now exists (or doesn't) in "
+    "its expected state.\n\n"
+    "**Code & Software Development:**\n"
+    "1.  **Understand:** Use tools to analyze the codebase, dependencies, "
+    "and existing patterns.\n"
+    "2.  **Plan:** For non-trivial changes, formulate a plan.\n"
+    "3.  **Implement:** Make the changes, strictly adhering to project "
+    "conventions.\n"
+    "4.  **Verify:** Run all relevant tests, linters, and build commands to "
+    "ensure your changes are correct and meet quality standards.\n\n"
+    "**Research & Analysis:**\n"
+    "1.  **Clarify:** Understand the core question and the desired output "
+    "format.\n"
+    "2.  **Search:** Use web search tools to gather information from multiple "
+    "reputable sources.\n"
+    "3.  **Synthesize & Cite:** Present the information clearly. For factual "
+    "claims, cite the source URL."
 ).strip()
 
 
 _DEFAULT_SUMMARIZATION_PROMPT = (
-    "You are a Conversation Historian. Your task is to distill the\n"
-    "conversation history into a dense, structured snapshot for the main\n"
-    "assistant. This snapshot is CRITICAL, as it will become the agent's\n"
-    "primary short-term memory.\n\n"
-    "## Historian Protocol\n"
-    "You will receive a `Previous Summary` and the `Recent Conversation\n"
-    "History`. Your job is to create a new, updated summary.\n\n"
-    "### 1. Update the Narrative Summary\n"
-    "- **Integrate:** Weave the key events from the `Recent Conversation\n"
-    "  History` into the `Narrative Summary`.\n"
-    "- **Condense and Prune:** As you add new information, you MUST condense\n"
-    "  older parts of the narrative. Be incredibly dense with information.\n"
-    "  Omit any irrelevant conversational filler. The summary should be a\n"
-    "  rolling, high-level overview, not an ever-expanding log.\n\n"
-    "### 2. Update the Scratchpad\n"
-    "- **Purpose:** The Scratchpad is the assistant's working memory. It must\n"
-    "  contain the last few turns of the conversation in full, non-truncated\n"
-    "  detail.\n"
-    "- **ABSOLUTE REQUIREMENT: The assistant's response MUST be COPIED\n"
-    "  VERBATIM into the Scratchpad. It is CRITICAL that you DO NOT\n"
-    "  truncate, summarize, use placeholders, or alter the assistant's\n"
-    "  response in any way. The entire, full response must be preserved.**\n"
-    "- **Format:** Present the assistant's turn as: `assistant (thought:\n"
-    "  brief summary of action) final response`.\n\n"
-    "### 3. Output Specification\n"
-    "Your entire output MUST be a single block of text with these two\n"
-    "sections:\n"
-    "1.  `## Narrative Summary` (The updated and condensed narrative)\n"
-    "2.  `## Scratchpad` (The new, non-truncated recent history)"
+    "You are a Conversation Historian. Your task is to create a dense, "
+    "structured snapshot of the conversation for the main assistant.\n\n"
+    "You will receive a `Previous Summary` and the `Recent Conversation "
+    "History`. Your goal is to produce an updated, rolling summary. Your "
+    "output MUST be a single block of text with two sections:\n\n"
+    "1.  `## Narrative Summary`\n"
+    "    - **Identify Key Information:** From the `Recent Conversation "
+    "History`, extract critical facts, user decisions, and final outcomes "
+    "of tasks.\n"
+    "    - **Integrate and Condense:** Integrate these key facts into the "
+    "`Previous Summary`. Discard conversational filler and intermediate "
+    "steps of completed tasks (e.g., 'User asked to see file X, I showed "
+    "them' can be discarded if the file was just a step towards a larger "
+    "goal). The summary should reflect the current state of the project or "
+    "conversation, not a log of every single turn.\n\n"
+    "2.  `## Transcript`\n"
+    "    - The Transcript is the assistant's working memory. It MUST "
+    "contain the last few turns of the conversation in full detail.\n"
+    "    - **CRITICAL REQUIREMENT:** The assistant's last response MUST be "
+    "COPIED VERBATIM into the Transcript. Do not alter it."
 ).strip()
 
 
 _DEFAULT_CONTEXT_ENRICHMENT_PROMPT = (
-    "You are a Memory Curator. Your sole purpose is to process a\n"
-    "conversation and produce a concise, up-to-date Markdown block of\n"
-    "long-term context for the main assistant.\n\n"
-    "You will be given the previous 'Long-Term Context' and the 'Recent\n"
-    "Conversation History'. Your job is to return a NEW, UPDATED version of\n"
-    "the 'Long-Term Context'.\n\n"
-    "**Your Curation Process:**\n"
-    "1.  **Review:** Analyze the existing 'Long-Term Context'.\n"
-    "2.  **Update:** Read the 'Recent Conversation History' to identify\n"
-    "    new facts, changed goals, or completed tasks.\n"
-    "3.  **Re-write:** Create the new 'Long-Term Context' by applying these\n"
-    "    changes.\n\n"
-    "**CRITICAL CURATION RULES:**\n"
-    "- **Do Not Assume Permanence:** A one-time request (e.g., 'Write it in\n"
-    "  JSON') is NOT a permanent preference. Only save preferences that are\n"
-    "  explicitly stated as long-term (e.g., 'From now on, always...').\n"
-    "- **The context MUST NOT grow indefinitely.** Your primary goal is to\n"
-    "  keep it concise and relevant to the *current* state of the\n"
-    "  conversation.\n"
-    "- **ADD** new, explicitly stable facts (e.g., long-term user\n"
-    "  preferences).\n"
-    "- **UPDATE** existing facts if the user provides new information or if\n"
-    "  new information overrides the previous one.\n"
-    "- **Your primary goal is to create a concise, relevant context.** "
-    "Aggressively prune outdated or irrelevant information, but retain any "
-    "detail, fact, or nuance that is critical for understanding the user's "
-    "current and future goals.\n"
-    "- **CONDENSE** older entries that are still relevant but not the\n"
-    "  immediate focus. For example, a completed high-level goal might be\n"
-    "  condensed into a single 'Past Accomplishments' line item.\n"
-    "\n"
-    "**A Note on Dynamic Information:**\n"
-    "Be mindful that some information is temporary and highly dynamic (e.g.,\n"
-    "current weather, location, current working directory, project context,\n"
-    "or file contents). You MUST add a note to this kind of information,\n"
-    "for example: `(short-term, must be re-verified)`.\n"
-    "The main assistant MUST NOT assume this information is current and\n"
-    "should always use its tools to verify the latest state when needed."
+    "You are a Memory Curator. Your sole purpose is to produce a concise, "
+    "up-to-date Markdown block of long-term context.\n\n"
+    "You will be given the `Previous Long-Term Context` and the `Recent "
+    "Conversation History`. Your job is to return a NEW, UPDATED version of "
+    "the `Long-Term Context` by applying these rules:\n\n"
+    "**Curation Heuristics:**\n"
+    "- **Extract Stable Facts:** Identify durable information such as user "
+    "preferences (e.g., 'I prefer tabs over spaces'), project-level "
+    "decisions, or architectural choices.\n"
+    "- **Integrate, Don't Just Append:** Update existing facts if new "
+    "information overrides them. Merge related facts to keep the context "
+    "dense.\n"
+    "- **Discard Ephemeral Details:** Omit temporary states, resolved "
+    "errors, and one-off requests that do not reflect a permanent preference "
+    "or project state.\n"
+    "- **Mark Dynamic Info:** For temporary information that must be "
+    "retained (e.g., CWD, contents of a file being actively edited), you "
+    "MUST add a note: `(short-term, must be re-verified)`."
 ).strip()
 
 

zrb/task/llm/error.py

@@ -1,18 +1,34 @@
 import json
-from typing import TYPE_CHECKING, Optional
-
-from pydantic import BaseModel
+from typing import TYPE_CHECKING, Any, Optional
 
 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 to_dict(self) -> dict[str, Any]:
+        return {
+            "tool_name": self.tool_name,
+            "error_type": self.error_type,
+            "message": self.message,
+            "details": self.details,
+        }
+
+    def model_dump_json(self, indent: int = 2) -> str:
+        return json.dumps(self.to_dict(), indent=indent)
 
 
 def extract_api_error_details(error: "APIError") -> str:

zrb/task/rsync_task.py

@@ -65,7 +65,7 @@ class RsyncTask(CmdTask):
             remote_host=remote_host,
             render_remote_host=render_remote_host,
             remote_port=remote_port,
-            auto_render_remote_port=render_remote_port,
+            render_remote_port=render_remote_port,
             remote_user=remote_user,
             render_remote_user=render_remote_user,
             remote_password=remote_password,

zrb/util/git_diff_model.py

@@ -1,7 +1,10 @@
-from pydantic import BaseModel
-
-
-class DiffResult(BaseModel):
-    created: list[str]
-    removed: list[str]
-    updated: list[str]
+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/util/git_subtree_model.py

@@ -1,11 +1,32 @@
-from pydantic import BaseModel
+import json
+from typing import Any
 
 
-class SingleSubTreeConfig(BaseModel):
-    repo_url: str
-    branch: str
-    prefix: str
+class SingleSubTreeConfig:
+    def __init__(self, repo_url: str, branch: str, prefix: str):
+        self.repo_url = repo_url
+        self.branch = branch
+        self.prefix = prefix
 
+    def to_dict(self) -> dict[str, Any]:
+        return {
+            "repo_url": self.repo_url,
+            "branch": self.branch,
+            "prefix": self.prefix,
+        }
 
-class SubTreeConfig(BaseModel):
-    data: dict[str, SingleSubTreeConfig]
+    def model_dump_json(self, indent: int = 2) -> str:
+        return json.dumps(self.to_dict(), indent=indent)
+
+
+class SubTreeConfig:
+    def __init__(self, data: dict[str, SingleSubTreeConfig]):
+        self.data = data
+
+    def to_dict(self) -> dict[str, Any]:
+        return {
+            "data": {k: self.data[k].to_dict() for k in self.data},
+        }
+
+    def model_dump_json(self, indent: int = 2) -> str:
+        return json.dumps(self.to_dict(), indent=indent)

zrb/util/string/conversion.py

@@ -178,7 +178,7 @@ def pluralize(noun: str) -> str:
     if noun.lower() in irregulars:
         return irregulars[noun.lower()]
     # Handle words ending in 'y' preceded by a consonant
-    if noun.endswith("y") and not re.match(r"[aeiou]y$", noun):
+    if noun.endswith("y") and not re.match(r".*[aeiou]y$", noun, re.IGNORECASE):
         return re.sub(r"y$", "ies", noun)
     # Handle words ending in 's', 'x', 'z', 'ch', or 'sh'
     if re.search(r"(s|x|z|ch|sh)$", noun):

zrb/util/todo_model.py

@@ -1,27 +1,33 @@
 import datetime
+import re
 
-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")
+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."
             )
-        return values
+        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):
         """

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

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

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

@@ -9,7 +9,7 @@ zrb/builtin/git_subtree.py,sha256=7BKwOkVTWDrR0DXXQ4iJyHqeR6sV5VYRt8y_rEB0EHg,35
 zrb/builtin/group.py,sha256=t008xLM4_fgbjfZrPoi_fQAnSHIo6MOiQSCHBO4GDYU,2379
 zrb/builtin/http.py,sha256=sLqEczuSxGYXWzyJR6frGOHkPTviu4BeyroUr3-ZuAI,4322
 zrb/builtin/jwt.py,sha256=3M5uaQhJZbKQLjTUft1OwPz_JxtmK-xtkjxWjciOQho,2859
-zrb/builtin/llm/chat_session.py,sha256=1DMy6j24jfTVkQfsZAHvazniXrWfUW8E0ZwTAxi7WAU,7593
+zrb/builtin/llm/chat_session.py,sha256=0R04DpBr_LGfNJbXIQ_4XQSxL7kY2M3U-bbu5lsXZ54,8542
 zrb/builtin/llm/history.py,sha256=jCMeRCHUsDFnQWyDoH9SOBptzceOs_wACvVpYkDOoTk,3086
 zrb/builtin/llm/input.py,sha256=Nw-26uTWp2QhUgKJcP_IMHmtk-b542CCSQ_vCOjhvhM,877
 zrb/builtin/llm/llm_ask.py,sha256=oozfQwa1i2PnXV4qWbn60Pmd3fS0kgmhYCbfKlhr25o,4549
@@ -218,7 +218,7 @@ zrb/cmd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/cmd/cmd_result.py,sha256=L8bQJzWCpcYexIxHBNsXj2pT3BtLmWex0iJSMkvimOA,597
 zrb/cmd/cmd_val.py,sha256=7Doowyg6BK3ISSGBLt-PmlhzaEkBjWWm51cED6fAUOQ,1014
 zrb/config/config.py,sha256=UpVm_IFD_bSfGS-QJoRo86xV63eGIuIwWICMaUZgR00,15268
-zrb/config/llm_config.py,sha256=-eQCD6A3rCpIrR6XtcEA-aeTX73FcyFTacXa_T0A-4o,21524
+zrb/config/llm_config.py,sha256=o9-RjPB50isYjbHGtvrOKnqnQbazml-z8Pbo61ZMHQ4,16497
 zrb/config/llm_rate_limitter.py,sha256=0U0qm4qgCWqBjohPdwANNUzLR3joJCFYr6oW6Xpccfo,4436
 zrb/config/web_auth_config.py,sha256=_PXatQTYh2mX9H3HSYSQKp13zm1RlLyVIoeIr6KYMQ8,6279
 zrb/content_transformer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -341,7 +341,7 @@ zrb/task/llm/agent.py,sha256=BZHbz-YXgSdm1tTwGMR_maqcd3yMFGSdzLyDjuxT_XI,6702
 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/error.py,sha256=QR-nIohS6pBpC_16cWR-fw7Mevo1sNYAiXMBsh_CJDE,4157
 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
@@ -350,7 +350,7 @@ zrb/task/llm/tool_wrapper.py,sha256=8_bL8m_WpRf-pVKSrvQIVqT-m2sUA87a1RBQG13lhp4,
 zrb/task/llm/typing.py,sha256=c8VAuPBw_4A3DxfYdydkgedaP-LU61W9_wj3m3CAX1E,58
 zrb/task/llm_task.py,sha256=Vq2kPnE40xJZtHYHjeCBv-nNFKzSCkyMJaVUNXmEmuc,15616
 zrb/task/make_task.py,sha256=PD3b_aYazthS8LHeJsLAhwKDEgdurQZpymJDKeN60u0,2265
-zrb/task/rsync_task.py,sha256=GSL9144bmp6F0EckT6m-2a1xG25AzrrWYzH4k3SVUKM,6370
+zrb/task/rsync_task.py,sha256=WfqNSaicJgYWpunNU34eYxXDqHDHOftuDHyWJKjqwg0,6365
 zrb/task/scaffolder.py,sha256=rME18w1HJUHXgi9eTYXx_T2G4JdqDYzBoNOkdOOo5-o,6806
 zrb/task/scheduler.py,sha256=5xoet0bMjVq0JKwSwwivD1Jo84wwwA2PrL5WaKwJAGA,3110
 zrb/task/task.py,sha256=KCrCaWYOQQvv1RJsYtHDeo9RBFmlXQ28oKyEFU4Q7pA,73
@@ -378,22 +378,22 @@ zrb/util/codemod/modify_module.py,sha256=2mzi_NxJ-kNFo5G0U_Rqb3JoYQl1s6Izt7b_wAl
 zrb/util/cron.py,sha256=UWqqhhM7DDTPx6wjCIdBndnVh3NRu-sdKazp8aZkXh8,3833
 zrb/util/file.py,sha256=tm_8qn0vEM8Hz46yXUcvFHfsLtQNqidQaEuB85xqhFE,2806
 zrb/util/git.py,sha256=GS08OqE-gs6mN-_VqACN82DbI81nzG3FiXeim_-jVAU,8193
-zrb/util/git_diff_model.py,sha256=Fthl2nyBz3D5fIfbMCPEFBWfXUB6qA4rQWApKaimaI8,131
+zrb/util/git_diff_model.py,sha256=Tg2q6oxQ5chryThzjs0cLcKFGM03CnqvusTo_Ug_oX4,369
 zrb/util/git_subtree.py,sha256=AyQWCWEi2EIzEpYXRnYN55157KMUql0WHj70QNw5PHU,4612
-zrb/util/git_subtree_model.py,sha256=mDMUG6mju1_-XXpIE41EqFdu_gmDeeJ3OAxqcJunY7g,196
+zrb/util/git_subtree_model.py,sha256=P_gJ0zhOAc3gFM6sYcjc0Ack9dFBt75TI5fXdE0q320,871
 zrb/util/group.py,sha256=T82yr3qg9I5k10VPXkMyrIRIqyfzadSH813bqzwKEPI,4718
 zrb/util/init_path.py,sha256=9eN7CkWNGhDBpjTQs2j9YHVMzui7Y8DEb1WP4aTPzeo,659
 zrb/util/load.py,sha256=DK0KYSlu48HCoGPqnW1IxnE3pHrZSPCstfz8Fjyqqv8,2140
 zrb/util/run.py,sha256=vu-mcSWDP_WuuvIKqM_--Gk3WkABO1oTXiHmBRTvVQk,546
 zrb/util/string/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-zrb/util/string/conversion.py,sha256=sMmstzbrNgLvWAQukqoXz45JtsNpJrniudAtzJaQlYw,6240
+zrb/util/string/conversion.py,sha256=XEvN1hyziEwP9mEC_LdNaisoLLZF3l4DE40DgNEo6is,6257
 zrb/util/string/format.py,sha256=MwWGAwSdtOgR_2uz-JCXlg_q-uRYUUI-G8CGkfdgqik,1198
 zrb/util/string/name.py,sha256=SXEfxJ1-tDOzHqmSV8kvepRVyMqs2XdV_vyoh_9XUu0,1584
 zrb/util/todo.py,sha256=r9_KYF2-hLKMNjsp6AFK9zivykMrywd-kJ4bCwfdafI,19323
-zrb/util/todo_model.py,sha256=0SJ8aLYfJAscDOk5JsH7pXP3h1rAG91VMCS20-c2Y6A,1576
+zrb/util/todo_model.py,sha256=hhzAX-uFl5rsg7iVX1ULlJOfBtblwQ_ieNUxBWfc-Os,1670
 zrb/xcom/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/xcom/xcom.py,sha256=o79rxR9wphnShrcIushA0Qt71d_p3ZTxjNf7x9hJB78,1571
-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,,
+zrb-1.9.14.dist-info/METADATA,sha256=FrkKRj_OuRF25B0gsVFvK83J1okldK7ubXhQXqwUiWQ,9778
+zrb-1.9.14.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+zrb-1.9.14.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
+zrb-1.9.14.dist-info/RECORD,,