zrb 1.15.20__py3-none-any.whl → 1.15.22__py3-none-any.whl

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/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/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/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/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/input/text_input.py

@@ -6,6 +6,7 @@ from collections.abc import Callable
 from zrb.config.config import CFG
 from zrb.context.any_shared_context import AnySharedContext
 from zrb.input.base_input import BaseInput
+from zrb.util.cli.text import edit_text
 from zrb.util.file import read_file
 
 
@@ -85,24 +86,10 @@ class TextInput(BaseInput):
         comment_prompt_message = (
             f"{self.comment_start}{prompt_message}{self.comment_end}"
         )
-        comment_prompt_message_eol = f"{comment_prompt_message}\n"
         default_value = self.get_default_str(shared_ctx)
-        with tempfile.NamedTemporaryFile(
-            delete=False, suffix=self._extension
-        ) as temp_file:
-            temp_file_name = temp_file.name
-            temp_file.write(comment_prompt_message_eol.encode())
-            # Pre-fill with default content
-            if default_value:
-                temp_file.write(default_value.encode())
-            temp_file.flush()
-            subprocess.call([self.editor_cmd, temp_file_name])
-            # Read the edited content
-            edited_content = read_file(temp_file_name)
-        parts = [
-            text.strip() for text in edited_content.split(comment_prompt_message, 1)
-        ]
-        edited_content = "\n".join(parts).lstrip()
-        os.remove(temp_file_name)
-        print(f"{prompt_message}: {edited_content}")
-        return edited_content
+        return edit_text(
+            prompt_message=comment_prompt_message,
+            value=default_value,
+            editor=self.editor_cmd,
+            extension=self._extension,
+        )

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

@@ -5,6 +5,7 @@ import typing
 from collections.abc import Callable
 from typing import TYPE_CHECKING, Any
 
+from zrb.config.config import CFG
 from zrb.context.any_context import AnyContext
 from zrb.task.llm.error import ToolExecutionError
 from zrb.util.callable import get_callable_name
@@ -15,6 +16,7 @@ from zrb.util.cli.style import (
     stylize_green,
     stylize_yellow,
 )
+from zrb.util.cli.text import edit_text
 from zrb.util.run import run_async
 from zrb.util.string.conversion import to_boolean
 
@@ -39,7 +41,6 @@ def wrap_tool(func: Callable, ctx: AnyContext, yolo_mode: bool | list[str]) -> "
 def wrap_func(func: Callable, ctx: AnyContext, yolo_mode: bool | list[str]) -> Callable:
     original_sig = inspect.signature(func)
     needs_any_context_for_injection = _has_context_parameter(original_sig, AnyContext)
-    takes_no_args = len(original_sig.parameters) == 0
     # Pass individual flags to the wrapper creator
     wrapper = _create_wrapper(
         func=func,
@@ -48,7 +49,7 @@ def wrap_func(func: Callable, ctx: AnyContext, yolo_mode: bool | list[str]) -> C
         needs_any_context_for_injection=needs_any_context_for_injection,
         yolo_mode=yolo_mode,
     )
-    _adjust_signature(wrapper, original_sig, takes_no_args)
+    _adjust_signature(wrapper, original_sig)
     return wrapper
 
 
@@ -108,17 +109,14 @@ 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 (
                     isinstance(yolo_mode, list) and func.__name__ not in yolo_mode
                 ) or not yolo_mode:
-                    approval, reason = await _ask_for_approval(ctx, func, args, kwargs)
+                    approval, reason = await _handle_user_response(
+                        ctx, func, args, kwargs
+                    )
                     if not approval:
                         raise ToolExecutionCancelled(f"User disapproving: {reason}")
             return await run_async(func(*args, **kwargs))
