zrb 1.15.2__py3-none-any.whl → 1.15.3__py3-none-any.whl

zrb/builtin/llm/chat_session.py

@@ -34,7 +34,7 @@ async def read_user_prompt(ctx: AnyContext) -> str:
         # Get user input based on mode
         if not multiline_mode:
             ctx.print("💬 >>", plain=True)
-        user_input = await _read_next_line(is_tty, reader, ctx)
+        user_input = await _read_next_line(reader, ctx)
         if not multiline_mode:
             ctx.print("", plain=True)
         # Handle user input
@@ -111,6 +111,7 @@ def _show_info(ctx: AnyContext):
         ),
         plain=True,
     )
+    ctx.print("", plain=True)
 
 
 def _show_command(command: str, description: str) -> str:
@@ -157,9 +158,11 @@ async def _setup_input_reader(is_interactive: bool):
     return reader
 
 
-async def _read_next_line(is_interactive: bool, reader, ctx: AnyContext) -> str:
+async def _read_next_line(reader, ctx: AnyContext) -> str:
     """Reads one line of input using the provided reader."""
-    if is_interactive:
+    from prompt_toolkit import PromptSession
+
+    if isinstance(reader, PromptSession):
         return await reader.prompt_async()
 
     line_bytes = await reader.readline()

zrb/task/llm/print_node.py

@@ -19,10 +19,10 @@ async def print_node(print_func: Callable, agent_run: Any, node: Any):
     )
 
     if Agent.is_user_prompt_node(node):
-        print_func(stylize_faint("🔠 Receiving input..."))
+        print_func(stylize_faint(" 🔠 Receiving input..."))
     elif Agent.is_model_request_node(node):
         # A model request node => We can stream tokens from the model's request
-        print_func(stylize_faint("🧠 Processing..."))
+        print_func(stylize_faint(" 🧠 Processing..."))
         # Reference: https://ai.pydantic.dev/agents/#streaming
         async with node.stream(agent_run.ctx) as request_stream:
             is_streaming = False
@@ -30,9 +30,8 @@ async def print_node(print_func: Callable, agent_run: Any, node: Any):
                 if isinstance(event, PartStartEvent) and event.part:
                     if is_streaming:
                         print_func("")
