zrb 1.8.15__tar.gz → 1.9.0__tar.gz

{zrb-1.8.15 → zrb-1.9.0}/PKG-INFO

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

{zrb-1.8.15 → zrb-1.9.0}/pyproject.toml

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

{zrb-1.8.15 → zrb-1.9.0}/src/zrb/builtin/llm/chat_session.py

@@ -29,7 +29,9 @@ async def read_user_prompt(ctx: AnyContext) -> str:
 
     _show_info(ctx)
     final_result = ""
-    ctx.print(stylize_faint("🧑 >> ") + f"{ctx.input.message}", plain=True)
+    ctx.print(stylize_faint("💬"), 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,
@@ -46,9 +48,11 @@ async def read_user_prompt(ctx: AnyContext) -> str:
     user_input_session = PromptSession()
     while True:
         await asyncio.sleep(0.01)
-        ctx.print(stylize_faint("🧑 >> "), end="", plain=True)
+        if not multiline_mode:
+            ctx.print(stylize_faint("💬"), plain=True)
         user_input = await user_input_session.prompt_async()
-        # user_input = input()
+        if not multiline_mode:
+            ctx.print("", plain=True)
         # Handle special input
         if user_input.strip().lower() in ("/bye", "/quit"):
             user_prompt = "\n".join(user_inputs)
@@ -60,6 +64,7 @@ async def read_user_prompt(ctx: AnyContext) -> str:
         elif user_input.strip().lower() in ("/multi",):
             multiline_mode = True
         elif user_input.strip().lower() in ("/end",):
+            ctx.print("", plain=True)
             multiline_mode = False
             user_prompt = "\n".join(user_inputs)
             user_inputs = []
@@ -103,7 +108,9 @@ async def _trigger_ask_and_wait_for_result(
         return None
     await _trigger_ask(ctx, user_prompt, previous_session_name, start_new)
     result = await _wait_ask_result(ctx)
-    ctx.print(f"{stylize_faint('🤖 >>')} {result}", plain=True)
+    ctx.print(stylize_faint("\n🤖"), plain=True)
+    ctx.print(result, plain=True)
+    ctx.print("", plain=True)
     return result
 
 
@@ -199,13 +206,11 @@ def _show_info(ctx: AnyContext):
         ctx: The context object for the task.
     """
     ctx.print(
-        "\n".join(
-            [
-                f"{stylize_bold_yellow('/bye')}   {stylize_faint('Quit from chat session')}",
-                f"{stylize_bold_yellow('/multi')} {stylize_faint('Start multiline input')}",
-                f"{stylize_bold_yellow('/end')}   {stylize_faint('End multiline input')}",
-                f"{stylize_bold_yellow('/help')}  {stylize_faint('Show this message')}",
-            ]
+        (
+            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-1.8.15 → zrb-1.9.0}/src/zrb/llm_config.py

@@ -15,185 +15,152 @@ DEFAULT_PERSONA = (
 ).strip()
 
 DEFAULT_INTERACTIVE_SYSTEM_PROMPT = (
-    "You have access to tools and two forms of memory:\n"
-    "1.  A structured summary of the immediate task (including a payload) AND "
-    "the raw text of the last few turns.\n"
-    "2.  A structured JSON object of long-term facts (user profile, project "
-    "details).\n\n"
-    "Your goal is to complete the user's task by following a strict workflow."
-    "\n\n"
-    "**YOUR CORE WORKFLOW**\n"
-    "You MUST follow these steps in order for every task:\n\n"
-    "1.  **Synthesize and Verify:**\n"
-    "    - Review all parts of your memory: the long-term facts, the recent "
-    "conversation history, and the summary of the next action.\n"
-    "    - Compare this with the user's absolute LATEST message.\n"
-    "    - **If your memory seems out of date or contradicts the user's new "
-    "request, you MUST ask for clarification before doing anything else.**\n"
-    "    - Example: If memory says 'ready to build the app' but the user "
-    "asks to 'add a new file', ask: 'My notes say we were about to build. "
-    "Are you sure you want to add a new file first? Please confirm.'\n\n"
-    "2.  **Plan:**\n"
-    "    - Use the `Action Payload` from your memory if it exists.\n"
-    "    - State your plan in simple, numbered steps.\n\n"
-    "3.  **Execute:**\n"
-    "    - Follow your plan and use your tools to complete the task.\n\n"
-    "**CRITICAL RULES**\n"
-    "- **TRUST YOUR MEMORY (AFTER VERIFICATION):** Once you confirm your "
-    "memory is correct, do NOT re-gather information. Use the `Action "
-    "Payload` directly.\n"
-    "- **ASK IF UNSURE:** If a required parameter (like a filename) is not in "
-    "your memory or the user's last message, you MUST ask for it. Do not "
-    "guess."
+    "This is an interactive session. To assist the user, you MUST follow "
+    "this core workflow:\n\n"
+    "# Core Interactive Workflow\n"
+    "1.  **Clarify:** If the user's request is ambiguous, ask clarifying "
+    "questions to ensure you fully understand their goal.\n"
+    "2.  **Plan:** For any non-trivial task, briefly outline your plan to the "
+    "user before you begin.\n"
+    "3.  **Execute:** Carry out the plan, using your available tools as "
+    "needed.\n"
+    "4.  **Confirm:** Before performing any significant or irreversible "
+    "action (e.g., modifying files, committing code), state your intention "
+    "and ask for the user's confirmation to proceed."
 ).strip()
 
 DEFAULT_SYSTEM_PROMPT = (
-    "You are a helpful and precise expert assistant. Your goal is to "
-    "follow instructions carefully to provide an accurate and efficient answer. "
-    "Fulfill the user's request directly. Use your tools if necessary. "
-    "Get straight to the point."
+    "To fulfill this one-shot request, follow this simple process:\n"
+    "1.  **Analyze:** Deconstruct the user's request.\n"
+    "2.  **Execute:** Fulfill the request directly and concisely, using tools "
+    "if necessary.\n"
+    "3.  **Answer:** Provide a clear and accurate answer."
 ).strip()
 
 DEFAULT_SPECIAL_INSTRUCTION_PROMPT = (
-    "## Technical Task Protocol\n"
-    "When performing technical tasks, strictly follow this protocol.\n\n"
-    "**1. Guiding Principles**\n"
-    "Your work must be **Correct, Secure, and Readable**.\n\n"
-    "**2. Code Modification: Surgical Precision**\n"
-    "- Your primary goal is to preserve the user's work.\n"
-    "- Find the **exact start and end lines** you need to change.\n"
-    "- **ADD or MODIFY only those specific lines.** Do not touch any other "
-    "part of the file.\n"
-    "- Do not REPLACE a whole file unless the user explicitly tells you "
-    "to.\n\n"
-    "**3. Git Workflow: A Safe, Step-by-Step Process**\n"
-    "Whenever you work in a git repository, you MUST follow these steps "
-    "exactly:\n"
-    "1.  **Check Status:** Run `git status` to ensure the working directory "
-    "is clean.\n"
-    "2.  **Halt if Dirty:** If the directory is not clean, STOP. Inform the "
-    "user and wait for their instructions.\n"
-    "3.  **Create a New Branch:** Create a new branch and inform the user.\n"
-    "4.  **Execute on Branch:** Perform all your work and commits there.\n\n"
-    "**4. Debugging Protocol**\n"
-    "1.  **Hypothesize:** State the most likely cause of the bug in one "
-    "sentence.\n"
-    "2.  **Solve:** Provide the targeted code fix and explain simply *why* "
-    "it works.\n"
-    "3.  **Verify:** Tell the user what command to run or what to check to "
-    "confirm the fix works."
+    "If the user's request falls into a specialized category below, follow "
+    "the associated protocol.\n\n"
+    "---\n"
+    "## Software Engineering Protocol\n"
+    "This protocol applies to any request involving coding, debugging, or "
+    "other software development tasks.\n\n"
+    "### 1. Guiding Mandates\n"
+    "- **Safety First:** Never perform destructive actions without explicit "
+    "user confirmation. Explain critical commands before executing them.\n"
+    "- **Adhere to Conventions:** Your changes must blend in seamlessly with "
+    "the existing codebase. Match the formatting, naming, and architectural "
+    "patterns. *Never assume* a project's conventions; use your tools to "
+    "discover them.\n"
+    "- **No Assumptions on Dependencies:** Never assume a library or "
+    "framework is available. Verify its presence in `package.json`, "
+    "`requirements.txt`, or similar files first.\n\n"
+    "### 2. Core Workflow\n"
+    "1.  **Understand:** Use your tools to analyze the relevant files and "
+    "codebase. Announce what you are inspecting (e.g., 'Okay, I will read "
+    "`main.py` and `utils.py` to understand the context.').\n"
+    "2.  **Plan:** Announce your step-by-step plan (e.g., 'Here is my plan: "
+    "1. Add the function to `utils.py`. 2. Import and call it in `main.py`. "
+    "3. Run the tests.').\n"
+    "3.  **Implement:** Execute the plan using your tools, following the "
+    "mandates above.\n"
+    "4.  **Verify:** After making changes, run the relevant verification "
+    "commands (e.g., tests, linters). Announce the command you will run "
+    "(e.g., 'Now, I will run `npm test` to verify the changes.').\n"
+    "5.  **Conclude:** Report the results of the verification step. If "
+    "successful, ask for the next step (e.g., 'All tests passed. Should I "
+    "commit these changes?')."
 ).strip()
 
 DEFAULT_SUMMARIZATION_PROMPT = (
-    "You are a summarization assistant. Your job is to create a two-part "
-    "summary to give the main assistant perfect context for its next "
-    "action.\n\n"
-    "**PART 1: RECENT CONVERSATION HISTORY**\n"
-    "- Copy the last 3-4 turns of the conversation verbatim.\n"
-    "- Use the format `user:` and `assistant:`.\n\n"
-    "**PART 2: ANALYSIS OF CURRENT STATE**\n"
-    "- Fill in the template to analyze the immediate task.\n"
-    "- **CRITICAL RULE:** If the next action requires specific data (like "
-    "text for a file or a command), you MUST include that exact data in the "
-    "`Action Payload` field.\n\n"
-    "---\n"
-    "**TEMPLATE FOR YOUR ENTIRE OUTPUT**\n\n"
-    "## Part 1: Recent Conversation History\n"
-    "user: [The user's second-to-last message]\n"
-    "assistant: [The assistant's last message]\n"
-    "user: [The user's most recent message]\n\n"
+    "You are a Conversation Historian, a specialized assistant responsible "
+    "for updating a conversation summary to preserve context for the main "
+    "assistant.\n\n"
+    "## Historian Protocol\n"
+    "You MUST follow this protocol to generate the updated summary.\n\n"
+    "### 1. Input\n"
+    "You will receive two pieces of information:\n"
+    "1.  The `Previous Summary` (which contains a narrative and recent history).\n"
+    "2.  The `Recent Conversation History` (the new turns since the last "
+    "summary was made).\n\n"
+    "### 2. Task\n"
+    "Your job is to integrate the `Recent Conversation History` into the "
+    "`Previous Summary`.\n"
+    "1.  Update the `Narrative Summary` to include the key events from the "
+    "new conversation turns.\n"
+    "2.  Replace the `Recent History` with the last 4 turns of the *new* "
+    "conversation.\n\n"
+    "### 3. Output Specification\n"
+    "Your entire output MUST be a single block of text containing the "
+    "following two sections in this exact order:\n"
+    "1.  `## Narrative Summary` (The updated narrative)\n"
+    "2.  `## Recent History` (The new recent history)\n\n"
     "---\n"
-    "## Part 2: Analysis of Current State\n\n"
-    "**User's Main Goal:**\n"
-    "[Describe the user's overall objective in one simple sentence.]\n\n"
-    "**Next Action for Assistant:**\n"
-    "[Describe the immediate next step. Example: 'Write new content to the "
-    "README.md file.']\n\n"
-    "**Action Payload:**\n"
-    "[IMPORTANT: Provide the exact content, code, or command for the "
-    "action. If no data is needed, write 'None'.]\n\n"
-    "---\n"
-    "**EXAMPLE SCENARIO & CORRECT OUTPUT**\n\n"
-    "*PREVIOUS CONVERSATION:*\n"
-    "user: Can you help me update my project's documentation?\n"
-    "assistant: Of course. I have drafted the new content: '# Project "
-    "Apollo\\nThis is the new documentation for the project.' Do you "
-    "approve?\n"
-    "user: Yes, that looks great. Please proceed.\n\n"
-    "*YOUR CORRECT OUTPUT:*\n\n"
-    "## Part 1: Recent Conversation History\n"
-    "user: Can you help me update my project's documentation?\n"
-    "assistant: Of course. I have drafted the new content: '# Project "
-    "Apollo\\nThis is the new documentation for the project.' Do you "
-    "approve?\n"
-    "user: Yes, that looks great. Please proceed.\n\n"
-    "---\n"
-    "## Part 2: Analysis of Current State\n\n"
-    "**User's Main Goal:**\n"
-    "Update the project documentation.\n\n"
-    "**Next Action for Assistant:**\n"
-    "Write new content to the README.md file.\n\n"
-    "**Action Payload:**\n"
-    "# Project Apollo\n"
-    "This is the new documentation for the project.\n"
-    "---"
+    "## Example\n\n"
+    "### Input to You:\n\n"
+    "--- previous_summary ---\n"
+    "## Narrative Summary\n"
+    "The user, working on the 'Apollo' project, requested to refactor "
+    "`auth.py`.\n"
+    "## Recent History\n"
+    "user: I need to refactor auth.py to use the new 'requests' library.\n"
+    "assistant: Understood. I am starting the refactoring now.\n"
+    "user: Has it been completed?\n"
+    "assistant: Yes. The refactoring of `auth.py` is complete and all tests "
+    "are passing.\n"
+    "--- recent_conversation_history ---\n"
+    "user: Excellent. Now, please update the documentation in README.md.\n"
+    "assistant: I have updated the README.md file with the new documentation.\n"
+    "user: Looks good. Can you commit the changes for me?\n"
+    "assistant: Of course. What should the commit message be?\n\n"
+    "### Your Correct Output:\n"
+    "## Narrative Summary\n"
+    "The user, working on the 'Apollo' project, requested to refactor "
+    "`auth.py`. This was completed successfully. The user then asked to "
+    "update the documentation in `README.md`, which was also completed.\n\n"
+    "## Recent History\n"
+    "user: Excellent. Now, please update the documentation in README.md.\n"
+    "assistant: I have updated the README.md file with the new documentation.\n"
+    "user: Looks good. Can you commit the changes for me?\n"
+    "assistant: Of course. What should the commit message be?\n"
 ).strip()
 
 DEFAULT_CONTEXT_ENRICHMENT_PROMPT = (
-    "You are an information extraction robot. Your sole purpose is to "
-    "extract long-term, stable facts from the conversation and update a "
-    "JSON object.\n\n"
-    "**DEFINITIONS:**\n"
-    "- **Stable Facts:** Information that does not change often. Examples: "
-    "user's name, project name, preferred programming language.\n"
-    "- **Volatile Facts (IGNORE THESE):** Information about the current, "
-    "immediate task. Examples: the user's last request, the next action to "
-    "take.\n\n"
-    "**CRITICAL RULES:**\n"
-    "1.  Your ENTIRE response MUST be a single, valid JSON object. The root "
-    "object must contain a single key named 'response'.\n"
-    "2.  DO NOT add any text, explanations, or markdown formatting before or "
-    "after the JSON object.\n"
-    "3.  Your job is to update the JSON. If a value already exists, only "
-    "change it if the user provides new information.\n"
-    '4.  If you cannot find a value for a key, use an empty string `""`. DO '
-    "NOT GUESS.\n\n"
-    "---\n"
-    "**JSON TEMPLATE TO FILL:**\n\n"
-    "Copy this exact structure. Only fill in values for stable facts you "
-    "find.\n\n"
-    "{\n"
-    '  "response": {\n'
-    '    "user_profile": {\n'
-    '      "user_name": "",\n'
-    '      "language_preference": ""\n'
-    "    },\n"
-    '    "project_details": {\n'
-    '      "project_name": "",\n'
-    '      "primary_file_path": ""\n'
-    "    }\n"
-    "  }\n"
-    "}\n\n"
+    "You are a Memory Curator assistant. Your sole purpose is to process a "
+    "conversation and produce a concise, up-to-date Markdown block of "
+    "long-term context for the main assistant.\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'.\n\n"
+    "**Your Curation Process:**\n"
+    "1.  **Review:** Analyze the existing 'Long-Term Context'.\n"
+    "2.  **Update:** Read the 'Recent Conversation History' to identify "
+    "new facts, changed goals, or completed tasks.\n"
+    "3.  **Re-write:** Create the new 'Long-Term Context' by applying these "
+    "changes.\n\n"
+    "**CRITICAL CURATION RULES:**\n"
+    "- **ADD** new, stable facts (e.g., user preferences, project names).\n"
+    "- **UPDATE** existing facts if the user provides new information.\n"
+    "- **REMOVE** goals, tasks, or files that are completed or no longer "
+    "relevant. This is essential for keeping the context fresh.\n\n"
     "---\n"
-    "**EXAMPLE SCENARIO**\n\n"
-    "*CONVERSATION CONTEXT:*\n"
-    "User: Hi, I'm Sarah, and I'm working on the 'Apollo' project. Let's fix "
-    "a bug in `src/auth.js`.\n"
-    "Assistant: Okay Sarah, let's look at `src/auth.js` from the 'Apollo' "
-    "project.\n\n"
-    "*CORRECT JSON OUTPUT:*\n\n"
-    "{\n"
-    '  "response": {\n'
-    '    "user_profile": {\n'
-    '      "user_name": "Sarah",\n'
-    '      "language_preference": "javascript"\n'
-    "    },\n"
-    '    "project_details": {\n'
-    '      "project_name": "Apollo",\n'
-    '      "primary_file_path": "src/auth.js"\n'
-    "    }\n"
-    "  }\n"
-    "}"
+    "**EXAMPLE SCENARIO & CORRECT OUTPUT**\n\n"
+    "**INPUT TO YOU:**\n\n"
+    "--- previous_long_term_context ---\n"
+    "## Long-Term Context\n"
+    "- **User Profile:** The user's name is Alex.\n"
+    "- **Current Goal:** Refactor the `auth.py` module to use a new library.\n"
+    "- **Key Files:** `auth.py`\n"
+    "--- recent_conversation_history ---\n"
+    "assistant: The refactoring of `auth.py` is complete and all tests are "
+    "passing.\n"
+    "user: Great! Now, can you please write the documentation for the new "
+    "`auth.py` module in the `README.md` file?\n\n"
+    "**YOUR CORRECT OUTPUT (as a single Markdown block):**\n\n"
+    "## Long-Term Context\n"
+    "- **User Profile:** The user's name is Alex.\n"
+    "- **Current Goal:** Write documentation for the `auth.py` module in "
+    "`README.md`.\n"
+    "- **Key Files:** `auth.py`, `README.md`\n"
 ).strip()
 
 

{zrb-1.8.15 → zrb-1.9.0}/src/zrb/task/any_task.py

@@ -9,9 +9,6 @@ from zrb.input.any_input import AnyInput
 if TYPE_CHECKING:
     from zrb.context.any_context import AnyContext
     from zrb.session.any_session import AnySession
-else:
-    AnyContext = Any
-    AnySession = Any
 
 
 class AnyTask(ABC):
@@ -146,12 +143,12 @@ class AnyTask(ABC):
         pass
 
     @abstractmethod
-    def get_ctx(self, session: AnySession) -> AnyContext:
+    def get_ctx(self, session: "AnySession") -> "AnyContext":
         pass
 
     @abstractmethod
     def run(
-        self, session: AnySession | None = None, str_kwargs: dict[str, str] = {}
+        self, session: "AnySession | None" = None, str_kwargs: dict[str, str] = {}
     ) -> Any:
         """Runs the task synchronously.
 
@@ -166,7 +163,7 @@ class AnyTask(ABC):
 
     @abstractmethod
     async def async_run(
-        self, session: AnySession | None = None, str_kwargs: dict[str, str] = {}
+        self, session: "AnySession | None" = None, str_kwargs: dict[str, str] = {}
     ) -> Any:
         """Runs the task asynchronously.
 
@@ -180,7 +177,7 @@ class AnyTask(ABC):
         pass
 
     @abstractmethod
-    async def exec_root_tasks(self, session: AnySession):
+    async def exec_root_tasks(self, session: "AnySession"):
         """Execute the root tasks along with the downstreams until the current task
         is ready.
 
@@ -190,7 +187,7 @@ class AnyTask(ABC):
         pass
 
     @abstractmethod
-    async def exec_chain(self, session: AnySession):
+    async def exec_chain(self, session: "AnySession"):
         """Execute the task along with the downstreams.
 
         Args:
@@ -199,7 +196,7 @@ class AnyTask(ABC):
         pass
 
     @abstractmethod
-    async def exec(self, session: AnySession):
+    async def exec(self, session: "AnySession"):
         """Execute the task (without upstream or downstream).
 
         Args:

{zrb-1.8.15 → zrb-1.9.0}/src/zrb/task/llm/agent.py

@@ -1,23 +1,7 @@
+import json
 from collections.abc import Callable
 from typing import TYPE_CHECKING, Any
 
-if TYPE_CHECKING:
-    from pydantic_ai import Agent, Tool
-    from pydantic_ai.agent import AgentRun
-    from pydantic_ai.mcp import MCPServer
-    from pydantic_ai.models import Model
-    from pydantic_ai.settings import ModelSettings
-else:
-    Agent = Any
-    Tool = Any
-    AgentRun = Any
-    MCPServer = Any
-    ModelMessagesTypeAdapter = Any
-    Model = Any
-    ModelSettings = Any
-
-import json
-
 from zrb.context.any_context import AnyContext
 from zrb.context.any_shared_context import AnySharedContext
 from zrb.llm_rate_limitter import LLMRateLimiter, llm_rate_limitter
@@ -26,18 +10,27 @@ from zrb.task.llm.print_node import print_node
 from zrb.task.llm.tool_wrapper import wrap_tool
 from zrb.task.llm.typing import ListOfDict
 
-ToolOrCallable = Tool | Callable
+if TYPE_CHECKING:
+    from pydantic_ai import Agent, Tool
+    from pydantic_ai.agent import AgentRun
+    from pydantic_ai.mcp import MCPServer
+    from pydantic_ai.models import Model
+    from pydantic_ai.settings import ModelSettings
+
+    ToolOrCallable = Tool | Callable
+else:
+    ToolOrCallable = Any
 
 
 def create_agent_instance(
     ctx: AnyContext,
-    model: str | Model | None = None,
+    model: "str | Model | None" = None,
     system_prompt: str = "",
-    model_settings: ModelSettings | None = None,
+    model_settings: "ModelSettings | None" = None,
     tools: list[ToolOrCallable] = [],
-    mcp_servers: list[MCPServer] = [],
+    mcp_servers: list["MCPServer"] = [],
     retries: int = 3,
-) -> Agent:
+) -> "Agent":
     """Creates a new Agent instance with configured tools and servers."""
     from pydantic_ai import Agent, Tool
 
@@ -62,18 +55,18 @@ def create_agent_instance(
 
 def get_agent(
     ctx: AnyContext,
-    agent_attr: Agent | Callable[[AnySharedContext], Agent] | None,
-    model: str | Model | None,
+    agent_attr: "Agent | Callable[[AnySharedContext], Agent] | None",
+    model: "str | Model | None",
     system_prompt: str,
-    model_settings: ModelSettings | None,
+    model_settings: "ModelSettings | None",
     tools_attr: (
         list[ToolOrCallable] | Callable[[AnySharedContext], list[ToolOrCallable]]
     ),
     additional_tools: list[ToolOrCallable],
-    mcp_servers_attr: list[MCPServer] | Callable[[AnySharedContext], list[MCPServer]],
-    additional_mcp_servers: list[MCPServer],
+    mcp_servers_attr: "list[MCPServer] | Callable[[AnySharedContext], list[MCPServer]]",
+    additional_mcp_servers: "list[MCPServer]",
     retries: int = 3,
-) -> Agent:
+) -> "Agent":
     """Retrieves the configured Agent instance or creates one if necessary."""
     from pydantic_ai import Agent
 
@@ -111,12 +104,12 @@ def get_agent(
 
 async def run_agent_iteration(
     ctx: AnyContext,
-    agent: Agent,
+    agent: "Agent",
     user_prompt: str,
     history_list: ListOfDict,
     rate_limitter: LLMRateLimiter | None = None,
     max_retry: int = 2,
-) -> AgentRun:
+) -> "AgentRun":
     """
     Runs a single iteration of the agent execution loop.
 
@@ -153,11 +146,11 @@ async def run_agent_iteration(
 
 async def _run_single_agent_iteration(
     ctx: AnyContext,
-    agent: Agent,
+    agent: "Agent",
     user_prompt: str,
     history_list: ListOfDict,
     rate_limitter: LLMRateLimiter | None = None,
-) -> AgentRun:
+) -> "AgentRun":
     from openai import APIError
     from pydantic_ai.messages import ModelMessagesTypeAdapter
 
@@ -190,7 +183,7 @@ async def _run_single_agent_iteration(
 
 
 def estimate_request_payload(
-    agent: Agent, user_prompt: str, history_list: ListOfDict
+    agent: "Agent", user_prompt: str, history_list: ListOfDict
 ) -> str:
     system_prompts = agent._system_prompts if hasattr(agent, "_system_prompts") else ()
     return json.dumps(

{zrb-1.8.15 → zrb-1.9.0}/src/zrb/task/llm/config.py

@@ -3,9 +3,6 @@ from typing import TYPE_CHECKING, Any, Callable
 if TYPE_CHECKING:
     from pydantic_ai.models import Model
     from pydantic_ai.settings import ModelSettings
-else:
-    Model = Any
-    ModelSettings = Any
 
 from zrb.attr.type import StrAttr, fstring
 from zrb.context.any_context import AnyContext
@@ -17,9 +14,9 @@ from zrb.util.attr import get_attr
 def get_model_settings(
     ctx: AnyContext,
     model_settings_attr: (
-        ModelSettings | Callable[[AnySharedContext], ModelSettings] | None
+        "ModelSettings | Callable[[AnySharedContext], ModelSettings] | None"
     ) = None,
-) -> ModelSettings | None:
+) -> "ModelSettings | None":
     """Gets the model settings, resolving callables if necessary."""
     model_settings = get_attr(ctx, model_settings_attr, None, auto_render=False)
     if model_settings is None:
@@ -59,13 +56,13 @@ def get_model_api_key(
 
 def get_model(
     ctx: AnyContext,
-    model_attr: Callable[[AnySharedContext], Model | str | fstring] | Model | None,
+    model_attr: "Callable[[AnySharedContext], Model | str | fstring] | Model | None",
     render_model: bool,
     model_base_url_attr: StrAttr | None = None,
     render_model_base_url: bool = True,
     model_api_key_attr: StrAttr | None = None,
     render_model_api_key: bool = True,
-) -> str | Model | None:
+) -> "str | Model | None":
     """Gets the model instance or name, handling defaults and configuration."""
     from pydantic_ai.models import Model