zrb 1.15.25__tar.gz → 1.15.26__tar.gz

{zrb-1.15.25 → zrb-1.15.26}/PKG-INFO

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

{zrb-1.15.25 → zrb-1.15.26}/pyproject.toml

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

{zrb-1.15.25 → zrb-1.15.26}/src/zrb/builtin/llm/llm_ask.py

@@ -162,7 +162,7 @@ _llm_ask_inputs = [
     ),
 ]
 
-llm_ask: LLMTask = llm_group.add_task(
+llm_ask = llm_group.add_task(
     LLMTask(
         name="llm-ask",
         input=_llm_ask_inputs,

{zrb-1.15.25 → zrb-1.15.26}/src/zrb/context/any_shared_context.py

@@ -29,26 +29,32 @@ class AnySharedContext(ABC):
         pass
 
     @property
+    @abstractmethod
     def input(self) -> DotDict:
         pass
 
     @property
+    @abstractmethod
     def env(self) -> DotDict:
         pass
 
     @property
+    @abstractmethod
     def args(self) -> list[Any]:
         pass
 
     @property
-    def xcom(self) -> DotDict[str, Xcom]:
+    @abstractmethod
+    def xcom(self) -> DotDict:
         pass
 
     @property
+    @abstractmethod
     def shared_log(self) -> list[str]:
         pass
 
     @property
+    @abstractmethod
     def session(self) -> any_session.AnySession | None:
         pass
 

{zrb-1.15.25 → zrb-1.15.26}/src/zrb/context/shared_context.py

@@ -66,7 +66,7 @@ class SharedContext(AnySharedContext):
         return self._args
 
     @property
-    def xcom(self) -> DotDict[str, Xcom]:
+    def xcom(self) -> DotDict:
         return self._xcom
 
     @property
@@ -81,7 +81,7 @@ class SharedContext(AnySharedContext):
         self._log.append(message)
         session = self.session
         if session is not None:
-            session_parent: AnySession = session.parent
+            session_parent: AnySession | None = session.parent
             if session_parent is not None:
                 session_parent.shared_ctx.append_to_shared_log(message)
 

{zrb-1.15.25 → zrb-1.15.26}/src/zrb/runner/web_util/user.py

@@ -19,7 +19,7 @@ def get_user_by_credentials(
 
 async def get_user_from_request(
     web_auth_config: WebAuthConfig, request: "Request"
-) -> User | None:
+) -> User:
     from fastapi.security import OAuth2PasswordBearer
 
     if not web_auth_config.enable_auth:
@@ -45,7 +45,11 @@ def _get_user_from_cookie(
     return None
 
 
-def _get_user_from_token(web_auth_config: WebAuthConfig, token: str) -> User | None:
+def _get_user_from_token(
+    web_auth_config: WebAuthConfig, token: str | None
+) -> User | None:
+    if token is None:
+        return None
     try:
         from jose import jwt
 
@@ -54,7 +58,7 @@ def _get_user_from_token(web_auth_config: WebAuthConfig, token: str) -> User | N
             web_auth_config.secret_key,
             options={"require_sub": True, "require_exp": True},
         )
-        username: str = payload.get("sub")
+        username: str | None = payload.get("sub")
         if username is None:
             return None
         user = web_auth_config.find_user_by_username(username)

{zrb-1.15.25 → zrb-1.15.26}/src/zrb/session/any_session.py

@@ -1,5 +1,6 @@
 from __future__ import annotations  # Enables forward references
 
+import asyncio
 from abc import ABC, abstractmethod
 from typing import TYPE_CHECKING, Any, Coroutine, TypeVar
 
@@ -62,12 +63,13 @@ class AnySession(ABC):
 
     @property
     @abstractmethod
-    def parent(self) -> TAnySession | None:
+    def parent(self) -> "AnySession | None":
         """Parent session"""
         pass
 
+    @property
     @abstractmethod
-    def task_path(self) -> str:
+    def task_path(self) -> list[str]:
         """Main task's path"""
         pass
 
@@ -105,7 +107,9 @@ class AnySession(ABC):
         pass
 
     @abstractmethod
-    def defer_monitoring(self, task: "AnyTask", coro: Coroutine):
+    def defer_monitoring(
+        self, task: "AnyTask", coro: Coroutine[Any, Any, Any] | asyncio.Task[Any]
+    ):
         """Defers the execution of a task's monitoring coroutine for later processing.
 
         Args:
@@ -115,7 +119,9 @@ class AnySession(ABC):
         pass
 
     @abstractmethod
-    def defer_action(self, task: "AnyTask", coro: Coroutine):
+    def defer_action(
+        self, task: "AnyTask", coro: Coroutine[Any, Any, Any] | asyncio.Task[Any]
+    ):
         """Defers the execution of a task's coroutine for later processing.
 
         Args:
@@ -125,7 +131,7 @@ class AnySession(ABC):
         pass
 
     @abstractmethod
-    def defer_coro(self, coro: Coroutine):
+    def defer_coro(self, coro: Coroutine[Any, Any, Any] | asyncio.Task[Any]):
         """Defers the execution of a coroutine for later processing.
 
         Args:
@@ -185,7 +191,7 @@ class AnySession(ABC):
         pass
 
     @abstractmethod
-    def is_allowed_to_run(self, task: "AnyTask"):
+    def is_allowed_to_run(self, task: "AnyTask") -> bool:
         """Determines if the specified task is allowed to run based on its current state.
 
         Args:

{zrb-1.15.25 → zrb-1.15.26}/src/zrb/session/session.py

@@ -1,10 +1,12 @@
+from __future__ import annotations
+
 import asyncio
 from typing import TYPE_CHECKING, Any, Coroutine
 
 from zrb.context.any_shared_context import AnySharedContext
 from zrb.context.context import AnyContext, Context
 from zrb.group.any_group import AnyGroup
-from zrb.session.any_session import AnySession
+from zrb.session.any_session import AnySession, TAnySession
 from zrb.session_state_logger.any_session_state_logger import AnySessionStateLogger
 from zrb.session_state_logger.session_state_logger_factory import session_state_logger
 from zrb.task.any_task import AnyTask
@@ -48,10 +50,10 @@ class Session(AnySession):
         self._context: dict[AnyTask, Context] = {}
         self._shared_ctx = shared_ctx
         self._shared_ctx.set_session(self)
-        self._parent = parent
-        self._action_coros: dict[AnyTask, asyncio.Task] = {}
-        self._monitoring_coros: dict[AnyTask, asyncio.Task] = {}
-        self._coros: list[asyncio.Task] = []
+        self._parent: AnySession | None = parent
+        self._action_coros: dict[AnyTask, asyncio.Task[Any]] = {}
+        self._monitoring_coros: dict[AnyTask, asyncio.Task[Any]] = {}
+        self._coros: list[asyncio.Task[Any]] = []
         self._colors = [
             GREEN,
             YELLOW,
@@ -114,11 +116,13 @@ class Session(AnySession):
         return self._parent
 
     @property
-    def task_path(self) -> str:
+    def task_path(self) -> list[str]:
         return self._main_task_path
 
     @property
     def final_result(self) -> Any:
+        if self._main_task is None:
+            return None
         xcom: Xcom = self.shared_ctx.xcom[self._main_task.name]
         try:
             return xcom.peek()
@@ -134,7 +138,11 @@ class Session(AnySession):
     def set_main_task(self, main_task: AnyTask):
         self.register_task(main_task)
         self._main_task = main_task
-        main_task_path = get_node_path(self._root_group, main_task)
+        main_task_path = (
+            None
+            if self._root_group is None
+            else get_node_path(self._root_group, main_task)
+        )
         self._main_task_path = [] if main_task_path is None else main_task_path
 
     def as_state_log(self) -> "SessionStateLog":
@@ -171,7 +179,7 @@ class Session(AnySession):
         return SessionStateLog(
             name=self.name,
             start_time=log_start_time,
-            main_task_name=self._main_task.name,
+            main_task_name="" if self._main_task is None else self._main_task.name,
             path=self.task_path,
             final_result=(
                 remove_style(f"{self.final_result}")
@@ -188,16 +196,29 @@ class Session(AnySession):
         self._register_single_task(task)
         return self._context[task]
 
-    def defer_monitoring(self, task: AnyTask, coro: Coroutine):
+    def defer_monitoring(
+        self, task: AnyTask, coro: Coroutine[Any, Any, Any] | asyncio.Task[Any]
+    ):
         self._register_single_task(task)
-        self._monitoring_coros[task] = coro
+        if isinstance(coro, asyncio.Task):
+            self._monitoring_coros[task] = coro
+        else:
+            self._monitoring_coros[task] = asyncio.create_task(coro)
 
-    def defer_action(self, task: AnyTask, coro: Coroutine):
+    def defer_action(
+        self, task: AnyTask, coro: Coroutine[Any, Any, Any] | asyncio.Task[Any]
+    ):
         self._register_single_task(task)
-        self._action_coros[task] = coro
+        if isinstance(coro, asyncio.Task):
+            self._action_coros[task] = coro
+        else:
+            self._action_coros[task] = asyncio.create_task(coro)
 
-    def defer_coro(self, coro: Coroutine):
-        self._coros.append(coro)
+    def defer_coro(self, coro: Coroutine[Any, Any, Any] | asyncio.Task[Any]):
+        if isinstance(coro, asyncio.Task):
+            self._coros.append(coro)
+        else:
+            self._coros.append(asyncio.create_task(coro))
         self._coros = [
             existing_coro for existing_coro in self._coros if not existing_coro.done()
         ]
@@ -246,15 +267,15 @@ class Session(AnySession):
 
     def get_next_tasks(self, task: AnyTask) -> list[AnyTask]:
         self._register_single_task(task)
-        return self._downstreams.get(task)
+        return self._downstreams.get(task, [])
 
     def get_task_status(self, task: AnyTask) -> TaskStatus:
         self._register_single_task(task)
         return self._task_status[task]
 
     def _register_single_task(self, task: AnyTask):
-        if task.name not in self._shared_ctx._xcom:
-            self._shared_ctx._xcom[task.name] = Xcom([])
+        if task.name not in self._shared_ctx.xcom:
+            self._shared_ctx.xcom[task.name] = Xcom([])
         if task not in self._context:
             self._context[task] = Context(
                 shared_ctx=self._shared_ctx,
@@ -278,7 +299,7 @@ class Session(AnySession):
             self._color_index = 0
         return chosen
 
-    def _get_icon(self, task: AnyTask) -> int:
+    def _get_icon(self, task: AnyTask) -> str:
         if task.icon is not None:
             return task.icon
         chosen = self._icons[self._icon_index]

{zrb-1.15.25 → zrb-1.15.26}/src/zrb/task/any_task.py

@@ -36,6 +36,14 @@ class AnyTask(ABC):
     the actual implementation for these abstract members.
     """
 
+    @abstractmethod
+    def __rshift__(self, other: "AnyTask | list[AnyTask]") -> "AnyTask | list[AnyTask]":
+        pass
+
+    @abstractmethod
+    def __lshift__(self, other: "AnyTask | list[AnyTask]") -> "AnyTask":
+        pass
+
     @property
     @abstractmethod
     def name(self) -> str:

{zrb-1.15.25 → zrb-1.15.26}/src/zrb/task/base_trigger.py

@@ -127,7 +127,7 @@ class BaseTrigger(BaseTask):
         return self._callbacks
 
     async def exec_root_tasks(self, session: AnySession):
-        exchange_xcom = self.get_exchange_xcom(session)
+        exchange_xcom = self._get_exchange_xcom(session)
         exchange_xcom.add_push_callback(lambda: self._exchange_push_callback(session))
         return await super().exec_root_tasks(session)
 
@@ -136,8 +136,7 @@ class BaseTrigger(BaseTask):
         session.defer_coro(coro)
 
     async def _fanout_and_trigger_callback(self, session: AnySession):
-        exchange_xcom = self.get_exchange_xcom(session)
-        data = exchange_xcom.pop()
+        data = self.pop_exchange_xcom(session)
         coros = []
         for callback in self.callbacks:
             xcom_dict = DotDict({self.queue_name: Xcom([data])})
@@ -156,8 +155,16 @@ class BaseTrigger(BaseTask):
             )
         await asyncio.gather(*coros)
 
-    def get_exchange_xcom(self, session: AnySession) -> Xcom:
+    def _get_exchange_xcom(self, session: AnySession) -> Xcom:
         shared_ctx = session.shared_ctx
         if self.queue_name not in shared_ctx.xcom:
             shared_ctx.xcom[self.queue_name] = Xcom()
         return shared_ctx.xcom[self.queue_name]
+
+    def push_exchange_xcom(self, session: AnySession, data: Any):
+        exchange_xcom = self._get_exchange_xcom(session)
+        exchange_xcom.push(data)
+
+    def pop_exchange_xcom(self, session: AnySession) -> Any:
+        exchange_xcom = self._get_exchange_xcom(session)
+        return exchange_xcom.pop()

{zrb-1.15.25 → zrb-1.15.26}/src/zrb/task/llm/agent.py

@@ -1,5 +1,7 @@
+import inspect
 import json
 from collections.abc import Callable
+from dataclasses import dataclass
 from typing import TYPE_CHECKING, Any
 
 from zrb.config.llm_rate_limitter import LLMRateLimiter, llm_rate_limitter
@@ -30,13 +32,44 @@ def create_agent_instance(
     system_prompt: str = "",
     model_settings: "ModelSettings | None" = None,
     tools: "list[ToolOrCallable]" = [],
-    toolsets: list["AbstractToolset[Agent]"] = [],
+    toolsets: list["AbstractToolset[None]"] = [],
     retries: int = 3,
     yolo_mode: bool | list[str] | None = None,
 ) -> "Agent[None, Any]":
     """Creates a new Agent instance with configured tools and servers."""
-    from pydantic_ai import Agent, Tool
+    from pydantic_ai import Agent, RunContext, Tool
     from pydantic_ai.tools import GenerateToolJsonSchema
+    from pydantic_ai.toolsets import ToolsetTool, WrapperToolset
+
+    @dataclass
+    class ConfirmationWrapperToolset(WrapperToolset):
+        ctx: AnyContext
+        yolo_mode: bool | list[str]
+
+        async def call_tool(
+            self, name: str, tool_args: dict, ctx: RunContext, tool: ToolsetTool[None]
+        ) -> Any:
+            # The `tool` object is passed in. Use it for inspection.
+            # Define a temporary function that performs the actual tool call.
+            async def execute_delegated_tool_call(**params):
+                # Pass all arguments down the chain.
+                return await self.wrapped.call_tool(name, tool_args, ctx, tool)
+
+            # For the confirmation UI, make our temporary function look like the real one.
+            try:
+                execute_delegated_tool_call.__name__ = tool.function.__name__
+                execute_delegated_tool_call.__doc__ = tool.function.__doc__
+                execute_delegated_tool_call.__signature__ = inspect.signature(
+                    tool.function
+                )
+            except (AttributeError, TypeError):
+                pass  # Ignore if we can't inspect the original function
+            # Use the existing wrap_func to get the confirmation logic
+            wrapped_executor = wrap_func(
+                execute_delegated_tool_call, self.ctx, self.yolo_mode
+            )
+            # Call the wrapped executor. This will trigger the confirmation prompt.
+            return await wrapped_executor(**tool_args)
 
     if yolo_mode is None:
         yolo_mode = False
@@ -64,13 +97,18 @@ def create_agent_instance(
         else:
             # Turn function into tool
             tool_list.append(wrap_tool(tool_or_callable, ctx, yolo_mode))
+    # Wrap toolsets
+    wrapped_toolsets = [
+        ConfirmationWrapperToolset(wrapped=toolset, ctx=ctx, yolo_mode=yolo_mode)
+        for toolset in toolsets
+    ]
     # Return Agent
     return Agent[None, Any](
         model=model,
         output_type=output_type,
         system_prompt=system_prompt,
         tools=tool_list,
-        toolsets=toolsets,
+        toolsets=wrapped_toolsets,
         model_settings=model_settings,
         retries=retries,
     )

{zrb-1.15.25 → zrb-1.15.26}/src/zrb/task/scheduler.py

@@ -24,7 +24,7 @@ class Scheduler(BaseTrigger):
         cli_only: bool = False,
         input: list[AnyInput | None] | AnyInput | None = None,
         env: list[AnyEnv | None] | AnyEnv | None = None,
-        schedule: StrAttr = None,
+        schedule: StrAttr | None = None,
         execute_condition: bool | str | Callable[[AnySharedContext], bool] = True,
         queue_name: fstring | None = None,
         callback: list[AnyCallback] | AnyCallback = [],
@@ -76,6 +76,6 @@ class Scheduler(BaseTrigger):
             ctx.print(f"Current time: {now}")
             if match_cron(cron_pattern, now):
                 ctx.print(f"Matching {now} with pattern: {cron_pattern}")
-                xcom = self.get_exchange_xcom(ctx.session)
-                xcom.push(now)
+                if ctx.session is not None:
+                    self.push_exchange_xcom(ctx.session, now)
             await asyncio.sleep(60)