zrb 1.7.2__py3-none-any.whl → 1.7.4__py3-none-any.whl

zrb/builtin/llm/llm_ask.py

@@ -5,13 +5,13 @@ from zrb.builtin.llm.input import PreviousSessionInput
 from zrb.builtin.llm.tool.api import get_current_location, get_current_weather
 from zrb.builtin.llm.tool.cli import run_shell_command
 from zrb.builtin.llm.tool.file import (
+    analyze_file,
     apply_diff,
     list_files,
     read_from_file,
     search_files,
     write_to_file,
 )
-from zrb.builtin.llm.tool.sub_agent import create_sub_agent_tool
 from zrb.builtin.llm.tool.web import (
     create_search_internet_tool,
     open_web_page,
@@ -131,29 +131,7 @@ if CFG.LLM_ALLOW_ACCESS_LOCAL_FILE:
         write_to_file,
         search_files,
         apply_diff,
-        create_sub_agent_tool(
-            tool_name="analyze_file",
-            tool_description="\n".join(
-                [
-                    "Always use this tool to analyze file using LLM capability.",
-                    "This tool can do:",
-                    "- summarization",
-                    "- outline/structure extraction",
-                    "- code review",
-                    "- other tasks requiring deep understanding.",
-                    "This tool ONLY HAVE SINGLE ARGUMENT: query",
-                    "Make sure to include the file path you want to analyze in the query",
-                ]
-            ),
-            sub_agent_system_prompt="\n".join(
-                [
-                    "You are a file analyzer assistant",
-                    "Your goal is to help the main asisstant by reading file",
-                    "and perform necessary indepth analysis required by the main assistant",
-                ]
-            ),
-            sub_agent_tools=[read_from_file, search_files],
-        ),
+        analyze_file,
     )
 
 if CFG.LLM_ALLOW_ACCESS_SHELL:

zrb/builtin/llm/tool/file.py

@@ -4,6 +4,8 @@ import os
 import re
 from typing import Any, Optional
 