@@ -136,54 +134,97 @@ def _create_wrapper(
     return wrapper
 
 
-async def _ask_for_approval(
-    ctx: AnyContext, func: Callable, args: list[Any], kwargs: dict[str, Any]
+async def _handle_user_response(
+    ctx: AnyContext,
+    func: Callable,
+    args: list[Any] | tuple[Any],
+    kwargs: dict[str, Any],
 ) -> tuple[bool, str]:
-    func_call_str = _get_func_call_str(func, args, kwargs)
-    complete_confirmation_message = "\n".join(
-        [
-            f"\n🎰 >> {func_call_str}",
-            _get_detail_func_param(args, kwargs),
-            f"🎰  >> {_get_run_func_confirmation(func)}",
-        ]
-    )
     while True:
+        func_call_str = _get_func_call_str(func, args, kwargs)
+        complete_confirmation_message = "\n".join(
+            [
+                f"\n🎰 >> {func_call_str}",
+                _get_detail_func_param(args, kwargs),
+                f"🎰  >> {_get_run_func_confirmation(func)}",
+            ]
+        )
         ctx.print(complete_confirmation_message, plain=True)
-        user_input = await _read_line()
+        user_response = await _read_line()
         ctx.print("", plain=True)
-        user_responses = [val.strip() for val in user_input.split(",", maxsplit=1)]
-        while len(user_responses) < 2:
-            user_responses.append("")
-        approval_str, reason = user_responses
-        try:
-            approved = True if approval_str.strip() == "" else to_boolean(approval_str)
-            if not approved and reason == "":
-                ctx.print(
-                    stylize_error(
-                        f"You must specify rejection reason (i.e., No, <why>) for {func_call_str}"  # noqa
-                    ),
-                    plain=True,
-                )
-                continue
-            return approved, reason
-        except Exception:
+        new_kwargs, is_edited = _get_edited_kwargs(ctx, user_response, kwargs)
+        if is_edited:
+            kwargs = new_kwargs
+            continue
+        approval_and_reason = _get_user_approval_and_reason(
+            ctx, user_response, func_call_str
+        )
+        if approval_and_reason is None:
+            continue
+        return approval_and_reason
+
+
+def _get_edited_kwargs(
+    cx: AnyContext, user_response: str, kwargs: dict[str, Any]
+) -> tuple[dict[str, Any], bool]:
+    user_edit_responses = [val for val in user_response.split(" ", maxsplit=2)]
+    if len(user_edit_responses) >= 1 and user_edit_responses[0].lower() != "edit":
+        return kwargs, False
+    while len(user_edit_responses) < 3:
+        user_edit_responses.append("")
+    key, val = 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
+    return kwargs, True
+
+
+def _get_user_approval_and_reason(
+    ctx: AnyContext, user_response: str, func_call_str: str
+) -> tuple[bool, str] | None:
+    user_approval_responses = [
+        val.strip() for val in user_response.split(",", maxsplit=1)
+    ]
+    while len(user_approval_responses) < 2:
+        user_approval_responses.append("")
+    approval_str, reason = user_approval_responses
+    try:
+        approved = True if approval_str.strip() == "" else to_boolean(approval_str)
+        if not approved and reason == "":
             ctx.print(
                 stylize_error(
-                    f"Invalid approval value for {func_call_str}: {approval_str}"
+                    f"You must specify rejection reason (i.e., No, <why>) for {func_call_str}"  # noqa
                 ),
                 plain=True,
             )
-            continue
+            return None
+        return approved, reason
+    except Exception:
+        ctx.print(
+            stylize_error(
+                f"Invalid approval value for {func_call_str}: {approval_str}"
+            ),
+            plain=True,
+        )
+        return None
 
 
 def _get_run_func_confirmation(func: Callable) -> str:
     func_name = get_callable_name(func)
     return render_markdown(
-        f"Allow to run `{func_name}`? (✅ `Yes` | ⛔ `No, <reason>`)"
+        f"Allow to run `{func_name}`? (✅ `Yes` | ⛔ `No, <reason>` | ✏️ `Edit <param> <value>`)"
     ).strip()
 
 
-def _get_detail_func_param(args: list[Any], kwargs: dict[str, Any]) -> str:
+def _get_detail_func_param(args: list[Any] | tuple[Any], kwargs: dict[str, Any]) -> str:
     markdown = "\n".join(
         [_get_func_param_item(key, val) for key, val in kwargs.items()]
     )
@@ -203,7 +244,9 @@ def _get_func_param_item(key: str, val: Any) -> str:
     return "\n".join(lines)
 
 
-def _get_func_call_str(func: Callable, args: list[Any], kwargs: dict[str, Any]) -> str:
+def _get_func_call_str(
+    func: Callable, args: list[Any] | tuple[Any], kwargs: dict[str, Any]
+) -> str:
     func_name = get_callable_name(func)
     normalized_args = [stylize_green(_truncate_arg(arg)) for arg in args]
     normalized_kwargs = []
@@ -230,9 +273,7 @@ async def _read_line():
     return await reader.prompt_async()
 
 
-def _adjust_signature(
-    wrapper: Callable, original_sig: inspect.Signature, takes_no_args: bool
-):
+def _adjust_signature(wrapper: Callable, original_sig: inspect.Signature):
     """Adjusts the wrapper function's signature for schema generation."""
     # The wrapper's signature should represent the arguments the *LLM* needs to provide.
     # The LLM does not provide RunContext (pydantic-ai injects it) or AnyContext
@@ -247,22 +288,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)

zrb/util/cli/text.py

@@ -0,0 +1,28 @@
+import os
+import subprocess
+import tempfile
+
+from zrb.util.file import read_file
+
+
+def edit_text(
+    prompt_message: str,
+    value: str,
+    editor: str = "vi",
+    extension: str = ".txt",
+) -> str:
+    prompt_message_eol = f"{prompt_message}\n"
+    with tempfile.NamedTemporaryFile(delete=False, suffix=extension) as temp_file:
+        temp_file_name = temp_file.name
+        temp_file.write(prompt_message_eol.encode())
+        # Pre-fill with default content
+        if value:
+            temp_file.write(value.encode())
+        temp_file.flush()
+        subprocess.call([editor, temp_file_name])
+        # Read the edited content
+        edited_content = read_file(temp_file_name)
+    parts = [text.strip() for text in edited_content.split(prompt_message, 1)]
+    edited_content = "\n".join(parts).lstrip()
+    os.remove(temp_file_name)
+    return edited_content

{zrb-1.15.20.dist-info → zrb-1.15.22.dist-info}/METADATA

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

{zrb-1.15.20.dist-info → zrb-1.15.22.dist-info}/RECORD

@@ -15,13 +15,13 @@ zrb/builtin/llm/input.py,sha256=Nw-26uTWp2QhUgKJcP_IMHmtk-b542CCSQ_vCOjhvhM,877
 zrb/builtin/llm/llm_ask.py,sha256=XtnSZoBvwHqnBUi8R0rt8VDfnBmWgwFlDuuo1WA1W_w,6209
 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=vMEiZhhTZ3o2jRBxWcJ62b0M85wd_w4W0X4Hx23NXto,2380
-zrb/builtin/llm/tool/cli.py,sha256=8rugrKaNPEatHjr7nN4OIRLRT2TcF-oylEZGbLI9Brs,1254
+zrb/builtin/llm/tool/api.py,sha256=T8NGhBe59sQiu8LfdPOIBmsTNMXWFEKaPPSY9bolsQ8,2401
+zrb/builtin/llm/tool/cli.py,sha256=GCGB8GMFjvVcH0Ac-bD44VG6Bj3mQSuIcNHAwJbx4Ts,1210
 zrb/builtin/llm/tool/code.py,sha256=fr9FbmtfwizQTyTztvuvwAb9MD_auRZhPZfoJVBlKT4,8777
-zrb/builtin/llm/tool/file.py,sha256=eXFGGFxxpdpWGVw0svyQNQc03I5M7wotSsA_HjkXw7c,23670
-zrb/builtin/llm/tool/rag.py,sha256=Ab8_ZljnG_zfkwxPezImvorshuz3Fi4CmSzNOtU1a-g,9770
+zrb/builtin/llm/tool/file.py,sha256=FPPvKUZY-w1XEa7EN6D6X4VQoQNQ9ggGWLj-xJt-Ysc,23524
+zrb/builtin/llm/tool/rag.py,sha256=n4ATdr-2gCzPb7LnaBSD_TuAG4TUXKhE9ElKrSDHvFc,9763
 zrb/builtin/llm/tool/sub_agent.py,sha256=qJTJ2GSH-2Cma2QyHEJm8l_VuDHMHwhAWGls217YA6A,5078
-zrb/builtin/llm/tool/web.py,sha256=Hc9ikgBWZMgLB2O5lX-P9k8jvNSZeyUufqHXa_n_v4I,7653
+zrb/builtin/llm/tool/web.py,sha256=2FgmiM2LIQfvMMoswidj9hVMav_t8QPG1LiyedL66dw,7349
 zrb/builtin/md5.py,sha256=690RV2LbW7wQeTFxY-lmmqTSVEEZv3XZbjEUW1Q3XpE,1480
 zrb/builtin/project/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/builtin/project/add/fastapp/fastapp_input.py,sha256=MKlWR_LxWhM_DcULCtLfL_IjTxpDnDBkn9KIqNmajFs,310
@@ -257,7 +257,7 @@ zrb/input/int_input.py,sha256=UhxCFYlZdJcgUSGGEkz301zOgRVpK0KDG_IxxWpQfMU,1457
 zrb/input/option_input.py,sha256=TQB82ko5odgzkULEizBZi0e9TIHEbIgvdP0AR3RhA74,2135
 zrb/input/password_input.py,sha256=szBojWxSP9QJecgsgA87OIYwQrY2AQ3USIKdDZY6snU,1465
 zrb/input/str_input.py,sha256=NevZHX9rf1g8eMatPyy-kUX3DglrVAQpzvVpKAzf7bA,81
-zrb/input/text_input.py,sha256=UCkC497V6L12cPjupOgIZ5XW2eBbBDydQi5IIYtknek,3702
+zrb/input/text_input.py,sha256=NRM9FSS2pUFs7_R0KsBlu_CD8WLxbfbwxRkpaRoeCSY,3049
 zrb/runner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/runner/cli.py,sha256=E5GGNJjCOBpFbhgnMM_iE1TVYhxMNDJKA6WxCRETTmA,6951
 zrb/runner/common_util.py,sha256=yIJm9ivM7hvJ4Kb4Nt5RRE7oqAlt9EN89w6JDGyLkFE,1570
@@ -356,9 +356,9 @@ zrb/task/llm/default_workflow/researching.md,sha256=KD-aYHFHir6Ti-4FsBBtGwiI0seS
 zrb/task/llm/error.py,sha256=QR-nIohS6pBpC_16cWR-fw7Mevo1sNYAiXMBsh_CJDE,4157
 zrb/task/llm/history_summarization.py,sha256=UIT8bpdT3hy1xn559waDLFWZlNtIqdIpIvRGcZEpHm0,8057
 zrb/task/llm/history_summarization_tool.py,sha256=Wazi4WMr3k1WJ1v7QgjAPbuY1JdBpHUsTWGt3DSTsLc,1706
-zrb/task/llm/print_node.py,sha256=si619OvCUZJYTUSUpoOqVAgLSu1BGw-dlBq02MSD7FE,8096
+zrb/task/llm/print_node.py,sha256=TG8i3MrAkIj3cLkU9_fSX-u49jlTdU8t9FpHGI_VtoM,8077
 zrb/task/llm/prompt.py,sha256=FGXWYHecWtrNNkPnjg-uhnkqp7fYt8V91-AjFM_5fpA,11550
-zrb/task/llm/tool_wrapper.py,sha256=AsRzVAZtuAMsutLHGetpsPPncu6pcd4LrwxYRZxsp7c,9933
+zrb/task/llm/tool_wrapper.py,sha256=v3y4FO14xStpq9K0lA3GIVv6-3dbq85I7xZqdtG-j9U,10243
 zrb/task/llm/typing.py,sha256=c8VAuPBw_4A3DxfYdydkgedaP-LU61W9_wj3m3CAX1E,58
 zrb/task/llm_task.py,sha256=OxJ9QpqjEyeOI1_zqzNZHtQlRHi0ANOvL9FYaWLzO3Y,14913
 zrb/task/make_task.py,sha256=PD3b_aYazthS8LHeJsLAhwKDEgdurQZpymJDKeN60u0,2265
@@ -376,6 +376,7 @@ zrb/util/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/util/cli/markdown.py,sha256=Uhuw8XR-jAG9AG3oNK8VHJpYOdU40Q_8yVN74uu0RJ8,384
 zrb/util/cli/style.py,sha256=D_548KG1gXEirQGdkAVTc81vBdCeInXtnG1gV1yabBA,6655
 zrb/util/cli/subcommand.py,sha256=umTZIlrL-9g-qc_eRRgdaQgK-whvXK1roFfvnbuY7NQ,1753
+zrb/util/cli/text.py,sha256=6r1NqvtjKXt-XVVURyBqYE9tZA2Bnr6u8h9Lopr-Gag,870
 zrb/util/cmd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/util/cmd/command.py,sha256=WpEMWVL9hBsxptvDHmRR93_cJ2zP05BJ2h9-tP93M1Y,7473
 zrb/util/cmd/remote.py,sha256=NGQq2_IrUMDoZz3qmcgtnNYVGjMHaBKQpZxImf0yfXA,1296
@@ -409,7 +410,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.15.20.dist-info/METADATA,sha256=xEpmCD_LUxH-rR-OqQcBtkOQHbvYhkEsw2fu12gfUtI,9892
-zrb-1.15.20.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-zrb-1.15.20.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
-zrb-1.15.20.dist-info/RECORD,,
+zrb-1.15.22.dist-info/METADATA,sha256=OHahYYqF0_2Z_Ht40qggq5Z538ITZNVtaC-UagYam6o,9892
+zrb-1.15.22.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+zrb-1.15.22.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
+zrb-1.15.22.dist-info/RECORD,,