zrb 1.15.22__tar.gz → 1.15.24__tar.gz

{zrb-1.15.22 → zrb-1.15.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: zrb
-Version: 1.15.22
+Version: 1.15.24
 Summary: Your Automation Powerhouse
 License: AGPL-3.0-or-later
 Keywords: Automation,Task Runner,Code Generator,Monorepo,Low Code
@@ -29,7 +29,7 @@ Requires-Dist: pdfplumber (>=0.11.7,<0.12.0)
 Requires-Dist: playwright (>=1.54.0,<2.0.0) ; extra == "playwright" or extra == "all"
 Requires-Dist: prompt-toolkit (>=3)
 Requires-Dist: psutil (>=7.0.0,<8.0.0)
-Requires-Dist: pydantic-ai-slim[anthropic,bedrock,cohere,google,groq,huggingface,mistral,openai,vertexai] (>=0.8.1,<0.9.0)
+Requires-Dist: pydantic-ai-slim[anthropic,bedrock,cohere,google,groq,huggingface,mistral,openai,vertexai] (>=1.0.1,<1.1.0)
 Requires-Dist: pyjwt (>=2.10.1,<3.0.0)
 Requires-Dist: python-dotenv (>=1.1.1,<2.0.0)
 Requires-Dist: python-jose[cryptography] (>=3.5.0,<4.0.0)

{zrb-1.15.22 → zrb-1.15.24}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "zrb"
-version = "1.15.22"
+version = "1.15.24"
 description = "Your Automation Powerhouse"
 authors = ["Go Frendi Gunawan <gofrendiasgard@gmail.com>"]
 license = "AGPL-3.0-or-later"
@@ -50,7 +50,7 @@ ulid-py = "^1.1.0"
 psutil = "^7.0.0"
 
 # NOTE: Look at https://github.com/pydantic/pydantic-ai/blob/main/pydantic_ai_slim/pyproject.toml
-pydantic-ai-slim = {extras = ["openai", "cohere", "vertexai", "google", "anthropic", "groq", "mistral", "bedrock", "huggingface"], version = "~0.8.1"} 
+pydantic-ai-slim = {extras = ["openai", "cohere", "vertexai", "google", "anthropic", "groq", "mistral", "bedrock", "huggingface"], version = "~1.0.1"} 
 
 # NOTE: Make sure the following dependencies are not conflicting with pydantic-ai-slim
 openai = ">=1.99.9"

{zrb-1.15.22 → zrb-1.15.24}/src/zrb/config/default_prompt/summarization_prompt.md

@@ -1,4 +1,4 @@
-You are a memory management AI. Your only task is to process the provided conversation history and call the `update_conversation_memory` tool **once**.
+You are a memory management AI. Your only task is to process the provided conversation history and call the `final_result` tool **once**.
 
 Follow these instructions carefully:
 
@@ -11,6 +11,6 @@ Follow these instructions carefully:
     *   Update `contextual_note` with facts specific to the current project/directory.
     *   **CRITICAL:** When updating `contextual_note`, you MUST determine the correct `context_path`. For example, if a fact was established when the working directory was `/app`, the `context_path` MUST be `/app`.
     *   **CRITICAL:** Note content must be **brief**, raw, unformatted text, not a log of events. Only update notes if information has changed.
-4.  **Update Memory:** Call the `update_conversation_memory` tool with all the information you consolidated.
+4.  **Update Memory:** Call the `final_result` tool with all the information you consolidated.
 
-After you have called the tool, your task is complete. Your final output **MUST** be the single word `OK`. Do not add any other text, formatting, or tool calls.
+After you have called the tool, your task is complete.

{zrb-1.15.22 → zrb-1.15.24}/src/zrb/task/llm/agent.py

@@ -16,6 +16,7 @@ if TYPE_CHECKING:
     from pydantic_ai.agent import AgentRun
     from pydantic_ai.messages import UserContent
     from pydantic_ai.models import Model
+    from pydantic_ai.output import OutputDataT, OutputSpec
     from pydantic_ai.settings import ModelSettings
     from pydantic_ai.toolsets import AbstractToolset
 
@@ -25,13 +26,14 @@ if TYPE_CHECKING:
 def create_agent_instance(
     ctx: AnyContext,
     model: "str | Model",
+    output_type: "OutputSpec[OutputDataT]" = str,
     system_prompt: str = "",
     model_settings: "ModelSettings | None" = None,
     tools: "list[ToolOrCallable]" = [],
     toolsets: list["AbstractToolset[Agent]"] = [],
     retries: int = 3,
     yolo_mode: bool | list[str] | None = None,
-) -> "Agent":
+) -> "Agent[None, Any]":
     """Creates a new Agent instance with configured tools and servers."""
     from pydantic_ai import Agent, Tool
     from pydantic_ai.tools import GenerateToolJsonSchema
