zrb 1.16.1__py3-none-any.whl → 1.16.3__py3-none-any.whl

zrb/builtin/__init__.py

@@ -9,6 +9,7 @@ from zrb.builtin.git import (
 from zrb.builtin.git_subtree import git_add_subtree, git_pull_subtree, git_push_subtree
 from zrb.builtin.http import generate_curl, http_request
 from zrb.builtin.jwt import decode_jwt, encode_jwt, validate_jwt
+from zrb.builtin.llm.chat_trigger import llm_chat_trigger
 from zrb.builtin.llm.llm_ask import llm_ask
 from zrb.builtin.md5 import hash_md5, sum_md5, validate_md5
 from zrb.builtin.project.add.fastapp.fastapp_task import add_fastapp_to_project

zrb/builtin/llm/chat_session.py

@@ -7,13 +7,20 @@ conversation flow via XCom.
 
 import asyncio
 import sys
+from typing import TYPE_CHECKING, Any
 
+from zrb.builtin.llm.chat_trigger import llm_chat_trigger
 from zrb.config.llm_config import llm_config
 from zrb.context.any_context import AnyContext
 from zrb.util.cli.markdown import render_markdown
 from zrb.util.cli.style import stylize_blue, stylize_bold_yellow, stylize_faint
 from zrb.util.string.conversion import to_boolean
 
+if TYPE_CHECKING:
+    from asyncio import StreamReader
+
+    from prompt_toolkit import PromptSession
+
 
 async def read_user_prompt(ctx: AnyContext) -> str:
     """
@@ -22,7 +29,7 @@ async def read_user_prompt(ctx: AnyContext) -> str:
     """
     _show_info(ctx)
     is_tty: bool = ctx.is_tty
-    reader = await _setup_input_reader(is_tty)
+    reader: PromptSession[Any] | StreamReader = await _setup_input_reader(is_tty)
     multiline_mode = False
     is_first_time = True
     current_modes: str = ctx.input.modes
@@ -32,17 +39,19 @@ async def read_user_prompt(ctx: AnyContext) -> str:
     while True:
         await asyncio.sleep(0.01)
         previous_session_name: str | None = (
-            ctx.input.previous_session if is_first_time else None
+            ctx.input.previous_session if is_first_time else ""
         )
         start_new: bool = ctx.input.start_new if is_first_time else False
-        if is_first_time:
-            is_first_time = False
-        # Get user input based on mode
-        if not multiline_mode:
-            ctx.print("💬 >>", plain=True)
-        user_input = await _read_next_line(reader, ctx)
-        if not multiline_mode:
-            ctx.print("", plain=True)
+        if is_first_time and ctx.input.message.strip() != "":
+            user_input = ctx.input.message
+        else:
+            # Get user input based on mode
+            if not multiline_mode:
+                ctx.print("💬 >>", plain=True)
+            user_input = await llm_chat_trigger.wait(reader, ctx)
+            if not multiline_mode:
+                ctx.print("", plain=True)
+        is_first_time = False
         # Handle user input
         if user_input.strip().lower() in ("/bye", "/quit", "/q", "/exit"):
             user_prompt = "\n".join(user_inputs)
@@ -151,7 +160,9 @@ def _show_subcommand(command: str, description: str) -> str:
     return f"  {styled_command} {styled_description}"
 
 
-async def _setup_input_reader(is_interactive: bool):
+async def _setup_input_reader(
+    is_interactive: bool,
+) -> "PromptSession[Any] | StreamReader":
     """Sets up and returns the appropriate asynchronous input reader."""
     if is_interactive:
         from prompt_toolkit import PromptSession
@@ -165,22 +176,6 @@ async def _setup_input_reader(is_interactive: bool):
     return reader
 
 
-async def _read_next_line(reader, ctx: AnyContext) -> str:
-    """Reads one line of input using the provided reader."""
-    from prompt_toolkit import PromptSession
-
-    if isinstance(reader, PromptSession):
-        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,

zrb/builtin/llm/chat_trigger.py

@@ -0,0 +1,73 @@
+import asyncio
+from asyncio import StreamReader
+from typing import TYPE_CHECKING, Any, Callable, Coroutine
+
+from zrb.context.any_context import AnyContext
+from zrb.util.run import run_async
+
+if TYPE_CHECKING:
+    from prompt_toolkit import PromptSession
+
+
+ChatTrigger = Callable[[AnyContext], Coroutine[Any, Any, str] | str]
+
+
+class LLMChatTrigger:
+
+    def __init__(self):
+        self._triggers: list[ChatTrigger] = []
+
+    def add_trigger(self, *trigger: ChatTrigger):
+        self.append_trigger(*trigger)
+
+    def append_trigger(self, *trigger: ChatTrigger):
+        for single_trigger in trigger:
+            self._triggers.append(single_trigger)
+
+    async def wait(
+        self, reader: "PromptSession[Any] | StreamReader", ctx: AnyContext
+    ) -> str:
+        trigger_tasks = [
+            asyncio.create_task(run_async(self._read_next_line(reader, ctx)))
+        ] + [asyncio.create_task(run_async(trigger(ctx))) for trigger in self._triggers]
+        final_result: str = ""
+        try:
+            done, pending = await asyncio.wait(
+                trigger_tasks, return_when=asyncio.FIRST_COMPLETED
+            )
+            for task in done:
+                final_result = await task
+            if pending:
+                for task in pending:
+                    task.cancel()
+            for task in done:
+                break
+        except asyncio.CancelledError:
+            ctx.print("Task cancelled.", plain=True)
+            final_result = "/bye"
+        except KeyboardInterrupt:
+            ctx.print("KeyboardInterrupt detected. Exiting...", plain=True)
+            final_result = "/bye"
+        return final_result
+
+    async def _read_next_line(
+        self, reader: "PromptSession[Any] | StreamReader", ctx: AnyContext
+    ) -> str:
+        """Reads one line of input using the provided reader."""
+        from prompt_toolkit import PromptSession
+
+        try:
+            if isinstance(reader, PromptSession):
+                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
+        except KeyboardInterrupt:
+            ctx.print("KeyboardInterrupt detected. Exiting...", plain=True)
+            return "/bye"
+
+
+llm_chat_trigger = LLMChatTrigger()

zrb/builtin/llm/llm_ask.py

@@ -1,3 +1,4 @@
+import os
 from collections.abc import Callable
 from typing import TYPE_CHECKING
 
@@ -28,6 +29,7 @@ from zrb.callback.callback import Callback
 from zrb.config.config import CFG
 from zrb.config.llm_config import llm_config
 from zrb.context.any_context import AnyContext
+from zrb.input.any_input import AnyInput
 from zrb.input.bool_input import BoolInput
 from zrb.input.str_input import StrInput
 from zrb.input.text_input import TextInput
@@ -37,10 +39,23 @@ from zrb.util.string.conversion import to_boolean
 
 if TYPE_CHECKING:
     from pydantic_ai import Tool
+    from pydantic_ai.toolsets import AbstractToolset
 
     ToolOrCallable = Tool | Callable
 
 
+def _get_toolset(ctx: AnyContext) -> list["AbstractToolset[None] | str"]:
+    cwd = os.getcwd()
+    toolsets = []
+    for config_path in [
+        os.path.join(cwd, "mcp_config.json"),
+        os.path.join(cwd, "mcp-config.json"),
+    ]:
+        if os.path.isfile(config_path):
+            toolsets.append(config_path)
+    return toolsets
+
+
 def _get_tool(ctx: AnyContext) -> list["ToolOrCallable"]:
     tools = []
     if CFG.LLM_ALLOW_ANALYZE_REPO:
@@ -91,81 +106,89 @@ def _render_yolo_mode_input(ctx: AnyContext) -> list[str] | bool | None:
     return elements
 
 
-_llm_ask_inputs = [
-    StrInput(
-        "model",
-        description="LLM Model",
-        prompt="LLM Model",
-        default="",
-        allow_positional_parsing=False,
-        always_prompt=False,
-        allow_empty=True,
-    ),
-    StrInput(
-        "base-url",
-        description="LLM API Base URL",
-        prompt="LLM API Base URL",
-        default="",
-        allow_positional_parsing=False,
-        always_prompt=False,
-        allow_empty=True,
-    ),
-    StrInput(
-        "api-key",
-        description="LLM API Key",
-        prompt="LLM API Key",
-        default="",
-        allow_positional_parsing=False,
-        always_prompt=False,
-        allow_empty=True,
-    ),
-    TextInput(
-        "system-prompt",
-        description="System prompt",
-        prompt="System prompt",
-        default="",
-        allow_positional_parsing=False,
-        always_prompt=False,
-    ),
-    TextInput(
-        "modes",
-        description="Modes",
-        prompt="Modes",
-        default=lambda ctx: ",".join(llm_config.default_modes),
-        allow_positional_parsing=False,
-        always_prompt=False,
-    ),
-    BoolInput(
-        "start-new",
-        description="Start new session (LLM Agent will forget past conversation)",
-        prompt="Start new session (LLM Agent will forget past conversation)",
-        default=False,
-        allow_positional_parsing=False,
-        always_prompt=False,
-    ),
-    StrInput(
-        "yolo",
-        description="YOLO mode (LLM Agent will start in YOLO Mode)",
-        prompt="YOLO mode (LLM Agent will start in YOLO Mode)",
-        default=_get_default_yolo_mode,
-        allow_positional_parsing=False,
-        always_prompt=False,
-    ),
-    TextInput("message", description="User message", prompt="Your message"),
-    PreviousSessionInput(
-        "previous-session",
-        description="Previous conversation session",
-        prompt="Previous conversation session (can be empty)",
-        allow_positional_parsing=False,
-        allow_empty=True,
-        always_prompt=False,
-    ),
-]
+def _get_inputs(require_message: bool = True) -> list[AnyInput | None]:
+    return [
+        StrInput(
+            "model",
+            description="LLM Model",
+            prompt="LLM Model",
+            default="",
+            allow_positional_parsing=False,
+            always_prompt=False,
+            allow_empty=True,
+        ),
+        StrInput(
+            "base-url",
+            description="LLM API Base URL",
+            prompt="LLM API Base URL",
+            default="",
+            allow_positional_parsing=False,
+            always_prompt=False,
+            allow_empty=True,
+        ),
+        StrInput(
+            "api-key",
+            description="LLM API Key",
+            prompt="LLM API Key",
+            default="",
+            allow_positional_parsing=False,
+            always_prompt=False,
+            allow_empty=True,
+        ),
+        TextInput(
+            "system-prompt",
+            description="System prompt",
+            prompt="System prompt",
+            default="",
+            allow_positional_parsing=False,
+            always_prompt=False,
+        ),
+        TextInput(
+            "modes",
+            description="Modes",
+            prompt="Modes",
+            default=lambda ctx: ",".join(llm_config.default_modes),
+            allow_positional_parsing=False,
+            always_prompt=False,
+        ),
+        BoolInput(
+            "start-new",
+            description="Start new session (LLM Agent will forget past conversation)",
+            prompt="Start new session (LLM Agent will forget past conversation)",
+            default=False,
+            allow_positional_parsing=False,
+            always_prompt=False,
+        ),
+        StrInput(
+            "yolo",
+            description="YOLO mode (LLM Agent will start in YOLO Mode)",
+            prompt="YOLO mode (LLM Agent will start in YOLO Mode)",
+            default=_get_default_yolo_mode,
+            allow_positional_parsing=False,
+            always_prompt=False,
+        ),
+        TextInput(
+            "message",
+            description="User message",
+            prompt="Your message",
+            always_prompt=require_message,
+            allow_empty=not require_message,
+        ),
+        PreviousSessionInput(
+            "previous-session",
+            description="Previous conversation session",
+            prompt="Previous conversation session (can be empty)",
+            allow_positional_parsing=False,
+            allow_empty=True,
+            always_prompt=False,
+        ),
+    ]
+
 
 llm_ask: LLMTask = llm_group.add_task(
     LLMTask(
         name="llm-ask",
-        input=_llm_ask_inputs,
+        input=_get_inputs(True),
         description="❓ Ask LLM",
         model=lambda ctx: None if ctx.input.model.strip() == "" else ctx.input.model,
         model_base_url=lambda ctx: (
@@ -184,6 +207,7 @@ llm_ask: LLMTask = llm_group.add_task(
         ),
         message="{ctx.input.message}",
         tools=_get_tool,
+        toolsets=_get_toolset,
         yolo_mode=_render_yolo_mode_input,
         retries=0,
     ),
@@ -193,7 +217,7 @@ llm_ask: LLMTask = llm_group.add_task(
 llm_group.add_task(
     BaseTrigger(
         name="llm-chat",
-        input=[input for input in _llm_ask_inputs if input.name != "message"],
+        input=_get_inputs(False),
         description="💬 Chat with LLM",
         queue_name="ask_trigger",
         action=read_user_prompt,

zrb/builtin/llm/tool/code.py

@@ -120,6 +120,10 @@ async def analyze_repo(
         goal=goal,
         token_limit=extraction_token_threshold,
     )
+    if len(extracted_infos) == 0:
+        raise RuntimeError(
+            "No info can be extracted, adjust extensions or exclude_patterns."
+        )
     if len(extracted_infos) == 1:
         return extracted_infos[0]
     summarized_infos = extracted_infos
@@ -146,11 +150,11 @@ def _get_file_metadatas(
             if not any(file.endswith(f".{ext}") for ext in extensions):
                 continue
             file_path = os.path.join(root, file)
-            if is_excluded(file_path, exclude_patterns):
-                continue
             try:
+                rel_path = os.path.relpath(file_path, dir_path)
+                if is_excluded(rel_path, exclude_patterns):
+                    continue
                 with open(file_path, "r", encoding="utf-8", errors="ignore") as f:
-                    rel_path = os.path.relpath(file_path, dir_path)
                     metadata_list.append({"path": rel_path, "content": f.read()})
             except Exception as e:
                 print(f"Error reading file {file_path}: {e}")

zrb/builtin/llm/tool/file.py

@@ -304,7 +304,7 @@ def write_to_file(
     Writes content to a file, completely overwriting it if it exists or
     creating it if it doesn't.
 
-    Use this tool to create new files or to replace the entire content of
+    Use this tool to create new files or to overwrite the entire content of
     existing files. This is a destructive operation, so be certain of your
     actions. Always read the file first to understand its contents before
     overwriting it, unless you are creating a new file.
@@ -497,7 +497,7 @@ async def analyze_file(
     ctx: AnyContext, path: str, query: str, token_limit: int | None = None
 ) -> dict[str, Any]:
     """
-    Performs a deep, goal-oriented analysis of a single file using a sub-agent.
+    Performs a high level, goal-oriented analysis of a single file using a sub-agent.
 
     This tool is ideal for complex questions about a single file that go beyond
     simple reading or searching. It uses a specialized sub-agent to analyze the

zrb/builtin/llm/tool/sub_agent.py

@@ -1,4 +1,3 @@
-import json
 from collections.abc import Callable
 from textwrap import dedent
 from typing import TYPE_CHECKING, Any, Coroutine
@@ -9,7 +8,7 @@ from zrb.task.llm.config import get_model, get_model_settings
 from zrb.task.llm.prompt import get_system_and_user_prompt
 
 if TYPE_CHECKING:
-    from pydantic_ai import Agent, Tool
+    from pydantic_ai import Tool
     from pydantic_ai.models import Model
     from pydantic_ai.settings import ModelSettings
     from pydantic_ai.toolsets import AbstractToolset
@@ -24,7 +23,7 @@ def create_sub_agent_tool(
     model: "str | Model | None" = None,
     model_settings: "ModelSettings | None" = None,
     tools: "list[ToolOrCallable]" = [],
-    toolsets: list["AbstractToolset[Agent]"] = [],
+    toolsets: list["AbstractToolset[None]"] = [],
     yolo_mode: bool | list[str] | None = None,
     log_indent_level: int = 2,
 ) -> Callable[[AnyContext, str], Coroutine[Any, Any, dict[str, Any]]]:

zrb/task/base/execution.py

@@ -53,7 +53,9 @@ def check_execute_condition(task: "BaseTask", session: AnySession) -> bool:
     Evaluates the task's execute_condition attribute.
     """
     ctx = task.get_ctx(session)
-    execute_condition_attr = getattr(task, "_execute_condition", True)
+    execute_condition_attr = (
+        task._execute_condition if task._execute_condition is not None else True
+    )
     return get_bool_attr(ctx, execute_condition_attr, True, auto_render=True)
 
 
@@ -63,8 +65,12 @@ async def execute_action_until_ready(task: "BaseTask", session: AnySession):
     """
     ctx = task.get_ctx(session)
     readiness_checks = task.readiness_checks
-    readiness_check_delay = getattr(task, "_readiness_check_delay", 0.5)
-    monitor_readiness = getattr(task, "_monitor_readiness", False)
+    readiness_check_delay = (
+        task._readiness_check_delay if task._readiness_check_delay is not None else 0.5
+    )
+    monitor_readiness = (
+        task._monitor_readiness if task._monitor_readiness is not None else False
+    )
 
     if not readiness_checks:  # Simplified check for empty list
         ctx.log_info("No readiness checks")
@@ -140,8 +146,8 @@ async def execute_action_with_retry(task: "BaseTask", session: AnySession) -> An
     handling success (triggering successors) and failure (triggering fallbacks).
     """
     ctx = task.get_ctx(session)
-    retries = getattr(task, "_retries", 2)
-    retry_period = getattr(task, "_retry_period", 0)
+    retries = task._retries if task._retries is not None else 2
+    retry_period = task._retry_period if task._retry_period is not None else 0
     max_attempt = retries + 1
     ctx.set_max_attempt(max_attempt)
 
@@ -163,8 +169,9 @@ async def execute_action_with_retry(task: "BaseTask", session: AnySession) -> An
             session.get_task_status(task).mark_as_completed()
 
             # Store result in XCom
-            task_xcom: Xcom = ctx.xcom.get(task.name)
-            task_xcom.push(result)
+            task_xcom: Xcom | None = ctx.xcom.get(task.name)
+            if task_xcom is not None:
+                task_xcom.push(result)
 
             # Skip fallbacks and execute successors on success
             skip_fallbacks(task, session)
@@ -201,7 +208,7 @@ async def run_default_action(task: "BaseTask", ctx: AnyContext) -> Any:
     This is the default implementation called by BaseTask._exec_action.
     Subclasses like LLMTask override _exec_action with their own logic.
     """
-    action = getattr(task, "_action", None)
+    action = task._action
     if action is None:
         ctx.log_debug("No action defined for this task.")
         return None

zrb/task/base/monitoring.py

@@ -17,9 +17,13 @@ async def monitor_task_readiness(
     """
     ctx = task.get_ctx(session)
     readiness_checks = task.readiness_checks
-    readiness_check_period = getattr(task, "_readiness_check_period", 5.0)
-    readiness_failure_threshold = getattr(task, "_readiness_failure_threshold", 1)
-    readiness_timeout = getattr(task, "_readiness_timeout", 60)
+    readiness_check_period = (
+        task._readiness_check_period if task._readiness_check_period else 5.0
+    )
+    readiness_failure_threshold = (
+        task._readiness_failure_threshold if task._readiness_failure_threshold else 1
+    )
+    readiness_timeout = task._readiness_timeout if task._readiness_timeout else 60
 
     if not readiness_checks:
         ctx.log_debug("No readiness checks defined, monitoring is not applicable.")
@@ -41,8 +45,9 @@ async def monitor_task_readiness(
                 session.get_task_status(check).reset_history()
                 session.get_task_status(check).reset()
                 # Clear previous XCom data for the check task if needed
-                check_xcom: Xcom = ctx.xcom.get(check.name)
-                check_xcom.clear()
+                check_xcom: Xcom | None = ctx.xcom.get(check.name)
+                if check_xcom is not None:
+                    check_xcom.clear()
 
             readiness_check_coros = [
                 run_async(check.exec_chain(session)) for check in readiness_checks
@@ -77,7 +82,7 @@ async def monitor_task_readiness(
                 )
                 # Ensure check tasks are marked as failed on timeout
                 for check in readiness_checks:
-                    if not session.get_task_status(check).is_finished:
+                    if not session.get_task_status(check).is_ready:
                         session.get_task_status(check).mark_as_failed()
 
             except (asyncio.CancelledError, KeyboardInterrupt):
@@ -92,7 +97,7 @@ async def monitor_task_readiness(
                 )
                 # Mark checks as failed
                 for check in readiness_checks:
-                    if not session.get_task_status(check).is_finished:
+                    if not session.get_task_status(check).is_ready:
                         session.get_task_status(check).mark_as_failed()
 
         # If failure threshold is reached

zrb/task/llm/agent.py

@@ -125,8 +125,8 @@ def get_agent(
         "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]]" = [],
+    toolsets_attr: "list[AbstractToolset[None] | str] | Callable[[AnySharedContext], list[AbstractToolset[None] | str]]" = [],  # noqa
+    additional_toolsets: "list[AbstractToolset[None] | str]" = [],
     retries: int = 3,
     yolo_mode: bool | list[str] | None = None,
 ) -> "Agent":
@@ -149,8 +149,11 @@ def get_agent(
     tools = list(tools_attr(ctx) if callable(tools_attr) else tools_attr)
     tools.extend(additional_tools)
     # Get Toolsets for agent
-    tool_sets = list(toolsets_attr(ctx) if callable(toolsets_attr) else toolsets_attr)
-    tool_sets.extend(additional_toolsets)
+    toolset_or_str_list = list(
+        toolsets_attr(ctx) if callable(toolsets_attr) else toolsets_attr
+    )
+    toolset_or_str_list.extend(additional_toolsets)
+    toolsets = _render_toolset_or_str_list(ctx, toolset_or_str_list)
     # If no agent provided, create one using the configuration
     return create_agent_instance(
         ctx=ctx,
@@ -158,13 +161,32 @@ def get_agent(
         output_type=output_type,
         system_prompt=system_prompt,
         tools=tools,
-        toolsets=tool_sets,
+        toolsets=toolsets,
         model_settings=model_settings,
         retries=retries,
         yolo_mode=yolo_mode,
     )
 
 
+def _render_toolset_or_str_list(
+    ctx: AnyContext, toolset_or_str_list: list["AbstractToolset[None] | str"]
+) -> list["AbstractToolset[None]"]:
+    from pydantic_ai.mcp import load_mcp_servers
+
+    toolsets = []
+    for toolset_or_str in toolset_or_str_list:
+        if isinstance(toolset_or_str, str):
+            try:
+                servers = load_mcp_servers(toolset_or_str)
+                for server in servers:
+                    toolsets.append(server)
+            except Exception as e:
+                ctx.log_error(f"Invalid MCP Config {toolset_or_str}: {e}")
+            continue
+        toolsets.append(toolset_or_str)
+    return toolsets
+
+
 async def run_agent_iteration(
     ctx: AnyContext,
     agent: "Agent[None, Any]",

zrb/task/llm/config.py

@@ -4,7 +4,7 @@ if TYPE_CHECKING:
     from pydantic_ai.models import Model
     from pydantic_ai.settings import ModelSettings
 
-from zrb.attr.type import BoolAttr, StrAttr, fstring
+from zrb.attr.type import BoolAttr, StrAttr, StrListAttr, fstring
 from zrb.config.llm_config import LLMConfig, llm_config
 from zrb.context.any_context import AnyContext
 from zrb.context.any_shared_context import AnySharedContext
@@ -13,7 +13,7 @@ from zrb.util.attr import get_attr, get_bool_attr, get_str_list_attr
 
 def get_yolo_mode(
     ctx: AnyContext,
-    yolo_mode_attr: BoolAttr | StrAttr | None = None,
+    yolo_mode_attr: BoolAttr | StrListAttr | None = None,
     render_yolo_mode: bool = True,
 ) -> bool | list[str]:
     if yolo_mode_attr is None:

zrb/task/llm/tool_wrapper.py

@@ -1,5 +1,6 @@
 import functools
 import inspect
+import json
 import traceback
 import typing
 from collections.abc import Callable
@@ -172,18 +173,17 @@ def _get_edited_kwargs(
         return kwargs, False
     while len(user_edit_responses) < 3:
         user_edit_responses.append("")
-    key, val = user_edit_responses[1:]
+    key, val_str = user_edit_responses[1:]
     if key not in kwargs:
         return kwargs, True
-    if val != "":
-        kwargs[key] = val
-        return kwargs, True
-    val = edit_text(
-        prompt_message=f"// {key}",
-        value=kwargs.get(key, ""),
-        editor=CFG.DEFAULT_EDITOR,
-    )
-    kwargs[key] = val
+    is_str_param = isinstance(kwargs[key], str)
+    if val_str == "":
+        val_str = edit_text(
+            prompt_message=f"// {key}",
+            value=_get_val_str(kwargs[key]),
+            editor=CFG.DEFAULT_EDITOR,
+        )
+    kwargs[key] = val_str if is_str_param else json.loads(val_str)
     return kwargs, True
 
 
@@ -233,7 +233,7 @@ def _get_detail_func_param(args: list[Any] | tuple[Any], kwargs: dict[str, Any])
 
 def _get_func_param_item(key: str, val: Any) -> str:
     upper_key = key.upper()
-    val_str = f"{val}"
+    val_str = _get_val_str(val)
     val_parts = val_str.split("\n")
     if len(val_parts) == 1:
         return f"- {upper_key} `{val}`"
@@ -244,6 +244,15 @@ def _get_func_param_item(key: str, val: Any) -> str:
     return "\n".join(lines)
 
 
+def _get_val_str(val: Any) -> str:
+    if isinstance(val, str):
+        return val
+    try:
+        return json.dumps(val, indent=4)
+    except Exception:
+        return f"{val}"
+
+
 def _get_func_call_str(
     func: Callable, args: list[Any] | tuple[Any], kwargs: dict[str, Any]
 ) -> str:

zrb/task/llm_task.py

@@ -80,7 +80,8 @@ class LLMTask(BaseTask):
             | Callable[[AnySharedContext], list["ToolOrCallable"]]
         ) = [],
         toolsets: (
-            list["AbstractToolset[Agent]"] | Callable[[AnySharedContext], list["Tool"]]
+            list["AbstractToolset[None] | str"]
+            | Callable[[AnySharedContext], list["AbstractToolset[None] | str"]]
         ) = [],
         conversation_history: (
             ConversationHistory
@@ -169,7 +170,7 @@ class LLMTask(BaseTask):
         self._rate_limitter = rate_limitter
         self._additional_tools: list["ToolOrCallable"] = []
         self._toolsets = toolsets
-        self._additional_toolsets: list["AbstractToolset[Agent]"] = []
+        self._additional_toolsets: list["AbstractToolset[None] | str"] = []
         self._conversation_history = conversation_history
         self._conversation_history_reader = conversation_history_reader
         self._conversation_history_writer = conversation_history_writer
@@ -200,10 +201,12 @@ class LLMTask(BaseTask):
         for single_tool in tool:
             self._additional_tools.append(single_tool)
 
-    def add_toolset(self, *toolset: "AbstractToolset[Agent]"):
+    def add_toolset(self, *toolset: "AbstractToolset[None] | str"):
         self.append_toolset(*toolset)
 
-    def append_toolset(self, *toolset: "AbstractToolset[Agent]"):
+    def append_toolset(self, *toolset: "AbstractToolset[None] | str"):
+        from pydantic_ai.mcp import load_mcp_servers
+
         for single_toolset in toolset:
             self._additional_toolsets.append(single_toolset)
 

{zrb-1.16.1.dist-info → zrb-1.16.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: zrb
-Version: 1.16.1
+Version: 1.16.3
 Summary: Your Automation Powerhouse
 License: AGPL-3.0-or-later
 Keywords: Automation,Task Runner,Code Generator,Monorepo,Low Code
@@ -24,12 +24,12 @@ Requires-Dist: isort (>=6.0.1,<7.0.0)
 Requires-Dist: libcst (>=1.8.2,<2.0.0)
 Requires-Dist: markdownify (>=1.2.0,<2.0.0)
 Requires-Dist: mcp (>1.12.3)
-Requires-Dist: openai (>=1.99.9)
+Requires-Dist: openai (>=1.107.2)
 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] (>=1.0.1,<1.1.0)
+Requires-Dist: pydantic-ai-slim[anthropic,bedrock,cohere,google,groq,huggingface,mistral,openai,vertexai] (>=1.0.10,<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.16.1.dist-info → zrb-1.16.3.dist-info}/RECORD

@@ -2,25 +2,26 @@ zrb/__init__.py,sha256=qkCV2EnAGIgvsawBHYvKgPAp0zzPcikYSmbQXATLzg4,5060
 zrb/__main__.py,sha256=9SXH9MK4PVyU9lkEyHxiIUABbcsV2wseP94HmlqTR4M,2657
 zrb/attr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/attr/type.py,sha256=4TV5gPYMMrKh5V-yB6iRYKCbsXAH_AvGXMsjxKLHcUs,568
-zrb/builtin/__init__.py,sha256=NjXpvBgAiPH-dNsJx5Fa-zSZE5JVnmVb1GhMNtevpGQ,1614
+zrb/builtin/__init__.py,sha256=qeLg_S7mRWe48AYrzNutAgAnLh2YE57-iEVK0ICd-3A,1672
 zrb/builtin/base64.py,sha256=UjaFttE2oRx0T7_RpKtKfgMtWfiQXfJBAJmA16ek8Ic,1507
 zrb/builtin/git.py,sha256=8_qVE_2lVQEVXQ9vhiw8Tn4Prj1VZB78ZjEJJS5Ab3M,5461
 zrb/builtin/git_subtree.py,sha256=7BKwOkVTWDrR0DXXQ4iJyHqeR6sV5VYRt8y_rEB0EHg,3505
 zrb/builtin/group.py,sha256=zYC5uw0VE97TXiLCr464kFJ-CJIJyeQ2RXjnVRY5ovs,2577
 zrb/builtin/http.py,sha256=L6RE73c65wWwG5iHFN-tpOhyh56KsrgVskDd3c3YXtk,4246
 zrb/builtin/jwt.py,sha256=3M5uaQhJZbKQLjTUft1OwPz_JxtmK-xtkjxWjciOQho,2859
-zrb/builtin/llm/chat_session.py,sha256=Q9-5aG3CLRDuRjUtjXPLMTHl9PEwx31HQo0_RkDn9Vs,10516
+zrb/builtin/llm/chat_session.py,sha256=6q40xQdv56OtaTZCVSS16WDchn4l0sagZI2BGX_JyQM,10448
+zrb/builtin/llm/chat_trigger.py,sha256=xaJmzrvBGz6LFPOpYnG9bMeT1dY6XqZPXamtr9e72-w,2427
 zrb/builtin/llm/history.py,sha256=LDOrL0p7r_AHLa5L8Dp7bHNsOALugmJd7OguXRWGnm4,3087
 zrb/builtin/llm/input.py,sha256=Nw-26uTWp2QhUgKJcP_IMHmtk-b542CCSQ_vCOjhvhM,877
-zrb/builtin/llm/llm_ask.py,sha256=FU5KonqW1U_vDch2gIGE7yoMmLLDNiV4QLA4VDv0zxk,6636
+zrb/builtin/llm/llm_ask.py,sha256=8V5YAShUPes5qnlxLaS9Ks4KOs7oCQFGrpfkj-6rLMU,7546
 zrb/builtin/llm/previous-session.js,sha256=xMKZvJoAbrwiyHS0OoPrWuaKxWYLoyR5sguePIoCjTY,816
 zrb/builtin/llm/tool/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/builtin/llm/tool/api.py,sha256=p55Fs6QTmsM2u-vVcBJb9xYxGAkiHIKX2wYKhsGlWFE,2417
 zrb/builtin/llm/tool/cli.py,sha256=sm_maE1WBB051odh1xXr8QQOWln_ewAU_7OScKAneT4,1244
-zrb/builtin/llm/tool/code.py,sha256=mtmXTDZTbUh6bEf4fsVPvfM0bokHMMETDWAHOXRmRmI,8798
-zrb/builtin/llm/tool/file.py,sha256=W4hWCg8Uo3Fo4bucpSDVgjQIGaXTLod5CYOeF23JC-s,23581
+zrb/builtin/llm/tool/code.py,sha256=-MKUpXX4jkWm4rCqrUmTTzsYhjfzKle9_XsNPtq8PNM,8952
+zrb/builtin/llm/tool/file.py,sha256=fDgt31CWwZtOYOk6lfBSBxX85NARLr-ZzXPvG1JP8C0,23589
 zrb/builtin/llm/tool/rag.py,sha256=aN8D8ZqzGXWCP_1F1LbN0QgfyzaK9CKrjfTPorDIYjw,9824
-zrb/builtin/llm/tool/sub_agent.py,sha256=_curhFBxO9cYAo19VWGkJqKkqsY7kiSknaM__ONJhpg,5087
+zrb/builtin/llm/tool/sub_agent.py,sha256=nYluPfc8FlSobpP_4vnBIqkPARrDHq_SwKkmlh_ATUI,5067
 zrb/builtin/llm/tool/web.py,sha256=zDgxYRIQRj9A8QXb80-ZSPmGCvIOWy8bpJMGSAuTL8Y,7491
 zrb/builtin/md5.py,sha256=690RV2LbW7wQeTFxY-lmmqTSVEEZv3XZbjEUW1Q3XpE,1480
 zrb/builtin/project/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -337,17 +338,17 @@ zrb/task/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/task/any_task.py,sha256=AXcBLnDWrJsiq_VihrXeNNMsQZuHzc5k6j-mS60qbyM,6443
 zrb/task/base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/task/base/context.py,sha256=ptz9-Am1s4yq6EHZUpnSrB0Ps3k7BgyakVbE-ZpiBzc,3923
-zrb/task/base/execution.py,sha256=scDLfNYBe8Bc8Ct1LCIKmFtjpPxm7FjqZ2bJXIQAzv8,11042
+zrb/task/base/execution.py,sha256=ixWSk0byHDbBvT7lxh94eD8pmnbI6LRTIIkMmh0zing,11265
 zrb/task/base/lifecycle.py,sha256=c2v977pUm7S4EqrTMcUJKhnYOWugACVwU3qORDKiLXQ,7639
-zrb/task/base/monitoring.py,sha256=UAOEcPiYNtZR4FFxzWCosuOEFE_P3c4GT5vAhQmohqI,5663
+zrb/task/base/monitoring.py,sha256=w4_q3e7dwcJureUfcJr7vhpwQ5RCikr0VHGlGA_crrM,5815
 zrb/task/base/operators.py,sha256=uAMFqpZJsPnCrojgOl1FUDXTS15mtOa_IqiAXltyYRU,1576
 zrb/task/base_task.py,sha256=upwuqAfwNDXTYM-uRDJhgZqqqARI03T6ksUbFHHLEH0,13321
 zrb/task/base_trigger.py,sha256=HVasUkIZc8ZdAkJCbhXeO1QTY9vF7BvENoxKRV3R_eY,7171
 zrb/task/cmd_task.py,sha256=myM8WZm6NrUD-Wv0Vb5sTOrutrAVZLt5LVsSBKwX6SM,10860
 zrb/task/http_check.py,sha256=Gf5rOB2Se2EdizuN9rp65HpGmfZkGc-clIAlHmPVehs,2565
 zrb/task/llm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-zrb/task/llm/agent.py,sha256=UqQoxhPDg25jm5UwlC0mmPypfV56mXGNpk5hiZ75nbA,10949
-zrb/task/llm/config.py,sha256=zOPf4NpdWPuBc_R8d-kljYcOKfUAypDxiSjRDrxV66M,4059
+zrb/task/llm/agent.py,sha256=mAiDc5YhQ87dJX9Lfv_Q8bTyY2laZDCaAcpHs2yxvtc,11724
+zrb/task/llm/config.py,sha256=2usr_FjylQrrRjjPDOIBhb7pIwVQkicA0hYGeMy9qYg,4076
 zrb/task/llm/conversation_history.py,sha256=_ThBOCv4vs3V6B3P_s-Aad2sH0RqE46KzLqgwdwHMC0,6758
 zrb/task/llm/conversation_history_model.py,sha256=kk-7niTl29Rm2EUIhTHzPXgZ5tp4IThMnIB3dS-1OdU,3062
 zrb/task/llm/default_workflow/coding.md,sha256=2uythvPsnBpYfIhiIH1cCinQXX0i0yUqsL474Zpemw0,2484
@@ -358,9 +359,9 @@ zrb/task/llm/history_summarization.py,sha256=blTKfaSpgaqvORWzGL3BKrRWAsfNdZB03oJ
 zrb/task/llm/history_summarization_tool.py,sha256=5KQUoP75udhtVRbGVxJgnQ36WtVoX--aMvAfGIMBJmw,1760
 zrb/task/llm/print_node.py,sha256=Nnf4F6eDJR4PFcOqQ1jLWBTFnzNGl1Stux2DZ3SMhsY,8062
 zrb/task/llm/prompt.py,sha256=Mb3hz-KAp2bL9m6ZL0gcfLveRfBDRZvDVN_HHPGuEPM,12028
-zrb/task/llm/tool_wrapper.py,sha256=ifOP-smxHcDNpZvZMZm0XkKH49BicbyGTtpHNdcIA6Q,10241
+zrb/task/llm/tool_wrapper.py,sha256=9HlfsOi73eGVC43iGZ1BasohT9clFD4IX9xSxu4nGU4,10520
 zrb/task/llm/typing.py,sha256=c8VAuPBw_4A3DxfYdydkgedaP-LU61W9_wj3m3CAX1E,58
-zrb/task/llm_task.py,sha256=OxJ9QpqjEyeOI1_zqzNZHtQlRHi0ANOvL9FYaWLzO3Y,14913
+zrb/task/llm_task.py,sha256=uzHNAPziTeIiBr08-tg5_C3MOqJMhfbKmvkWEeS0GZM,15022
 zrb/task/make_task.py,sha256=PD3b_aYazthS8LHeJsLAhwKDEgdurQZpymJDKeN60u0,2265
 zrb/task/rsync_task.py,sha256=WfqNSaicJgYWpunNU34eYxXDqHDHOftuDHyWJKjqwg0,6365
 zrb/task/scaffolder.py,sha256=rME18w1HJUHXgi9eTYXx_T2G4JdqDYzBoNOkdOOo5-o,6806
@@ -410,7 +411,7 @@ zrb/util/todo_model.py,sha256=hhzAX-uFl5rsg7iVX1ULlJOfBtblwQ_ieNUxBWfc-Os,1670
 zrb/util/truncate.py,sha256=eSzmjBpc1Qod3lM3M73snNbDOcARHukW_tq36dWdPvc,921
 zrb/xcom/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/xcom/xcom.py,sha256=o79rxR9wphnShrcIushA0Qt71d_p3ZTxjNf7x9hJB78,1571
-zrb-1.16.1.dist-info/METADATA,sha256=xLE_P4uDT-BfY5pzkxxhzw5RTT4tOMQJUiYMAc-tAUw,9933
-zrb-1.16.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-zrb-1.16.1.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
-zrb-1.16.1.dist-info/RECORD,,
+zrb-1.16.3.dist-info/METADATA,sha256=XONEHMCkv5j0YPf35oaP5MYliI1CYXoPXUv-8FNKFI4,9935
+zrb-1.16.3.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+zrb-1.16.3.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
+zrb-1.16.3.dist-info/RECORD,,