zrb 1.15.19__tar.gz → 1.15.21__tar.gz

{zrb-1.15.19 → zrb-1.15.21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: zrb
-Version: 1.15.19
+Version: 1.15.21
 Summary: Your Automation Powerhouse
 License: AGPL-3.0-or-later
 Keywords: Automation,Task Runner,Code Generator,Monorepo,Low Code

{zrb-1.15.19 → zrb-1.15.21}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "zrb"
-version = "1.15.19"
+version = "1.15.21"
 description = "Your Automation Powerhouse"
 authors = ["Go Frendi Gunawan <gofrendiasgard@gmail.com>"]
 license = "AGPL-3.0-or-later"

{zrb-1.15.19 → zrb-1.15.21}/src/zrb/builtin/llm/llm_ask.py

@@ -32,6 +32,26 @@ from zrb.task.base_trigger import BaseTrigger
 from zrb.task.llm_task import LLMTask
 from zrb.util.string.conversion import to_boolean
 
+
+def _get_default_yolo_mode(ctx: AnyContext) -> str:
+    default_value = llm_config.default_yolo_mode
+    if isinstance(default_value, list):
+        return ",".join(default_value)
+    return f"{default_value}"
+
+
+def _render_yolo_mode_input(ctx: AnyContext) -> list[str] | bool | None:
+    if ctx.input.yolo.strip() == "":
+        return None
+    elements = ctx.input.yolo.split(",")
+    if len(elements) == 0:
+        try:
+            return to_boolean(elements[0])
+        except Exception:
+            pass
+    return elements
+
+
 _llm_ask_inputs = [
     StrInput(
         "model",
@@ -88,7 +108,7 @@ _llm_ask_inputs = [
         "yolo",
         description="YOLO mode (LLM Agent will start in YOLO Mode)",
         prompt="YOLO mode (LLM Agent will start in YOLO Mode)",
-        default=lambda ctx: llm_config.default_yolo_mode,
+        default=_get_default_yolo_mode,
         allow_positional_parsing=False,
         always_prompt=False,
     ),
@@ -103,19 +123,6 @@ _llm_ask_inputs = [
     ),
 ]
 
-
-def _render_yolo_mode_input(ctx: AnyContext) -> list[str] | bool | None:
-    if ctx.input.yolo.strip() == "":
-        return None
-    elements = ctx.input.yolo.split(",")
-    if len(elements) == 0:
-        try:
-            return to_boolean(elements[0])
-        except Exception:
-            pass
-    return elements
-
-
 llm_ask: LLMTask = llm_group.add_task(
     LLMTask(
         name="llm-ask",

{zrb-1.15.19 → zrb-1.15.21}/src/zrb/builtin/llm/tool/api.py

@@ -1,8 +1,7 @@
-import json
 from typing import Literal
 
 
-def get_current_location() -> str:
+def get_current_location() -> dict[str, float]:
     """
     Fetches the user's current geographical location based on their IP address.
 
@@ -11,8 +10,9 @@ def get_current_location() -> str:
     answered.
 
     Returns:
-        str: A JSON string containing the 'lat' and 'lon' of the current
-            location. Example: '{"lat": 48.8584, "lon": 2.2945}'
+        dict[str, float]: A dictionary containing the 'lat' and 'lon' of the current
+            location.
+            Example: {"lat": 48.8584, "lon": 2.2945}
     Raises:
         requests.RequestException: If the API request to the location service
             fails.
@@ -22,7 +22,7 @@ def get_current_location() -> str:
     try:
         response = requests.get("http://ip-api.com/json?fields=lat,lon", timeout=5)
         response.raise_for_status()
-        return json.dumps(response.json())
+        return dict(response.json())
     except requests.RequestException as e:
         raise requests.RequestException(f"Failed to get location: {e}") from None
 
@@ -46,7 +46,7 @@ def get_current_weather(
             for the temperature reading.
 
     Returns:
-        str: A JSON string containing detailed weather data, including
+        dict[str, Any]: A dictionary containing detailed weather data, including
             temperature, wind speed, and weather code.
     Raises:
         requests.RequestException: If the API request to the weather service
@@ -66,6 +66,6 @@ def get_current_weather(
             timeout=5,
         )
         response.raise_for_status()
-        return json.dumps(response.json())
+        return dict(response.json())
     except requests.RequestException as e:
         raise requests.RequestException(f"Failed to get weather data: {e}") from None

{zrb-1.15.19 → zrb-1.15.21}/src/zrb/builtin/llm/tool/cli.py

@@ -1,4 +1,3 @@
-import json
 import subprocess
 
 
@@ -19,7 +18,7 @@ def run_shell_command(command: str) -> str:
         command (str): The exact shell command to execute.
 
     Returns:
-        str: A JSON string containing return code, standard output (stdout),
+        dict[str, Any]: A dictionary containing return code, standard output (stdout),
             and standard error (stderr) from the command.
             Example: {"return_code": 0, "stdout": "ok", "stderr": ""}
     """
@@ -29,10 +28,8 @@ def run_shell_command(command: str) -> str:
         capture_output=True,
         text=True,
     )
-    return json.dumps(
-        {
-            "return_code": result.returncode,
-            "stdout": result.stdout,
-            "stderr": result.stderr,
-        }
-    )
+    return {
+        "return_code": result.returncode,
+        "stdout": result.stdout,
+        "stderr": result.stderr,
+    }

{zrb-1.15.19 → zrb-1.15.21}/src/zrb/builtin/llm/tool/file.py

@@ -223,35 +223,42 @@ def read_from_file(
     end_line: Optional[int] = None,
 ) -> str:
     """
-        Reads the content of a file, optionally from a specific start line to an
-        end line.
-
-        This tool is essential for inspecting file contents. It can read both text
-        and PDF files. The returned content is prefixed with line numbers, which is
-        crucial for providing context when you need to modify the file later with
-        the `apply_diff` tool.
-
-        Use this tool to:
-        - Examine the source code of a file.
-        - Read configuration files.
-        - Check the contents of a document.
-
-        Args:
-            path (str): The path to the file to read.
-            start_line (int, optional): The 1-based line number to start reading
-                from. If omitted, reading starts from the beginning of the file.
-            end_line (int, optional): The 1-based line number to stop reading at
-                (inclusive). If omitted, reads to the end of the file.
-
-        Returns:
-            str: A JSON object 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: '{"path": "src/main.py", "content": "1| import os\n2|
-    3| print(\"Hello, World!\")", "start_line": 1, "end_line": 3,
-                "total_lines": 3}'
-        Raises:
-            FileNotFoundError: If the specified file does not exist.
+    Reads the content of a file, optionally from a specific start line to an
+    end line.
+
+    This tool is essential for inspecting file contents. It can read both text
+    and PDF files. The returned content is prefixed with line numbers, which is
+    crucial for providing context when you need to modify the file later with
+    the `apply_diff` tool.
+
+    Use this tool to:
+    - Examine the source code of a file.
+    - Read configuration files.
+    - Check the contents of a document.
+
+    Args:
+        path (str): The path to the file to read.
+        start_line (int, optional): The 1-based line number to start reading
+            from. If omitted, reading starts from the beginning of the file.
+        end_line (int, optional): The 1-based line number to stop reading at
+            (inclusive). If omitted, reads to the end of the file.
+
+    Returns:
+        str: A JSON string 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:
+            ```
+            {
+                "path": "src/main.py",
+                "content": "1| import os\n2|3| print(\"Hello, World!\")",
+                "start_line": 1,
+                "end_line": 3,
+                "total_lines": 3
+            }
+            ```
+    Raises:
+        FileNotFoundError: If the specified file does not exist.
     """
 
     abs_path = os.path.abspath(os.path.expanduser(path))
@@ -309,7 +316,7 @@ def write_to_file(
             Do not use partial content or omit any lines.
 
     Returns:
-        str: A JSON object indicating success or failure.
+        dict[str, Any]: A dictionary indicating success or failure.
              Example: '{"success": true, "path": "new_file.txt"}'
     """
     try:
@@ -319,8 +326,7 @@ def write_to_file(
         if directory and not os.path.exists(directory):
             os.makedirs(directory, exist_ok=True)
         write_file(abs_path, content)
-        result_data = {"success": True, "path": path}
-        return json.dumps(result_data)
+        return {"success": True, "path": path}
     except (OSError, IOError) as e:
         raise OSError(f"Error writing file {path}: {e}")
     except Exception as e:
@@ -352,7 +358,7 @@ def search_files(
             hidden files and directories. Defaults to True.
 
     Returns:
-        str: A JSON object containing a summary of the search and a list of
+        dict[str, Any]: A dictionary containing a summary of the search and a list of
             results. Each result includes the file path and a list of matches,
             with each match showing the line number, line content, and a few
             lines of context from before and after the match.
@@ -404,9 +410,7 @@ def search_files(
                 f"Found {match_count} matches in {file_match_count} files "
                 f"(searched {searched_file_count} files)."
             )
-        return json.dumps(
-            search_results
-        )  # No need for pretty printing for LLM consumption
+        return search_results
     except (OSError, IOError) as e:
         raise OSError(f"Error searching files in {path}: {e}")
     except Exception as e:
@@ -467,7 +471,7 @@ def replace_in_file(
         new_string (str): The new string that will replace the `old_string`.
 
     Returns:
-        str: A JSON object indicating the success or failure of the operation.
+        dict[str, Any]: A dictionary indicating the success or failure of the operation.
     Raises:
         FileNotFoundError: If the specified file does not exist.
         ValueError: If the `old_string` is not found in the file.
@@ -481,7 +485,7 @@ def replace_in_file(
             raise ValueError(f"old_string not found in file: {path}")
         new_content = content.replace(old_string, new_string, 1)
         write_file(abs_path, new_content)
-        return json.dumps({"success": True, "path": path})
+        return {"success": True, "path": path}
     except ValueError as e:
         raise e
     except (OSError, IOError) as e:
@@ -564,11 +568,10 @@ def read_many_files(paths: list[str]) -> str:
             if you are unsure about the exact file locations.
 
     Returns:
-        str: A JSON object where keys are the file paths and values are their
-            corresponding contents, prefixed with line numbers. If a file
-            cannot be read, its value will be an error message.
-            Example: '{"results": {"src/api.py": "1| import ...",
-            "config.yaml": "1| key: value"}}'
+        dict[str, str]:  a dictionary where keys are the file paths and values
+            are their corresponding contents, prefixed with line numbers.
+            If a file cannot be read, its value will be an error message.
+            Example: {"src/api.py": "1| import ...", "config.yaml": "1| key: value"}
     """
     results = {}
     for path in paths:
@@ -580,7 +583,7 @@ def read_many_files(paths: list[str]) -> str:
             results[path] = content
         except Exception as e:
             results[path] = f"Error reading file: {e}"
-    return json.dumps({"results": results})
+    return results
 
 
 def write_many_files(files: list[FileToWrite]) -> str:
@@ -601,10 +604,10 @@ def write_many_files(files: list[FileToWrite]) -> str:
             containing a 'path' and the complete 'content'.
 
     Returns:
-        str: A JSON object summarizing the operation, listing successfully
+        str: 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": {}}'
+            Example: {"success": ["file1.py", "file2.txt"], "errors": {}}
     """
     success = []
     errors = {}
@@ -623,4 +626,4 @@ def write_many_files(files: list[FileToWrite]) -> str:
             success.append(path)
         except Exception as e:
             errors[path] = f"Error writing file: {e}"
-    return json.dumps({"success": success, "errors": errors})
+    return {"success": success, "errors": errors}

{zrb-1.15.19 → zrb-1.15.21}/src/zrb/builtin/llm/tool/rag.py

@@ -201,7 +201,7 @@ def create_rag_from_directory(
             query_embeddings=query_vector,
             n_results=max_result_count_val,
         )
-        return json.dumps(results)
+        return dict(results)
 
     retrieve.__name__ = tool_name
     retrieve.__doc__ = dedent(
@@ -210,7 +210,7 @@ def create_rag_from_directory(
         Args:
             query (str): The user query to search for in documents.
         Returns:
-            str: JSON string with search results: {{"ids": [...], "documents": [...], ...}}
+            str: dictionary with search results: {{"ids": [...], "documents": [...], ...}}
         """
     ).strip()
     return retrieve

{zrb-1.15.19 → zrb-1.15.21}/src/zrb/builtin/llm/tool/web.py

@@ -2,6 +2,8 @@ import json
 from collections.abc import Callable
 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:
     """
@@ -18,7 +20,7 @@ async def open_web_page(url: str) -> str:
             "https://example.com/article").
 
     Returns:
-        str: A JSON object containing the page's content in Markdown format
+        str: A JSON string 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)
@@ -47,22 +49,22 @@ def create_search_internet_tool(serp_api_key: str) -> Callable[[str, int], str]:
         """
         Performs an internet search using Google and returns a summary of the results.
 
-        Use this tool to find information on the web, answer general knowledge questions, or research topics.
+        Use this tool to find information on the web, answer general knowledge questions,
+        or research topics.
 
         Args:
             query (str): The search query.
             num_results (int, optional): The desired number of search results. Defaults to 10.
 
         Returns:
-            str: A formatted string summarizing the search results, including titles, links, and snippets.
+            str: A formatted string summarizing the search results,
+                including titles, links, and snippets.
         """
         import requests
 
         response = requests.get(
             "https://serpapi.com/search",
-            headers={
-                "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"
-            },
+            headers={"User-Agent": _DEFAULT_USER_AGENT},
             params={
                 "q": query,
                 "num": num_results,
@@ -73,7 +75,7 @@ def create_search_internet_tool(serp_api_key: str) -> Callable[[str, int], str]:
         )
         if response.status_code != 200:
             raise Exception(
-                f"Error: Unable to retrieve search results (status code: {response.status_code})"
+                f"Error: Unable to retrieve search results (status code: {response.status_code})"  # noqa
             )
         return response.json()
 
@@ -100,9 +102,7 @@ def search_wikipedia(query: str) -> str:
     params = {"action": "query", "list": "search", "srsearch": query, "format": "json"}
     response = requests.get(
         "https://en.wikipedia.org/w/api.php",
-        headers={
-            "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"
-        },
+        headers={"User-Agent": _DEFAULT_USER_AGENT},
         params=params,
     )
     return response.json()
@@ -131,9 +131,7 @@ def search_arxiv(query: str, num_results: int = 10) -> str:
     params = {"search_query": f"all:{query}", "start": 0, "max_results": num_results}
     response = requests.get(
         "http://export.arxiv.org/api/query",
-        headers={
-            "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"
-        },
+        headers={"User-Agent": _DEFAULT_USER_AGENT},
         params=params,
     )
     return response.content
@@ -141,14 +139,13 @@ def search_arxiv(query: str, num_results: int = 10) -> str:
 
 async def _fetch_page_content(url: str) -> tuple[str, list[str]]:
     """Fetches the HTML content and all absolute links from a URL."""
-    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"
     try:
         from playwright.async_api import async_playwright
 
         async with async_playwright() as p:
             browser = await p.chromium.launch(headless=True)
             page = await browser.new_page()
-            await page.set_extra_http_headers({"User-Agent": user_agent})
+            await page.set_extra_http_headers({"User-Agent": _DEFAULT_USER_AGENT})
             try:
                 await page.goto(url, wait_until="networkidle", timeout=30000)
                 await page.wait_for_load_state("domcontentloaded")
@@ -176,7 +173,7 @@ async def _fetch_page_content(url: str) -> tuple[str, list[str]]:
         import requests
         from bs4 import BeautifulSoup
 
-        response = requests.get(url, headers={"User-Agent": user_agent})
+        response = requests.get(url, headers={"User-Agent": _DEFAULT_USER_AGENT})
         if response.status_code != 200:
             raise Exception(
                 f"Unable to retrieve page content. Status code: {response.status_code}"

{zrb-1.15.19 → zrb-1.15.21}/src/zrb/task/llm/print_node.py

@@ -191,7 +191,7 @@ def _get_event_part_args(event: Any) -> Any:
 
 
 def _truncate_kwargs(kwargs: dict[str, Any]) -> dict[str, Any]:
-    return {key: _truncate_arg(val) for key, val in kwargs.items() if key != "_dummy"}
+    return {key: _truncate_arg(val) for key, val in kwargs.items()}
 
 
 def _truncate_arg(arg: str, length: int = 19) -> str:

{zrb-1.15.19 → zrb-1.15.21}/src/zrb/task/llm/tool_wrapper.py

@@ -108,11 +108,6 @@ def _create_wrapper(
             # Inject the captured ctx into kwargs. This will overwrite if the LLM
             # somehow provided it.
             kwargs[any_context_param_name] = ctx
-        # If the dummy argument was added for schema generation and is present in kwargs,
-        # remove it before calling the original function, unless the original function
-        # actually expects a parameter named '_dummy'.
-        if "_dummy" in kwargs and "_dummy" not in original_sig.parameters:
-            del kwargs["_dummy"]
         try:
             if not ctx.is_web_mode and ctx.is_tty:
                 if (
@@ -247,22 +242,4 @@ def _adjust_signature(
         if not _is_annotated_with_context(param.annotation, RunContext)
         and not _is_annotated_with_context(param.annotation, AnyContext)
     ]
-
-    # If after removing context parameters, there are no parameters left,
-    # and the original function took no args, keep the dummy.
-    # If after removing context parameters, there are no parameters left,
-    # but the original function *did* take args (only context), then the schema
-    # should have no parameters.
-    if not params_for_schema and takes_no_args:
-        # Keep the dummy if the original function truly had no parameters
-        new_sig = inspect.Signature(
-            parameters=[
-                inspect.Parameter(
-                    "_dummy", inspect.Parameter.POSITIONAL_OR_KEYWORD, default=None
-                )
-            ]
-        )
-    else:
-        new_sig = inspect.Signature(parameters=params_for_schema)
-
-    wrapper.__signature__ = new_sig
+    wrapper.__signature__ = inspect.Signature(parameters=params_for_schema)