+from zrb.builtin.llm.tool.sub_agent import create_sub_agent_tool
+from zrb.context.any_context import AnyContext
 from zrb.util.file import read_file, read_file_with_line_numbers, write_file
 
 DEFAULT_EXCLUDED_PATTERNS = [
@@ -199,11 +201,11 @@ def read_from_file(
     Raises:
         Exception: If an error occurs.
     """
+    abs_path = os.path.abspath(os.path.expanduser(path))
+    # Check if file exists
+    if not os.path.exists(abs_path):
+        raise FileNotFoundError(f"File not found: {path}")
     try:
-        abs_path = os.path.abspath(os.path.expanduser(path))
-        # Check if file exists
-        if not os.path.exists(abs_path):
-            return json.dumps({"error": f"File {path} does not exist"})
         content = read_file_with_line_numbers(abs_path)
         lines = content.splitlines()
         total_lines = len(lines)
@@ -400,24 +402,15 @@ def apply_diff(
     Raises:
         Exception: If an error occurs.
     """
+    abs_path = os.path.abspath(os.path.expanduser(path))
+    if not os.path.exists(abs_path):
+        raise FileNotFoundError(f"File not found: {path}")
     try:
-        abs_path = os.path.abspath(os.path.expanduser(path))
-        if not os.path.exists(abs_path):
-            return json.dumps(
-                {"success": False, "path": path, "error": f"File not found at {path}"}
-            )
         content = read_file(abs_path)
         lines = content.splitlines()
         if start_line < 1 or end_line > len(lines) or start_line > end_line:
-            return json.dumps(
-                {
-                    "success": False,
-                    "path": path,
-                    "error": (
-                        f"Invalid line range {start_line}-{end_line} "
-                        f"for file with {len(lines)} lines."
-                    ),
-                }
+            raise ValueError(
+                f"Invalid line range {start_line}-{end_line} for file with {len(lines)} lines"
             )
         original_content = "\n".join(lines[start_line - 1 : end_line])
         if original_content != search_content:
@@ -444,3 +437,49 @@ def apply_diff(
         raise OSError(f"Error applying diff to {path}: {e}")
     except Exception as e:
         raise RuntimeError(f"Unexpected error applying diff to {path}: {e}")
+
+
+async def analyze_file(ctx: AnyContext, path: str, query: str) -> str:
+    """Analyze file using LLM capability to reduce context usage.
+    Use this tool for:
+    - summarization
+    - outline/structure extraction
+    - code review
+    - other tasks
+    Args:
+        path (str): File path to be analyze. Pass exactly as provided, including '~'.
+        query(str): Instruction to analyze the file
+    Returns:
+        str: The analysis result
+    Raises:
+        Exception: If an error occurs.
+    """
+    abs_path = os.path.abspath(os.path.expanduser(path))
+    if not os.path.exists(abs_path):
+        raise FileNotFoundError(f"File not found: {path}")
+    file_content = read_file(abs_path)
+    _analyze_file = create_sub_agent_tool(
+        tool_name="analyze_file",
+        tool_description="analyze file with LLM capability",
+        sub_agent_system_prompt="\n".join(
+            [
+                "You are a file analyzer assistant",
+                "Your goal is to help the main asisstant by reading file",
+                "and perform necessary indepth analysis required by the main assistant",
+            ]
+        ),
+        sub_agent_tools=[read_from_file, search_files],
+    )
+    return await _analyze_file(
+        ctx,
+        "\n".join(
+            [
+                file_content,
+                "# Instruction",
+                query,
+                "# File path",
+                abs_path,
+                "# File content",
+            ]
+        ),
+    )

zrb/builtin/llm/tool/sub_agent.py

@@ -1,18 +1,28 @@
 import json
 from collections.abc import Callable
 from textwrap import dedent
-
-from pydantic_ai import Tool
-from pydantic_ai.mcp import MCPServer
-from pydantic_ai.models import Model
-from pydantic_ai.settings import ModelSettings
+from typing import TYPE_CHECKING, Any
+
+if TYPE_CHECKING:
+    from pydantic_ai import Tool
+    from pydantic_ai.mcp import MCPServer
+    from pydantic_ai.models import Model
+    from pydantic_ai.settings import ModelSettings
+else:
+    Tool = Any
+    MCPServer = Any
+    Model = Any
+    ModelSettings = Any
 
 from zrb.context.any_context import AnyContext
 from zrb.task.llm.agent import create_agent_instance, run_agent_iteration
 from zrb.task.llm.config import get_model, get_model_settings
 from zrb.task.llm.prompt import get_combined_system_prompt
 
-ToolOrCallable = Tool | Callable
+if TYPE_CHECKING:
+    ToolOrCallable = Tool | Callable
+else:
+    ToolOrCallable = Any
 
 
 def create_sub_agent_tool(

{zrb-1.7.2.dist-info → zrb-1.7.4.dist-info}/METADATA

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

{zrb-1.7.2.dist-info → zrb-1.7.4.dist-info}/RECORD

@@ -12,14 +12,14 @@ zrb/builtin/jwt.py,sha256=3M5uaQhJZbKQLjTUft1OwPz_JxtmK-xtkjxWjciOQho,2859
 zrb/builtin/llm/chat_session.py,sha256=HqFwrE1DiSlJrR-S3LRYWQBHkVsD-sfAV8_IIbnmtqY,6631
 zrb/builtin/llm/history.py,sha256=cnkOyO43uiMQ9cEvmqk-pPoCk1zCAH_fwAqSgBtsjzY,3079
 zrb/builtin/llm/input.py,sha256=Nw-26uTWp2QhUgKJcP_IMHmtk-b542CCSQ_vCOjhvhM,877
-zrb/builtin/llm/llm_ask.py,sha256=GKjJZEVPgW0IbcRDNF9W7deHcLDPUyq3C0Vl-DqiJLc,5427
+zrb/builtin/llm/llm_ask.py,sha256=TIHpZFofbehJO1LXbsi4O84kHF85Xfqjev6UkI1RiL0,4367
 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=yR9I0ZsI96OeQl9pgwORMASVuXsAL0a89D_iPS4C8Dc,1699
 zrb/builtin/llm/tool/cli.py,sha256=_CNEmEc6K2Z0i9ppYeM7jGpqaEdT3uxaWQatmxP3jKE,858
-zrb/builtin/llm/tool/file.py,sha256=ig4tZGYnGjE96U9KgOpbANmyAgFmTcQzym1wVAsZYRM,16620
+zrb/builtin/llm/tool/file.py,sha256=nCY74VtruTr9LgAq5mroSr4zF0g6LA_uXMI5sh9c8OE,17909
 zrb/builtin/llm/tool/rag.py,sha256=VUyRBvnSeDf8T_lKY--c5HVTfccNgiEJU3QpwssJF8E,8182
-zrb/builtin/llm/tool/sub_agent.py,sha256=7KaxWfFcT-3_fyqQyd4qA2ipzmVFG71iPzRl7wISM5M,4885
+zrb/builtin/llm/tool/sub_agent.py,sha256=7n14KzUSFe5Bjf2lpluKlLyL-b1Mehj2QekkuDzo0ik,5091
 zrb/builtin/llm/tool/web.py,sha256=pXRLhcB_Y6z-2w4C4WezH8n-pg3PSMgt_bwn3aaqi6g,5479
 zrb/builtin/md5.py,sha256=690RV2LbW7wQeTFxY-lmmqTSVEEZv3XZbjEUW1Q3XpE,1480
 zrb/builtin/project/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -370,7 +370,7 @@ zrb/util/string/name.py,sha256=SXEfxJ1-tDOzHqmSV8kvepRVyMqs2XdV_vyoh_9XUu0,1584
 zrb/util/todo.py,sha256=VGISej2KQZERpornK-8X7bysp4JydMrMUTnG8B0-liI,20708
 zrb/xcom/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/xcom/xcom.py,sha256=o79rxR9wphnShrcIushA0Qt71d_p3ZTxjNf7x9hJB78,1571
-zrb-1.7.2.dist-info/METADATA,sha256=JA6bk-DSmoriPSaNGzS8nmmka4IaNC7SLJQjNaCR_RE,8385
-zrb-1.7.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-zrb-1.7.2.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
-zrb-1.7.2.dist-info/RECORD,,
+zrb-1.7.4.dist-info/METADATA,sha256=-C9uLHUST6zakEUGga9poKISERqL6VWDctrjCU6f8h8,8385
+zrb-1.7.4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+zrb-1.7.4.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
+zrb-1.7.4.dist-info/RECORD,,