zrb 1.15.21__tar.gz → 1.15.22__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: zrb
-Version: 1.15.21
+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.21 → zrb-1.15.22}/pyproject.toml

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

{zrb-1.15.21 → zrb-1.15.22}/src/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-1.15.21 → zrb-1.15.22}/src/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
 
 
@@ -113,7 +114,9 @@ def _create_wrapper(
                 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))
@@ -131,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()]
     )
@@ -198,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 = []
@@ -225,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

zrb-1.15.22/src/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