-                    print_func(
-                        stylize_faint(f"    Starting part {event.index}: {event.part}"),
-                    )
+                    content = _get_event_part_content(event)
+                    print_func(stylize_faint(f"     {content}"), end="")
                     is_streaming = False
                 elif isinstance(event, PartDeltaEvent):
                     if isinstance(event.delta, TextPartDelta) or isinstance(
@@ -52,14 +51,14 @@ async def print_node(print_func: Callable, agent_run: Any, node: Any):
                     if is_streaming:
                         print_func("")
                     print_func(
-                        stylize_faint(f"    Result: tool_name={event.tool_name}"),
+                        stylize_faint(f"     Result: tool_name={event.tool_name}"),
                     )
                     is_streaming = False
             if is_streaming:
                 print_func("")
     elif Agent.is_call_tools_node(node):
         # A handle-response node => The model returned some data, potentially calls a tool
-        print_func(stylize_faint("🧰 Calling Tool..."))
+        print_func(stylize_faint(" 🧰 Calling Tool..."))
         async with node.stream(agent_run.ctx) as handle_stream:
             async for event in handle_stream:
                 if isinstance(event, FunctionToolCallEvent):
@@ -79,16 +78,24 @@ async def print_node(print_func: Callable, agent_run: Any, node: Any):
                         del event.part.args["_dummy"]
                     print_func(
                         stylize_faint(
-                            f"    {event.part.tool_call_id} | "
+                            f"     {event.part.tool_call_id} | "
                             f"Call {event.part.tool_name} {event.part.args}"
                         )
                     )
                 elif isinstance(event, FunctionToolResultEvent):
                     print_func(
                         stylize_faint(
-                            f"    {event.tool_call_id} | {event.result.content}"
+                            f"     {event.tool_call_id} | {event.result.content}"
                         )
                     )
     elif Agent.is_end_node(node):
         # Once an End node is reached, the agent run is complete
-        print_func(stylize_faint("✅ Completed..."))
+        print_func(stylize_faint(" ✅ Completed..."))
+
+
+def _get_event_part_content(event: Any) -> str:
+    if not hasattr(event, "part"):
+        return f"{event}"
+    if not hasattr(event.part, "content"):
+        return f"{event.part}"
+    return getattr(event.part, "content")

zrb/task/llm/prompt.py

@@ -93,28 +93,54 @@ def get_workflow_prompt(
     modes_attr: StrListAttr | None,
     render_modes: bool,
 ) -> str:
-    modes = get_modes(ctx, modes_attr, render_modes)
+    builtin_workflow_dir = os.path.join(os.path.dirname(__file__), "default_workflow")
+    modes = set(get_modes(ctx, modes_attr, render_modes))
+
     # Get user-defined workflows
     workflows = {
         workflow_name.strip().lower(): content
         for workflow_name, content in llm_context_config.get_workflows().items()
         if workflow_name.strip().lower() in modes
     }
-    # Get requested builtin-workflow names
+
+    # Get available builtin workflow names from the file system
+    available_builtin_workflow_names = set()
+    try:
+        for filename in os.listdir(builtin_workflow_dir):
+            if filename.endswith(".md"):
+                available_builtin_workflow_names.add(filename[:-3].lower())
+    except FileNotFoundError:
+        # Handle case where the directory might not exist
+        ctx.log_error(
+            f"Warning: Default workflow directory not found at {builtin_workflow_dir}"
+        )
+    except Exception as e:
+        # Catch other potential errors during directory listing
+        ctx.log_error(f"Error listing default workflows: {e}")
+
+    # Determine which builtin workflows are requested and not already loaded
     requested_builtin_workflow_names = [
-        workflow_name.lower()
-        for workflow_name in ("coding", "copywriting", "researching")
-        if workflow_name.lower() in modes and workflow_name.lower() not in workflows
+        workflow_name
+        for workflow_name in available_builtin_workflow_names
+        if workflow_name in modes and workflow_name not in workflows
     ]
-    # add builtin-workflows if requested
+
+    # Add builtin-workflows if requested
     if len(requested_builtin_workflow_names) > 0:
-        dir_path = os.path.dirname(__file__)
         for workflow_name in requested_builtin_workflow_names:
             workflow_file_path = os.path.join(
-                dir_path, "default_workflow", f"{workflow_name}.md"
+                builtin_workflow_dir, f"{workflow_name}.md"
             )
-            with open(workflow_file_path, "r") as f:
-                workflows[workflow_name] = f.read()
+            try:
+                with open(workflow_file_path, "r") as f:
+                    workflows[workflow_name] = f.read()
+            except FileNotFoundError:
+                ctx.log_error(
+                    f"Warning: Builtin workflow file not found: {workflow_file_path}"
+                )
+            except Exception as e:
+                ctx.log_error(f"Error reading builtin workflow {workflow_name}: {e}")
+
     return "\n".join(
         [
             make_prompt_section(header.capitalize(), content)

zrb/task/llm/tool_wrapper.py

@@ -123,7 +123,7 @@ def _create_wrapper(
 
 
 async def _ask_for_approval(
-    ctx: AnyContext, func: Callable, args: list[Any], kwargs: dict[Any]
+    ctx: AnyContext, func: Callable, args: list[Any], kwargs: dict[str, Any]
 ) -> tuple[bool, str]:
     func_name = get_callable_name(func)
     normalized_args = [stylize_green(_truncate_arg(arg)) for arg in args]
@@ -139,9 +139,11 @@ async def _ask_for_approval(
     )
     while True:
         ctx.print(
-            f"✅ >> Allow to run tool: {func_call_str} (Yes | No, <reason>)", plain=True
+            f"\n✅ >> Allow to run tool: {func_call_str} (Yes | No, <reason>) ",
+            plain=True,
         )
         user_input = 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("")

zrb/task/llm_task.py

@@ -331,7 +331,7 @@ class LLMTask(BaseTask):
                     ctx.xcom[xcom_usage_key] = Xcom([])
                 usage = agent_run.result.usage()
                 ctx.xcom[xcom_usage_key].push(usage)
-                ctx.print(stylize_faint(f"💸 Token: {usage}"), plain=True)
+                ctx.print(stylize_faint(f" 💸 Token: {usage}"), plain=True)
                 return agent_run.result.output
             else:
                 ctx.log_warning("Agent run did not produce a result.")

{zrb-1.15.2.dist-info → zrb-1.15.3.dist-info}/METADATA

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

{zrb-1.15.2.dist-info → zrb-1.15.3.dist-info}/RECORD

@@ -9,7 +9,7 @@ zrb/builtin/git_subtree.py,sha256=7BKwOkVTWDrR0DXXQ4iJyHqeR6sV5VYRt8y_rEB0EHg,35
 zrb/builtin/group.py,sha256=t008xLM4_fgbjfZrPoi_fQAnSHIo6MOiQSCHBO4GDYU,2379
 zrb/builtin/http.py,sha256=L6RE73c65wWwG5iHFN-tpOhyh56KsrgVskDd3c3YXtk,4246
 zrb/builtin/jwt.py,sha256=3M5uaQhJZbKQLjTUft1OwPz_JxtmK-xtkjxWjciOQho,2859
-zrb/builtin/llm/chat_session.py,sha256=syMOQzAGcRmxs7ctrBkfvAZ7-IhxnywuxuyeoBMteEs,10464
+zrb/builtin/llm/chat_session.py,sha256=gAn04kxT7YmqFCqxamFhV2W3Duq5z8z6jYaOmVxa5yc,10529
 zrb/builtin/llm/history.py,sha256=LDOrL0p7r_AHLa5L8Dp7bHNsOALugmJd7OguXRWGnm4,3087
 zrb/builtin/llm/input.py,sha256=Nw-26uTWp2QhUgKJcP_IMHmtk-b542CCSQ_vCOjhvhM,877
 zrb/builtin/llm/llm_ask.py,sha256=03d1-2jh7NS0VP3eNl9wCdrUzud98i6zFUXW5NNu3_o,5597
@@ -355,11 +355,11 @@ zrb/task/llm/default_workflow/copywriting.md,sha256=xSO7GeDolwGxiuz6kXsK2GKGpwp8
 zrb/task/llm/default_workflow/researching.md,sha256=KD-aYHFHir6Ti-4FsBBtGwiI0seSVgleYbKJZi_POXA,2139
 zrb/task/llm/error.py,sha256=QR-nIohS6pBpC_16cWR-fw7Mevo1sNYAiXMBsh_CJDE,4157
 zrb/task/llm/history_summarization.py,sha256=YaK3BR7gJVi9f8G5loosNAaO4y7K3ck_4bJ9GuOChXk,8028
-zrb/task/llm/print_node.py,sha256=Z6J1n024MkYIeO4xGnDHmUHk9yTjJRVZRxAC5schE7w,4242
-zrb/task/llm/prompt.py,sha256=amFd0UdXDToYgjOwOFDe62EOg81VvjHvdp9omX1NIgg,10530
-zrb/task/llm/tool_wrapper.py,sha256=kmpixQUFq4Hxj9VMgaaoZd8juzTFou9hIGjU7gZENYs,8297
+zrb/task/llm/print_node.py,sha256=BlIccGqMeKSLI7QGCVKtmUyi4-B64Mn4wzWj1Dbtl4o,4467
+zrb/task/llm/prompt.py,sha256=FGXWYHecWtrNNkPnjg-uhnkqp7fYt8V91-AjFM_5fpA,11550
+zrb/task/llm/tool_wrapper.py,sha256=AevU5cY8ztBE-HS27XBefouvP7JK44rau7z0e79vOWo,8352
 zrb/task/llm/typing.py,sha256=c8VAuPBw_4A3DxfYdydkgedaP-LU61W9_wj3m3CAX1E,58
-zrb/task/llm_task.py,sha256=1yPs9z8nhA9txMJVQZf3N4e-n6wys0nZ9Qk1lOx8PLg,14448
+zrb/task/llm_task.py,sha256=aIo4pHaV2LV4E5E0aCDry7pwKKAvb78Saq5vgEc6t9Q,14449
 zrb/task/make_task.py,sha256=PD3b_aYazthS8LHeJsLAhwKDEgdurQZpymJDKeN60u0,2265
 zrb/task/rsync_task.py,sha256=WfqNSaicJgYWpunNU34eYxXDqHDHOftuDHyWJKjqwg0,6365
 zrb/task/scaffolder.py,sha256=rME18w1HJUHXgi9eTYXx_T2G4JdqDYzBoNOkdOOo5-o,6806
@@ -406,7 +406,7 @@ zrb/util/todo.py,sha256=r9_KYF2-hLKMNjsp6AFK9zivykMrywd-kJ4bCwfdafI,19323
 zrb/util/todo_model.py,sha256=hhzAX-uFl5rsg7iVX1ULlJOfBtblwQ_ieNUxBWfc-Os,1670
 zrb/xcom/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/xcom/xcom.py,sha256=o79rxR9wphnShrcIushA0Qt71d_p3ZTxjNf7x9hJB78,1571
-zrb-1.15.2.dist-info/METADATA,sha256=DGTvAoTQ6gl-buYjg9juPnZha4qwYckW6-7UmfG_0pY,9807
-zrb-1.15.2.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-zrb-1.15.2.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
-zrb-1.15.2.dist-info/RECORD,,
+zrb-1.15.3.dist-info/METADATA,sha256=dvXTlDqIDrLqzZarWVexy1OLJ-W2ufWqptdARc1DBig,9807
+zrb-1.15.3.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+zrb-1.15.3.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
+zrb-1.15.3.dist-info/RECORD,,