zrb 1.7.1__py3-none-any.whl → 1.7.3__py3-none-any.whl

zrb/builtin/jwt.py

@@ -24,10 +24,12 @@ from zrb.task.make_task import make_task
     ],
 )
 def encode_jwt(ctx: AnyContext) -> str:
+    import json
+
     import jwt
 
     try:
-        payload = eval(ctx.input.payload)
+        payload = json.loads(ctx.input.payload)
         token = jwt.encode(
             payload=payload, key=ctx.input.secret, algorithm=ctx.input.algorithm
         )

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,28 +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(
-                [
-                    "Analyze file using LLM capability.",
-                    "This tool can do:",
-                    "- summarization",
-                    "- outline/structure extraction",
-                    "- code review",
-                    "- other tasks requiring deep understanding.",
-                    "Always use this tool to get deep understanding of file content",
-                ]
-            ),
-            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 = [
@@ -444,3 +446,48 @@ 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):
+        return json.dumps(
+            {"success": False, "path": path, "error": f"File not found at {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 path",
+                abs_path,
+                "# Instruction",
+                query,
+            ]
+        ),
+    )

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/task/llm/context_enrichment.py

@@ -47,6 +47,7 @@ async def enrich_context(
 
     ctx.log_info("Attempting to enrich conversation context...")
     # Prepare context and history for the enrichment prompt
+    history_summary = conversation_context.get("history_summary")
     try:
         context_json = json.dumps(conversation_context)
         history_json = json.dumps(history_list)
@@ -54,7 +55,13 @@ async def enrich_context(
         user_prompt_data = "\n".join(
             [
                 "Extract context from the following conversation info.",
-                "Maintain the relevant context and remove the irrelevant ones.",
+                "Extract only contexts that will be relevant across multiple conversations, like",  # noqa
+                "- user name",
+                "- user hobby",
+                "- user's long life goal",
+                "- standard/SOP",
+                "- etc.",
+                "Always maintain the relevant context and remove the irrelevant ones.",
                 "Restructure the context in a helpful way",
                 "Keep the context small",
                 f"Existing Context: {context_json}",
@@ -90,6 +97,8 @@ async def enrich_context(
             ctx.print(stylize_faint(f"[Token Usage] {usage}"), plain=True)
             if response:
                 conversation_context = response
+                # Re inject history summary
+                conversation_context["history_summary"] = history_summary
                 ctx.log_info("Context enriched based on history.")
                 ctx.log_info(
                     f"Updated conversation context: {json.dumps(conversation_context)}"

{zrb-1.7.1.dist-info → zrb-1.7.3.dist-info}/METADATA

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

{zrb-1.7.1.dist-info → zrb-1.7.3.dist-info}/RECORD

@@ -8,18 +8,18 @@ zrb/builtin/git.py,sha256=8_qVE_2lVQEVXQ9vhiw8Tn4Prj1VZB78ZjEJJS5Ab3M,5461
 zrb/builtin/git_subtree.py,sha256=7BKwOkVTWDrR0DXXQ4iJyHqeR6sV5VYRt8y_rEB0EHg,3505
 zrb/builtin/group.py,sha256=t008xLM4_fgbjfZrPoi_fQAnSHIo6MOiQSCHBO4GDYU,2379
 zrb/builtin/http.py,sha256=sLqEczuSxGYXWzyJR6frGOHkPTviu4BeyroUr3-ZuAI,4322
-zrb/builtin/jwt.py,sha256=kjCf8qt7tkW9BpBDRAVTMJaEPQGzCbO1wo9xt5JoM8A,2836
+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=7Dx5XWf0QAbPwscGohloKOp_iqoI-JuaVojTaCJL3Jc,5332
+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=4bbgsE2aCDR6Y4HbkMM--Q_ohmJW3KPqLbhuoJrrd8M,18173
 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
@@ -320,7 +320,7 @@ zrb/task/llm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/task/llm/agent.py,sha256=6wGSsw03GdY_fj12CsJh7wxB6BnE13N8RYXaWfbiUsk,5451
 zrb/task/llm/config.py,sha256=oGxHYMdIvhASnKwNuMPwcdeJiFfS0tNskzGHakpfpQU,3458
 zrb/task/llm/context.py,sha256=U9a8lxa2ikz6my0Sd5vpO763legHrMHyvBjbrqNmv0Y,3838
-zrb/task/llm/context_enrichment.py,sha256=kGFEwma06edLygtEvJ4331i39rmEwdDTSrXm-G1LolM,6624
+zrb/task/llm/context_enrichment.py,sha256=jB7lekwo4hTk8HIwhhq7HSMfgAzwaV2U867icBRt6Z0,7088
 zrb/task/llm/error.py,sha256=27DQXSG8SH1-XuvXFdZQKzP39wZDWmd_YnSTz6DJKKI,3690
 zrb/task/llm/history.py,sha256=3WMXoi7RquxosXQf3iv2_BCeF8iKtY1f407pR71xERs,7745
 zrb/task/llm/history_summarization.py,sha256=n3GbgwXlDIkgpJppMGfpqF_8Wpi9yAoZYh46O1pFQeU,6432
@@ -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.1.dist-info/METADATA,sha256=N_pEPK58I8nQ5O7J-1yyl0Q6gxH1PPpLN82ldGB7rMo,8385
-zrb-1.7.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-zrb-1.7.1.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
-zrb-1.7.1.dist-info/RECORD,,
+zrb-1.7.3.dist-info/METADATA,sha256=XgHOTXqZlnfTnKGLWhWJvkl4K5cz5_-5OPz0GS2zrSM,8385
+zrb-1.7.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+zrb-1.7.3.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
+zrb-1.7.3.dist-info/RECORD,,