@@ -63,8 +65,9 @@ def create_agent_instance(
             # Turn function into tool
             tool_list.append(wrap_tool(tool_or_callable, ctx, yolo_mode))
     # Return Agent
-    return Agent(
+    return Agent[None, Any](
         model=model,
+        output_type=output_type,
         system_prompt=system_prompt,
         tools=tool_list,
         toolsets=toolsets,
@@ -77,14 +80,15 @@ def get_agent(
     ctx: AnyContext,
     agent_attr: "Agent | Callable[[AnySharedContext], Agent] | None",
     model: "str | Model",
-    system_prompt: str,
-    model_settings: "ModelSettings | None",
+    output_type: "OutputSpec[OutputDataT]" = str,
+    system_prompt: str = "",
+    model_settings: "ModelSettings | None" = None,
     tools_attr: (
         "list[ToolOrCallable] | Callable[[AnySharedContext], list[ToolOrCallable]]"
-    ),
-    additional_tools: "list[ToolOrCallable]",
-    toolsets_attr: "list[AbstractToolset[Agent]] | Callable[[AnySharedContext], list[AbstractToolset[Agent]]]",  # noqa
-    additional_toolsets: "list[AbstractToolset[Agent]]",
+    ) = [],
+    additional_tools: "list[ToolOrCallable]" = [],
+    toolsets_attr: "list[AbstractToolset[Agent]] | Callable[[AnySharedContext], list[AbstractToolset[Agent]]]" = [],  # noqa
+    additional_toolsets: "list[AbstractToolset[Agent]]" = [],
     retries: int = 3,
     yolo_mode: bool | list[str] | None = None,
 ) -> "Agent":
@@ -113,6 +117,7 @@ def get_agent(
     return create_agent_instance(
         ctx=ctx,
         model=model,
+        output_type=output_type,
         system_prompt=system_prompt,
         tools=tools,
         toolsets=tool_sets,
@@ -124,7 +129,7 @@ def get_agent(
 
 async def run_agent_iteration(
     ctx: AnyContext,
-    agent: "Agent",
+    agent: "Agent[None, Any]",
     user_prompt: str,
     attachments: "list[UserContent] | None" = None,
     history_list: ListOfDict | None = None,
@@ -199,7 +204,6 @@ async def _run_single_agent_iteration(
         ) as agent_run:
             async for node in agent_run:
                 # Each node represents a step in the agent's execution
-                # Reference: https://ai.pydantic.dev/agents/#streaming
                 try:
                     await print_node(
                         _get_plain_printer(ctx), agent_run, node, log_indent_level
@@ -217,7 +221,7 @@ async def _run_single_agent_iteration(
 
 
 def _create_print_throttle_notif(ctx: AnyContext) -> Callable[[], None]:
-    def _print_throttle_notif(ctx: AnyContext):
+    def _print_throttle_notif():
         ctx.print(stylize_faint("  ⌛>> Request Throttled"), plain=True)
 
     return _print_throttle_notif

{zrb-1.15.22 → zrb-1.15.24}/src/zrb/task/llm/history_summarization.py

@@ -143,12 +143,13 @@ async def summarize_history(
             ),
         ]
     )
-    summarization_agent = Agent(
+    summarize = create_history_summarization_tool(conversation_history)
+    summarization_agent = Agent[None, str](
         model=model,
+        output_type=summarize,
         system_prompt=system_prompt,
         model_settings=settings,
         retries=retries,
-        tools=[create_history_summarization_tool(conversation_history)],
     )
     try:
         ctx.print(stylize_faint("  📝 Rollup Conversation"), plain=True)

{zrb-1.15.22 → zrb-1.15.24}/src/zrb/task/llm/history_summarization_tool.py

@@ -7,14 +7,14 @@ from zrb.task.llm.conversation_history_model import ConversationHistory
 
 def create_history_summarization_tool(
     conversation_history: ConversationHistory,
-) -> Callable:
+) -> Callable[[str, str, str | None, str | None, str | None], str]:
     def update_conversation_memory(
         past_conversation_summary: str,
         past_conversation_transcript: str,
         long_term_note: str | None = None,
         contextual_note: str | None = None,
         context_path: str | None = None,
-    ):
+    ) -> str:
         """
         Update the conversation memory including summary, transcript, and notes.
         - past_conversation_summary: A concise narrative that integrates the
@@ -33,6 +33,6 @@ def create_history_summarization_tool(
             if context_path is None:
                 context_path = conversation_history.project_path
             llm_context_config.write_context(contextual_note, context_path=context_path)
-        return json.dumps({"success": True})
+        return "Conversation memory updated"
 
     return update_conversation_memory

{zrb-1.15.22 → zrb-1.15.24}/src/zrb/task/llm/print_node.py

@@ -28,7 +28,7 @@ async def print_node(
     elif Agent.is_model_request_node(node):
         # A model request node => We can stream tokens from the model's request
         print_func(_format_header("🧠 Processing...", log_indent_level))
-        # Reference: https://ai.pydantic.dev/agents/#streaming
+        # Reference: https://ai.pydantic.dev/agents/#streaming-all-events-and-output
         try:
             async with node.stream(agent_run.ctx) as request_stream:
                 is_streaming = False
@@ -40,9 +40,7 @@ async def print_node(
                         print_func(_format_content(content, log_indent_level), end="")
                         is_streaming = True
                     elif isinstance(event, PartDeltaEvent):
-                        if isinstance(event.delta, TextPartDelta) or isinstance(
-                            event.delta, ThinkingPartDelta
-                        ):
+                        if isinstance(event.delta, TextPartDelta):
                             content_delta = event.delta.content_delta
                             print_func(
                                 _format_stream_content(content_delta, log_indent_level),
@@ -78,7 +76,7 @@ async def print_node(
             print_func(
                 _format_content(
                     (
-                        f"⚠️ Unexpected Model Behavior: {e}. "
+                        f"🟡 Unexpected Model Behavior: {e}. "
                         f"Cause: {e.__cause__}. Node.Id: {meta}"
                     ),
                     log_indent_level,
@@ -112,7 +110,7 @@ async def print_node(
             print_func(
                 _format_content(
                     (
-                        f"⚠️ Unexpected Model Behavior: {e}. "
+                        f"🟡 Unexpected Model Behavior: {e}. "
                         f"Cause: {e.__cause__}. Node.Id: {meta}"
                     ),
                     log_indent_level,
@@ -123,7 +121,7 @@ async def print_node(
         print_func(_format_header("✅ Completed...", log_indent_level))
 
 
-def _format_header(text: str, log_indent_level: int = 0) -> str:
+def _format_header(text: str | None, log_indent_level: int = 0) -> str:
     return _format(
         text,
         base_indent=2,
@@ -133,7 +131,7 @@ def _format_header(text: str, log_indent_level: int = 0) -> str:
     )
 
 
-def _format_content(text: str, log_indent_level: int = 0) -> str:
+def _format_content(text: str | None, log_indent_level: int = 0) -> str:
     return _format(
         text,
         base_indent=2,
@@ -143,7 +141,7 @@ def _format_content(text: str, log_indent_level: int = 0) -> str:
     )
 
 
-def _format_stream_content(text: str, log_indent_level: int = 0) -> str:
+def _format_stream_content(text: str | None, log_indent_level: int = 0) -> str:
     return _format(
         text,
         base_indent=2,
@@ -154,13 +152,15 @@ def _format_stream_content(text: str, log_indent_level: int = 0) -> str:
 
 
 def _format(
-    text: str,
+    text: str | None,
     base_indent: int = 0,
     first_indent: int = 0,
     indent: int = 0,
     log_indent_level: int = 0,
     is_stream: bool = False,
 ) -> str:
+    if text is None:
+        text = ""
     line_prefix = (base_indent * (log_indent_level + 1) + indent) * " "
     processed_text = text.replace("\n", f"\n{line_prefix}")
     if is_stream:

{zrb-1.15.22 → zrb-1.15.24}/src/zrb/task/llm/tool_wrapper.py

@@ -220,7 +220,7 @@ def _get_user_approval_and_reason(
 def _get_run_func_confirmation(func: Callable) -> str:
     func_name = get_callable_name(func)
     return render_markdown(
-        f"Allow to run `{func_name}`? (✅ `Yes` | ⛔ `No, <reason>` | ✏️ `Edit <param> <value>`)"
+        f"Allow to run `{func_name}`? (✅ `Yes` | ⛔ `No, <reason>` | 📝 `Edit <param> <value>`)"
     ).strip()