zrb 1.16.2__py3-none-any.whl → 1.16.3__py3-none-any.whl

zrb/builtin/__init__.py

@@ -9,6 +9,7 @@ from zrb.builtin.git import (
 from zrb.builtin.git_subtree import git_add_subtree, git_pull_subtree, git_push_subtree
 from zrb.builtin.http import generate_curl, http_request
 from zrb.builtin.jwt import decode_jwt, encode_jwt, validate_jwt
+from zrb.builtin.llm.chat_trigger import llm_chat_trigger
 from zrb.builtin.llm.llm_ask import llm_ask
 from zrb.builtin.md5 import hash_md5, sum_md5, validate_md5
 from zrb.builtin.project.add.fastapp.fastapp_task import add_fastapp_to_project

zrb/builtin/llm/chat_session.py

@@ -7,13 +7,20 @@ conversation flow via XCom.
 
 import asyncio
 import sys
+from typing import TYPE_CHECKING, Any
 
+from zrb.builtin.llm.chat_trigger import llm_chat_trigger
 from zrb.config.llm_config import llm_config
 from zrb.context.any_context import AnyContext
 from zrb.util.cli.markdown import render_markdown
 from zrb.util.cli.style import stylize_blue, stylize_bold_yellow, stylize_faint
 from zrb.util.string.conversion import to_boolean
 
+if TYPE_CHECKING:
+    from asyncio import StreamReader
+
+    from prompt_toolkit import PromptSession
+
 
 async def read_user_prompt(ctx: AnyContext) -> str:
     """
@@ -22,7 +29,7 @@ async def read_user_prompt(ctx: AnyContext) -> str:
     """
     _show_info(ctx)
     is_tty: bool = ctx.is_tty
-    reader = await _setup_input_reader(is_tty)
+    reader: PromptSession[Any] | StreamReader = await _setup_input_reader(is_tty)
     multiline_mode = False
     is_first_time = True
     current_modes: str = ctx.input.modes
@@ -32,7 +39,7 @@ async def read_user_prompt(ctx: AnyContext) -> str:
     while True:
         await asyncio.sleep(0.01)
         previous_session_name: str | None = (
-            ctx.input.previous_session if is_first_time else None
+            ctx.input.previous_session if is_first_time else ""
         )
         start_new: bool = ctx.input.start_new if is_first_time else False
         if is_first_time and ctx.input.message.strip() != "":
@@ -41,7 +48,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(reader, ctx)
+            user_input = await llm_chat_trigger.wait(reader, ctx)
             if not multiline_mode:
                 ctx.print("", plain=True)
         is_first_time = False
@@ -153,7 +160,9 @@ def _show_subcommand(command: str, description: str) -> str:
     return f"  {styled_command} {styled_description}"
 
 
-async def _setup_input_reader(is_interactive: bool):
+async def _setup_input_reader(
+    is_interactive: bool,
+) -> "PromptSession[Any] | StreamReader":
     """Sets up and returns the appropriate asynchronous input reader."""
     if is_interactive:
         from prompt_toolkit import PromptSession
@@ -167,22 +176,6 @@ async def _setup_input_reader(is_interactive: bool):
     return reader
 
 
-async def _read_next_line(reader, ctx: AnyContext) -> str:
-    """Reads one line of input using the provided reader."""
-    from prompt_toolkit import PromptSession
-
-    if isinstance(reader, PromptSession):
-        return await reader.prompt_async()
-
-    line_bytes = await reader.readline()
-    if not line_bytes:
-        return "/bye"  # Signal to exit
-
-    user_input = line_bytes.decode().strip()
-    ctx.print(user_input, plain=True)
-    return user_input
-
-
 async def _trigger_ask_and_wait_for_result(
     ctx: AnyContext,
     user_prompt: str,

zrb/builtin/llm/chat_trigger.py

@@ -0,0 +1,73 @@
+import asyncio
+from asyncio import StreamReader
+from typing import TYPE_CHECKING, Any, Callable, Coroutine
+
+from zrb.context.any_context import AnyContext
+from zrb.util.run import run_async
+
+if TYPE_CHECKING:
+    from prompt_toolkit import PromptSession
+
+
+ChatTrigger = Callable[[AnyContext], Coroutine[Any, Any, str] | str]
+
+
+class LLMChatTrigger:
+
+    def __init__(self):
+        self._triggers: list[ChatTrigger] = []
+
+    def add_trigger(self, *trigger: ChatTrigger):
+        self.append_trigger(*trigger)
+
+    def append_trigger(self, *trigger: ChatTrigger):
+        for single_trigger in trigger:
+            self._triggers.append(single_trigger)
+
+    async def wait(
+        self, reader: "PromptSession[Any] | StreamReader", ctx: AnyContext
+    ) -> str:
+        trigger_tasks = [
+            asyncio.create_task(run_async(self._read_next_line(reader, ctx)))
+        ] + [asyncio.create_task(run_async(trigger(ctx))) for trigger in self._triggers]
+        final_result: str = ""
+        try:
+            done, pending = await asyncio.wait(
+                trigger_tasks, return_when=asyncio.FIRST_COMPLETED
+            )
+            for task in done:
+                final_result = await task
+            if pending:
+                for task in pending:
+                    task.cancel()
+            for task in done:
+                break
+        except asyncio.CancelledError:
+            ctx.print("Task cancelled.", plain=True)
+            final_result = "/bye"
+        except KeyboardInterrupt:
+            ctx.print("KeyboardInterrupt detected. Exiting...", plain=True)
+            final_result = "/bye"
+        return final_result
+
+    async def _read_next_line(
+        self, reader: "PromptSession[Any] | StreamReader", ctx: AnyContext
+    ) -> str:
+        """Reads one line of input using the provided reader."""
+        from prompt_toolkit import PromptSession
+
+        try:
+            if isinstance(reader, PromptSession):
+                return await reader.prompt_async()
+            line_bytes = await reader.readline()
+            if not line_bytes:
+                return "/bye"  # Signal to exit
+            user_input = line_bytes.decode().strip()
+            ctx.print(user_input, plain=True)
+            return user_input
+        except KeyboardInterrupt:
+            ctx.print("KeyboardInterrupt detected. Exiting...", plain=True)
+            return "/bye"
+
+
+llm_chat_trigger = LLMChatTrigger()

zrb/builtin/llm/llm_ask.py

@@ -106,7 +106,7 @@ def _render_yolo_mode_input(ctx: AnyContext) -> list[str] | bool | None:
     return elements
 
 
-def _get_inputs(require_message: bool = True) -> list[AnyInput]:
+def _get_inputs(require_message: bool = True) -> list[AnyInput | None]:
     return [
         StrInput(
             "model",

zrb/builtin/llm/tool/code.py

@@ -120,6 +120,10 @@ async def analyze_repo(
         goal=goal,
         token_limit=extraction_token_threshold,
     )
+    if len(extracted_infos) == 0:
+        raise RuntimeError(
+            "No info can be extracted, adjust extensions or exclude_patterns."
+        )
     if len(extracted_infos) == 1:
         return extracted_infos[0]
     summarized_infos = extracted_infos
@@ -146,11 +150,11 @@ def _get_file_metadatas(
             if not any(file.endswith(f".{ext}") for ext in extensions):
                 continue
             file_path = os.path.join(root, file)
-            if is_excluded(file_path, exclude_patterns):
-                continue
             try:
+                rel_path = os.path.relpath(file_path, dir_path)
+                if is_excluded(rel_path, exclude_patterns):
+                    continue
                 with open(file_path, "r", encoding="utf-8", errors="ignore") as f:
-                    rel_path = os.path.relpath(file_path, dir_path)
                     metadata_list.append({"path": rel_path, "content": f.read()})
             except Exception as e:
                 print(f"Error reading file {file_path}: {e}")

zrb/builtin/llm/tool/sub_agent.py

@@ -1,4 +1,3 @@
-import json
 from collections.abc import Callable
 from textwrap import dedent
 from typing import TYPE_CHECKING, Any, Coroutine
@@ -9,7 +8,7 @@ from zrb.task.llm.config import get_model, get_model_settings
 from zrb.task.llm.prompt import get_system_and_user_prompt
 
 if TYPE_CHECKING:
-    from pydantic_ai import Agent, Tool
+    from pydantic_ai import Tool
     from pydantic_ai.models import Model
     from pydantic_ai.settings import ModelSettings
     from pydantic_ai.toolsets import AbstractToolset

{zrb-1.16.2.dist-info → zrb-1.16.3.dist-info}/METADATA

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

{zrb-1.16.2.dist-info → zrb-1.16.3.dist-info}/RECORD

@@ -2,25 +2,26 @@ zrb/__init__.py,sha256=qkCV2EnAGIgvsawBHYvKgPAp0zzPcikYSmbQXATLzg4,5060
 zrb/__main__.py,sha256=9SXH9MK4PVyU9lkEyHxiIUABbcsV2wseP94HmlqTR4M,2657
 zrb/attr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/attr/type.py,sha256=4TV5gPYMMrKh5V-yB6iRYKCbsXAH_AvGXMsjxKLHcUs,568
-zrb/builtin/__init__.py,sha256=NjXpvBgAiPH-dNsJx5Fa-zSZE5JVnmVb1GhMNtevpGQ,1614
+zrb/builtin/__init__.py,sha256=qeLg_S7mRWe48AYrzNutAgAnLh2YE57-iEVK0ICd-3A,1672
 zrb/builtin/base64.py,sha256=UjaFttE2oRx0T7_RpKtKfgMtWfiQXfJBAJmA16ek8Ic,1507
 zrb/builtin/git.py,sha256=8_qVE_2lVQEVXQ9vhiw8Tn4Prj1VZB78ZjEJJS5Ab3M,5461
 zrb/builtin/git_subtree.py,sha256=7BKwOkVTWDrR0DXXQ4iJyHqeR6sV5VYRt8y_rEB0EHg,3505
 zrb/builtin/group.py,sha256=zYC5uw0VE97TXiLCr464kFJ-CJIJyeQ2RXjnVRY5ovs,2577
 zrb/builtin/http.py,sha256=L6RE73c65wWwG5iHFN-tpOhyh56KsrgVskDd3c3YXtk,4246
 zrb/builtin/jwt.py,sha256=3M5uaQhJZbKQLjTUft1OwPz_JxtmK-xtkjxWjciOQho,2859
-zrb/builtin/llm/chat_session.py,sha256=DVPti3iR8bRDsmp6SvmktjXumiPk-PsOsv3AJjYHnoU,10629
+zrb/builtin/llm/chat_session.py,sha256=6q40xQdv56OtaTZCVSS16WDchn4l0sagZI2BGX_JyQM,10448
+zrb/builtin/llm/chat_trigger.py,sha256=xaJmzrvBGz6LFPOpYnG9bMeT1dY6XqZPXamtr9e72-w,2427
 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=1gQea8lGAnIr5wSDXOZe3P_SMAUBQ-SIDrx1bwuml8k,7539
+zrb/builtin/llm/llm_ask.py,sha256=8V5YAShUPes5qnlxLaS9Ks4KOs7oCQFGrpfkj-6rLMU,7546
 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=p55Fs6QTmsM2u-vVcBJb9xYxGAkiHIKX2wYKhsGlWFE,2417
 zrb/builtin/llm/tool/cli.py,sha256=sm_maE1WBB051odh1xXr8QQOWln_ewAU_7OScKAneT4,1244
-zrb/builtin/llm/tool/code.py,sha256=mtmXTDZTbUh6bEf4fsVPvfM0bokHMMETDWAHOXRmRmI,8798
+zrb/builtin/llm/tool/code.py,sha256=-MKUpXX4jkWm4rCqrUmTTzsYhjfzKle9_XsNPtq8PNM,8952
 zrb/builtin/llm/tool/file.py,sha256=fDgt31CWwZtOYOk6lfBSBxX85NARLr-ZzXPvG1JP8C0,23589
 zrb/builtin/llm/tool/rag.py,sha256=aN8D8ZqzGXWCP_1F1LbN0QgfyzaK9CKrjfTPorDIYjw,9824
-zrb/builtin/llm/tool/sub_agent.py,sha256=5J2Ohjc-o1DZsU21DNHubkyc_3twIU8qPBLae8VWjkk,5086
+zrb/builtin/llm/tool/sub_agent.py,sha256=nYluPfc8FlSobpP_4vnBIqkPARrDHq_SwKkmlh_ATUI,5067
 zrb/builtin/llm/tool/web.py,sha256=zDgxYRIQRj9A8QXb80-ZSPmGCvIOWy8bpJMGSAuTL8Y,7491
 zrb/builtin/md5.py,sha256=690RV2LbW7wQeTFxY-lmmqTSVEEZv3XZbjEUW1Q3XpE,1480
 zrb/builtin/project/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -410,7 +411,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.16.2.dist-info/METADATA,sha256=6fqvlgzoSAT-9VVwy0e3dCXDw_3ygkgPNNqfXmcmGoA,9935
-zrb-1.16.2.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-zrb-1.16.2.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
-zrb-1.16.2.dist-info/RECORD,,
+zrb-1.16.3.dist-info/METADATA,sha256=XONEHMCkv5j0YPf35oaP5MYliI1CYXoPXUv-8FNKFI4,9935
+zrb-1.16.3.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+zrb-1.16.3.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
+zrb-1.16.3.dist-info/RECORD,,