zrb 1.15.27__tar.gz → 1.16.1__tar.gz

{zrb-1.15.27 → zrb-1.16.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: zrb
-Version: 1.15.27
+Version: 1.16.1
 Summary: Your Automation Powerhouse
 License: AGPL-3.0-or-later
 Keywords: Automation,Task Runner,Code Generator,Monorepo,Low Code
@@ -37,6 +37,7 @@ Requires-Dist: requests (>=2.32.2,<3.0.0)
 Requires-Dist: rich (>=13)
 Requires-Dist: tiktoken (>=0.8.0,<0.9.0)
 Requires-Dist: ulid-py (>=1.1.0,<2.0.0)
+Requires-Dist: xmltodict (>=1.0.2,<2.0.0)
 Project-URL: Documentation, https://github.com/state-alchemists/zrb
 Project-URL: Homepage, https://github.com/state-alchemists/zrb
 Project-URL: Repository, https://github.com/state-alchemists/zrb

{zrb-1.15.27 → zrb-1.16.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "zrb"
-version = "1.15.27"
+version = "1.16.1"
 description = "Your Automation Powerhouse"
 authors = ["Go Frendi Gunawan <gofrendiasgard@gmail.com>"]
 license = "AGPL-3.0-or-later"
@@ -64,6 +64,7 @@ playwright = {version = "^1.54.0", optional = true}
 chromadb = {version = "^0.6.3", optional = true}
 markdownify = "^1.2.0"
 pyjwt = "^2.10.1"
+xmltodict = "^1.0.2"
 
 [tool.poetry.extras]
 # poetry install -E rag

{zrb-1.15.27 → zrb-1.16.1}/src/zrb/builtin/llm/chat_session.py

@@ -21,17 +21,22 @@ async def read_user_prompt(ctx: AnyContext) -> str:
     Orchestrates the session by calling helper functions.
     """
     _show_info(ctx)
-    final_result = await _handle_initial_message(ctx)
-    if ctx.is_web_mode:
-        return final_result
-    is_tty = ctx.is_tty
+    is_tty: bool = ctx.is_tty
     reader = await _setup_input_reader(is_tty)
     multiline_mode = False
-    current_modes = ctx.input.modes
-    current_yolo_mode = ctx.input.yolo
-    user_inputs = []
+    is_first_time = True
+    current_modes: str = ctx.input.modes
+    current_yolo_mode: bool | str = ctx.input.yolo
+    user_inputs: list[str] = []
+    final_result: str = ""
     while True:
         await asyncio.sleep(0.01)
+        previous_session_name: str | None = (
+            ctx.input.previous_session if is_first_time else None
+        )
+        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)
@@ -43,7 +48,12 @@ async def read_user_prompt(ctx: AnyContext) -> str:
             user_prompt = "\n".join(user_inputs)
             user_inputs = []
             result = await _trigger_ask_and_wait_for_result(
-                ctx, user_prompt, current_modes, current_yolo_mode
+                ctx=ctx,
+                user_prompt=user_prompt,
+                modes=current_modes,
+                yolo_mode=current_yolo_mode,
+                previous_session_name=previous_session_name,
+                start_new=start_new,
             )
             if result is not None:
                 final_result = result
@@ -56,10 +66,17 @@ async def read_user_prompt(ctx: AnyContext) -> str:
             user_prompt = "\n".join(user_inputs)
             user_inputs = []
             result = await _trigger_ask_and_wait_for_result(
-                ctx, user_prompt, current_modes, current_yolo_mode
+                ctx=ctx,
+                user_prompt=user_prompt,
+                modes=current_modes,
+                yolo_mode=current_yolo_mode,
+                previous_session_name=previous_session_name,
+                start_new=start_new,
             )
             if result is not None:
                 final_result = result
+                if ctx.is_web_mode or not is_tty:
+                    return final_result
         elif user_input.strip().lower().startswith("/mode"):
             mode_parts = user_input.split(" ", maxsplit=2)
             if len(mode_parts) > 1:
@@ -84,11 +101,16 @@ async def read_user_prompt(ctx: AnyContext) -> str:
             user_prompt = "\n".join(user_inputs)
             user_inputs = []
             result = await _trigger_ask_and_wait_for_result(
-                ctx, user_prompt, current_modes, current_yolo_mode
+                ctx=ctx,
+                user_prompt=user_prompt,
+                modes=current_modes,
+                yolo_mode=current_yolo_mode,
+                previous_session_name=previous_session_name,
+                start_new=start_new,
             )
             if result is not None:
                 final_result = result
-                if ctx.is_web_mode:
+                if ctx.is_web_mode or not is_tty:
                     return final_result
     return final_result
 
@@ -129,24 +151,6 @@ def _show_subcommand(command: str, description: str) -> str:
     return f"  {styled_command} {styled_description}"
 
 
-async def _handle_initial_message(ctx: AnyContext) -> str:
-    """Processes the initial message from the command line."""
-    if not ctx.input.message or ctx.input.message.strip() == "":
-        return ""
-    ctx.print("💬 >>", 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,
-        modes=ctx.input.modes,
-        yolo_mode=ctx.input.yolo,
-        previous_session_name=ctx.input.previous_session,
-        start_new=ctx.input.start_new,
-    )
-    return result if result is not None else ""
-
-
 async def _setup_input_reader(is_interactive: bool):
     """Sets up and returns the appropriate asynchronous input reader."""
     if is_interactive:

{zrb-1.15.27 → zrb-1.16.1}/src/zrb/builtin/llm/llm_ask.py

@@ -193,7 +193,7 @@ llm_ask: LLMTask = llm_group.add_task(
 llm_group.add_task(
     BaseTrigger(
         name="llm-chat",
-        input=_llm_ask_inputs,
+        input=[input for input in _llm_ask_inputs if input.name != "message"],
         description="💬 Chat with LLM",
         queue_name="ask_trigger",
         action=read_user_prompt,

{zrb-1.15.27 → zrb-1.16.1}/src/zrb/builtin/llm/tool/api.py

@@ -1,4 +1,4 @@
-from typing import Literal
+from typing import Any, Literal
 
 
 def get_current_location() -> dict[str, float]:
@@ -31,7 +31,7 @@ def get_current_weather(
     latitude: float,
     longitude: float,
     temperature_unit: Literal["celsius", "fahrenheit"],
-) -> str:
+) -> dict[str, Any]:
     """
     Retrieves the current weather conditions for a given geographical location.
 

{zrb-1.15.27 → zrb-1.16.1}/src/zrb/builtin/llm/tool/cli.py

@@ -1,7 +1,8 @@
 import subprocess
+from typing import Any
 
 
-def run_shell_command(command: str) -> str:
+def run_shell_command(command: str) -> dict[str, Any]:
     """
     Executes a shell command on the user's local machine and returns the output.
 

{zrb-1.15.27 → zrb-1.16.1}/src/zrb/builtin/llm/tool/code.py

@@ -57,20 +57,19 @@ async def analyze_repo(
     summarization_token_threshold: int | None = None,
 ) -> str:
     """
-    Performs a deep, goal-oriented analysis of a code repository or directory.
+    Performs a high-level, goal-oriented analysis of a code repository or directory.
 
-    This powerful tool recursively reads all relevant files in a directory,
-    extracts key information, and then summarizes that information in relation
-    to a specific goal. It uses intelligent sub-agents for extraction and
-    summarization, making it ideal for complex tasks that require a holistic
-    understanding of a codebase.
+    This tool recursively reads all relevant files in a directory, extracts
+    key information, and then summarizes that information in relation to a specific
+    goal. It uses intelligent sub-agents for extraction and summarization, making it
+    ideal for complex tasks that require a holistic understanding of a codebase.
 
     To ensure a focused and effective analysis, it is crucial to provide a
     clear and specific goal. Vague goals will result in a vague analysis and
-    may cause the tool to run for a long time.
+    may cause low quality result.
 
-    Make sure to skim the repository or directory first so that you can put
-    effective parameters.
+    Make sure to skim the repository or directory first (e.g., by list the file
+    names or read the README/docs file) so that you can put effective parameters.
 
     Use this tool for:
     - Understanding a large or unfamiliar codebase.
@@ -78,8 +77,6 @@ async def analyze_repo(
     - Performing a preliminary code review.
     - Creating documentation or diagrams (e.g., "Generate a Mermaid C4 diagram
       for this service").
-    - Answering broad questions like "How does the authentication in this
-      project work?".
 
     Args:
         path (str): The path to the directory or repository to analyze.
@@ -182,7 +179,7 @@ async def _extract_info(
         file_str = json.dumps(file_obj)
         if current_token_count + llm_rate_limitter.count_token(file_str) > token_limit:
             if content_buffer:
-                prompt = _create_extract_info_prompt(goal, content_buffer)
+                prompt = json.dumps(_create_extract_info_prompt(goal, content_buffer))
                 extracted_info = await extract(
                     ctx, llm_rate_limitter.clip_prompt(prompt, token_limit)
                 )
@@ -195,7 +192,7 @@ async def _extract_info(
 
     # Process any remaining content in the buffer
     if content_buffer:
-        prompt = _create_extract_info_prompt(goal, content_buffer)
+        prompt = json.dumps(_create_extract_info_prompt(goal, content_buffer))
         extracted_info = await extract(
             ctx, llm_rate_limitter.clip_prompt(prompt, token_limit)
         )
@@ -203,13 +200,11 @@ async def _extract_info(
     return extracted_infos
 
 
-def _create_extract_info_prompt(goal: str, content_buffer: list[dict]) -> str:
-    return json.dumps(
-        {
-            "main_assistant_goal": goal,
-            "files": content_buffer,
-        }
-    )
+def _create_extract_info_prompt(goal: str, content_buffer: list[dict]) -> dict:
+    return {
+        "main_assistant_goal": goal,
+        "files": content_buffer,
+    }
 
 
 async def _summarize_info(
@@ -229,7 +224,7 @@ async def _summarize_info(
         new_prompt = content_buffer + extracted_info
         if llm_rate_limitter.count_token(new_prompt) > token_limit:
             if content_buffer:
-                prompt = _create_summarize_info_prompt(goal, content_buffer)
+                prompt = json.dumps(_create_summarize_info_prompt(goal, content_buffer))
                 summarized_info = await summarize(
                     ctx, llm_rate_limitter.clip_prompt(prompt, token_limit)
                 )
@@ -240,7 +235,7 @@ async def _summarize_info(
 
     # Process any remaining content in the buffer
     if content_buffer:
-        prompt = _create_summarize_info_prompt(goal, content_buffer)
+        prompt = json.dumps(_create_summarize_info_prompt(goal, content_buffer))
         summarized_info = await summarize(
             ctx, llm_rate_limitter.clip_prompt(prompt, token_limit)
         )
@@ -248,10 +243,8 @@ async def _summarize_info(
     return summarized_infos
 
 
-def _create_summarize_info_prompt(goal: str, content_buffer: str) -> str:
-    return json.dumps(
-        {
-            "main_assistant_goal": goal,
-            "extracted_info": content_buffer,
-        }
-    )
+def _create_summarize_info_prompt(goal: str, content_buffer: str) -> dict:
+    return {
+        "main_assistant_goal": goal,
+        "extracted_info": content_buffer,
+    }

{zrb-1.15.27 → zrb-1.16.1}/src/zrb/builtin/llm/tool/file.py

@@ -98,12 +98,13 @@ def list_files(
     recursive: bool = True,
     include_hidden: bool = False,
     excluded_patterns: Optional[list[str]] = None,
-) -> str:
+) -> dict[str, list[str]]:
     """
     Lists the files and directories within a specified path.
 
     This is a fundamental tool for exploring the file system. Use it to
     discover the structure of a directory, find specific files, or get a
+
     general overview of the project layout before performing other operations.
 
     Args:
@@ -120,9 +121,9 @@ def list_files(
             standard list of common exclusion patterns.
 
     Returns:
-        str: A JSON string containing a list of file and directory paths
+        dict[str, list[str]]: A dictionary containing a list of file and directory paths
             relative to the input path.
-            Example: '{"files": ["src/main.py", "README.md"]}'
+            Example: {"files": ["src/main.py", "README.md"]}
     Raises:
         FileNotFoundError: If the specified path does not exist.
     """
@@ -173,14 +174,14 @@ def list_files(
         # Return paths relative to the original path requested
         try:
             rel_files = [os.path.relpath(f, abs_path) for f in all_files]
-            return json.dumps({"files": sorted(rel_files)})
+            return {"files": sorted(rel_files)}
         except (
             ValueError
         ) as e:  # Handle case where path is '.' and abs_path is CWD root
             if "path is on mount '" in str(e) and "' which is not on mount '" in str(e):
                 # If paths are on different mounts, just use absolute paths
                 rel_files = all_files
-                return json.dumps({"files": sorted(rel_files)})
+                return {"files": sorted(rel_files)}
             raise
     except (OSError, IOError) as e:
         raise OSError(f"Error listing files in {path}: {e}")
@@ -221,7 +222,7 @@ def read_from_file(
     path: str,
     start_line: Optional[int] = None,
     end_line: Optional[int] = None,
-) -> str:
+) -> dict[str, Any]:
     """
     Reads the content of a file, optionally from a specific start line to an
     end line.
@@ -244,7 +245,7 @@ def read_from_file(
             (inclusive). If omitted, reads to the end of the file.
 
     Returns:
-        str: A JSON string containing the file path, the requested content
+        dict[str, Any]: A dictionary containing the file path, the requested content
             with line numbers, the start and end lines, and the total number
             of lines in the file.
             Example:
@@ -282,15 +283,13 @@ def read_from_file(
         # Select the lines for the result
         selected_lines = lines[start_idx:end_idx]
         content_result = "\n".join(selected_lines)
-        return json.dumps(
-            {
-                "path": path,
-                "content": content_result,
-                "start_line": start_idx + 1,  # Convert back to 1-based for output
-                "end_line": end_idx,  # end_idx is already exclusive upper bound
-                "total_lines": total_lines,
-            }
-        )
+        return {
+            "path": path,
+            "content": content_result,
+            "start_line": start_idx + 1,  # Convert back to 1-based for output
+            "end_line": end_idx,  # end_idx is already exclusive upper bound
+            "total_lines": total_lines,
+        }
     except (OSError, IOError) as e:
         raise OSError(f"Error reading file {path}: {e}")
     except Exception as e:
@@ -300,7 +299,7 @@ def read_from_file(
 def write_to_file(
     path: str,
     content: str,
-) -> str:
+) -> dict[str, Any]:
     """
     Writes content to a file, completely overwriting it if it exists or
     creating it if it doesn't.
@@ -317,7 +316,7 @@ def write_to_file(
 
     Returns:
         dict[str, Any]: A dictionary indicating success or failure.
-             Example: '{"success": true, "path": "new_file.txt"}'
+             Example: {"success": true, "path": "new_file.txt"}
     """
     try:
         abs_path = os.path.abspath(os.path.expanduser(path))
@@ -338,7 +337,7 @@ def search_files(
     regex: str,
     file_pattern: Optional[str] = None,
     include_hidden: bool = True,
-) -> str:
+) -> dict[str, Any]:
     """
     Searches for a regular expression (regex) pattern within files in a
     specified directory.
@@ -452,7 +451,7 @@ def replace_in_file(
     path: str,
     old_string: str,
     new_string: str,
-) -> str:
+) -> dict[str, Any]:
     """
     Replaces the first occurrence of a string in a file.
 
@@ -496,7 +495,7 @@ def replace_in_file(
 
 async def analyze_file(
     ctx: AnyContext, path: str, query: str, token_limit: int | None = None
-) -> str:
+) -> dict[str, Any]:
     """
     Performs a deep, goal-oriented analysis of a single file using a sub-agent.
 
@@ -529,7 +528,7 @@ async def analyze_file(
             content to be passed to the analysis sub-agent.
 
     Returns:
-        str: A detailed, markdown-formatted analysis of the file, tailored to
+        dict[str, Any]: A detailed, markdown-formatted analysis of the file, tailored to
             the specified query.
     Raises:
         FileNotFoundError: If the specified file does not exist.
@@ -553,7 +552,7 @@ async def analyze_file(
     return await _analyze_file(ctx, clipped_payload)
 
 
-def read_many_files(paths: list[str]) -> str:
+def read_many_files(paths: list[str]) -> dict[str, str]:
     """
     Reads and returns the full content of multiple files at once.
 
@@ -586,7 +585,7 @@ def read_many_files(paths: list[str]) -> str:
     return results
 
 
-def write_many_files(files: list[FileToWrite]) -> str:
+def write_many_files(files: list[FileToWrite]) -> dict[str, Any]:
     """
     Writes content to multiple files in a single, atomic operation.
 
@@ -604,7 +603,7 @@ def write_many_files(files: list[FileToWrite]) -> str:
             containing a 'path' and the complete 'content'.
 
     Returns:
-        str: A dictionary summarizing the operation, listing successfully
+        dict[str, Any]: A dictionary summarizing the operation, listing successfully
             written files and any files that failed, along with corresponding
             error messages.
             Example: {"success": ["file1.py", "file2.txt"], "errors": {}}

{zrb-1.15.27 → zrb-1.16.1}/src/zrb/builtin/llm/tool/rag.py

@@ -5,6 +5,7 @@ import os
 import sys
 from collections.abc import Callable
 from textwrap import dedent
+from typing import Any
 
 import ulid
 
@@ -86,7 +87,7 @@ def create_rag_from_directory(
         Callable: An asynchronous function that serves as the RAG tool.
     """
 
-    async def retrieve(query: str) -> str:
+    async def retrieve(query: str) -> dict[str, Any]:
         # Docstring will be set dynamically below
         from chromadb import PersistentClient
         from chromadb.config import Settings
@@ -210,7 +211,8 @@ def create_rag_from_directory(
         Args:
             query (str): The user query to search for in documents.
         Returns:
-            str: dictionary with search results: {{"ids": [...], "documents": [...], ...}}
+            dict[str, Any]: dictionary with search results:
+                {{"ids": [...], "documents": [...], ...}}
         """
     ).strip()
     return retrieve

{zrb-1.15.27 → zrb-1.16.1}/src/zrb/builtin/llm/tool/sub_agent.py

@@ -27,7 +27,7 @@ def create_sub_agent_tool(
     toolsets: list["AbstractToolset[Agent]"] = [],
     yolo_mode: bool | list[str] | None = None,
     log_indent_level: int = 2,
-) -> Callable[[AnyContext, str], Coroutine[Any, Any, str]]:
+) -> Callable[[AnyContext, str], Coroutine[Any, Any, dict[str, Any]]]:
     """
     Creates a "tool that is another AI agent," capable of handling complex,
     multi-step sub-tasks.
@@ -61,7 +61,7 @@ def create_sub_agent_tool(
             its final result.
     """
 
-    async def run_sub_agent(ctx: AnyContext, query: str) -> str:
+    async def run_sub_agent(ctx: AnyContext, query: str) -> dict[str, Any]:
         """
         Runs the sub-agent with the given query.
         """
@@ -116,8 +116,8 @@ def create_sub_agent_tool(
 
         # Return the sub-agent's final message content
         if sub_agent_run and sub_agent_run.result:
-            # Return the final message content as a string
-            return json.dumps({"result": sub_agent_run.result.output})
+            # Return the final message content
+            return {"result": sub_agent_run.result.output}
         ctx.log_warning("Sub-agent run did not produce a result.")
         raise ValueError(f"{tool_name} not returning any result")
 
@@ -131,7 +131,7 @@ def create_sub_agent_tool(
             query (str): The query or task for the sub-agent.
 
         Returns:
-            str: The final response or result from the sub-agent.
+            dict[str, Any]: The final response or result from the sub-agent.
         """
     ).strip()
 

{zrb-1.15.27 → zrb-1.16.1}/src/zrb/builtin/llm/tool/web.py

@@ -1,11 +1,11 @@
-import json
 from collections.abc import Callable
+from typing import Any
 from urllib.parse import urljoin
 
 _DEFAULT_USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36"  # noqa
 
 
-async def open_web_page(url: str) -> str:
+async def open_web_page(url: str) -> dict[str, Any]:
     """
     Fetches, parses, and converts the content of a web page to Markdown.
 
@@ -20,15 +20,17 @@ async def open_web_page(url: str) -> str:
             "https://example.com/article").
 
     Returns:
-        str: A JSON string containing the page's content in Markdown format
+        dict[str, Any]: A dictionary containing the page's content in Markdown format
             and a list of all absolute links found on the page.
     """
     html_content, links = await _fetch_page_content(url)
     markdown_content = _convert_html_to_markdown(html_content)
-    return json.dumps({"content": markdown_content, "links_on_page": links})
+    return {"content": markdown_content, "links_on_page": links}
 
 
-def create_search_internet_tool(serp_api_key: str) -> Callable[[str, int], str]:
+def create_search_internet_tool(
+    serp_api_key: str,
+) -> Callable[[str, int], dict[str, Any]]:
     """
     Creates a tool that searches the internet using the SerpAPI Google Search
     API.
@@ -45,7 +47,7 @@ def create_search_internet_tool(serp_api_key: str) -> Callable[[str, int], str]:
             search results.
     """
 
-    def search_internet(query: str, num_results: int = 10) -> str:
+    def search_internet(query: str, num_results: int = 10) -> dict[str, Any]:
         """
         Performs an internet search using Google and returns a summary of the results.
 
@@ -57,7 +59,7 @@ def create_search_internet_tool(serp_api_key: str) -> Callable[[str, int], str]:
             num_results (int, optional): The desired number of search results. Defaults to 10.
 
         Returns:
-            str: A formatted string summarizing the search results,
+            dict[str, Any]: A formatted string summarizing the search results,
                 including titles, links, and snippets.
         """
         import requests
@@ -82,7 +84,7 @@ def create_search_internet_tool(serp_api_key: str) -> Callable[[str, int], str]:
     return search_internet
 
 
-def search_wikipedia(query: str) -> str:
+def search_wikipedia(query: str) -> dict[str, Any]:
     """
     Searches for articles on Wikipedia.
 
@@ -94,7 +96,7 @@ def search_wikipedia(query: str) -> str:
         query (str): The search term or question.
 
     Returns:
-        str: The raw JSON response from the Wikipedia API, containing a list of
+        dict[str, Any]: The raw JSON response from the Wikipedia API, containing a list of
             search results.
     """
     import requests
@@ -108,7 +110,7 @@ def search_wikipedia(query: str) -> str:
     return response.json()
 
 
-def search_arxiv(query: str, num_results: int = 10) -> str:
+def search_arxiv(query: str, num_results: int = 10) -> dict[str, Any]:
     """
     Searches for academic papers and preprints on ArXiv.
 
@@ -123,10 +125,11 @@ def search_arxiv(query: str, num_results: int = 10) -> str:
             Defaults to 10.
 
     Returns:
-        str: The raw XML response from the ArXiv API, containing a list of
+        dict[str, Any]: The raw XML response from the ArXiv API, containing a list of
             matching papers.
     """
     import requests
+    import xmltodict
 
     params = {"search_query": f"all:{query}", "start": 0, "max_results": num_results}
     response = requests.get(
@@ -134,7 +137,7 @@ def search_arxiv(query: str, num_results: int = 10) -> str:
         headers={"User-Agent": _DEFAULT_USER_AGENT},
         params=params,
     )
-    return response.content
+    return xmltodict.parse(response.content)
 
 
 async def _fetch_page_content(url: str) -> tuple[str, list[str]]: