zrb 1.0.0a4__py3-none-any.whl → 1.0.0a6__py3-none-any.whl

zrb/builtin/todo.py

@@ -156,7 +156,6 @@ def todo_log(ctx: AnyContext):
     todo_task = cascade_todo_task(todo_task)
     current_duration = todo_task.keyval.get("duration", "0")
     todo_task.keyval["duration"] = add_durations(current_duration, ctx.input.duration)
-    print(current_duration, todo_task.keyval)
     # Save todo list
     save_todo_list(todo_file_path, todo_list)
     # Add log work

zrb/runner/web_app.py

@@ -27,7 +27,7 @@ def create_app(root_group: AnyGroup, port: int = WEB_HTTP_PORT):
     from fastapi.responses import FileResponse, HTMLResponse
     from fastapi.staticfiles import StaticFiles
 
-    _STATIC_DIR = os.path.join(os.path.dirname(__file__), "web_app", "static")
+    _STATIC_DIR = os.path.join(os.path.dirname(__file__), "web_controller", "static")
     _COROS = []
 
     @asynccontextmanager
@@ -142,9 +142,3 @@ def create_app(root_group: AnyGroup, port: int = WEB_HTTP_PORT):
             raise HTTPException(status_code=500, detail=str(e))
 
     return app
-
-
-# async def run_web_server(app: FastAPI, port: int = WEB_HTTP_PORT):
-#     config = Config(app=app, host="0.0.0.0", port=port, loop="asyncio")
-#     server = Server(config)
-#     await server.serve()

zrb/task/any_task.py

@@ -74,6 +74,12 @@ class AnyTask(ABC):
         """Task fallbacks"""
         pass
 
+    @property
+    @abstractmethod
+    def successors(self) -> list["AnyTask"]:
+        """Task successors"""
+        pass
+
     @property
     @abstractmethod
     def readiness_checks(self) -> list["AnyTask"]:
@@ -81,8 +87,38 @@ class AnyTask(ABC):
         pass
 
     @abstractmethod
-    def append_upstreams(self, upstreams: "AnyTask" | list["AnyTask"]):
-        """Sets the upstream tasks that this task depends on.
+    def append_fallback(self, fallbacks: "AnyTask" | list["AnyTask"]):
+        """Add the fallback tasks.
+
+        Args:
+            fallbacks (AnyTask | list[AnyTask]): A single fallback task or
+                a list of fallback tasks.
+        """
+        pass
+
+    @abstractmethod
+    def append_successor(self, successors: "AnyTask" | list["AnyTask"]):
+        """Add the successor tasks.
+
+        Args:
+            successors (AnyTask | list[AnyTask]): A single successor task or
+                a list of successor tasks.
+        """
+        pass
+
+    @abstractmethod
+    def append_readiness_check(self, readiness_checks: "AnyTask" | list["AnyTask"]):
+        """Add the readiness_check tasks.
+
+        Args:
+            readiness_checks (AnyTask | list[AnyTask]): A single readiness_check task or
+                a list of readiness_check tasks.
+        """
+        pass
+
+    @abstractmethod
+    def append_upstream(self, upstreams: "AnyTask" | list["AnyTask"]):
+        """Add the upstream tasks that this task depends on.
 
         Args:
             upstreams (AnyTask | list[AnyTask]): A single upstream task or

zrb/task/base_task.py

@@ -38,6 +38,7 @@ class BaseTask(AnyTask):
         monitor_readiness: bool = False,
         upstream: list[AnyTask] | AnyTask | None = None,
         fallback: list[AnyTask] | AnyTask | None = None,
+        successor: list[AnyTask] | AnyTask | None = None,
     ):
         self._name = name
         self._color = color
@@ -50,6 +51,7 @@ class BaseTask(AnyTask):
         self._retry_period = retry_period
         self._upstreams = upstream
         self._fallbacks = fallback
+        self._successors = successor
         self._readiness_checks = readiness_check
         self._readiness_check_delay = readiness_check_delay
         self._readiness_check_period = readiness_check_period
@@ -65,17 +67,17 @@ class BaseTask(AnyTask):
     def __rshift__(self, other: AnyTask | list[AnyTask]) -> AnyTask:
         try:
             if isinstance(other, AnyTask):
-                other.append_upstreams(self)
+                other.append_upstream(self)
             elif isinstance(other, list):
                 for task in other:
-                    task.append_upstreams(self)
+                    task.append_upstream(self)
             return other
         except Exception as e:
             raise ValueError(f"Invalid operation {self} >> {other}: {e}")
 
     def __lshift__(self, other: AnyTask | list[AnyTask]) -> AnyTask:
         try:
-            self.append_upstreams(other)
+            self.append_upstream(other)
             return self
         except Exception as e:
             raise ValueError(f"Invalid operation {self} << {other}: {e}")
@@ -142,6 +144,44 @@ class BaseTask(AnyTask):
             return [self._fallbacks]
         return self._fallbacks
 
+    def append_fallback(self, fallbacks: AnyTask | list[AnyTask]):
+        fallback_list = [fallbacks] if isinstance(fallbacks, AnyTask) else fallbacks
+        for fallback in fallback_list:
+            self.__append_fallback(fallback)
+
+    def __append_fallback(self, fallback: AnyTask):
+        # Make sure self._fallbacks is a list
+        if self._fallbacks is None:
+            self._fallbacks = []
+        elif isinstance(self._fallbacks, AnyTask):
+            self._fallbacks = [self._fallbacks]
+        # Add fallback if it was not on self._fallbacks
+        if fallback not in self._fallbacks:
+            self._fallbacks.append(fallback)
+
+    @property
+    def successors(self) -> list[AnyTask]:
+        if self._successors is None:
+            return []
+        elif isinstance(self._successors, AnyTask):
+            return [self._successors]
+        return self._successors
+
+    def append_successor(self, successors: AnyTask | list[AnyTask]):
+        successor_list = [successors] if isinstance(successors, AnyTask) else successors
+        for successor in successor_list:
+            self.__append_successor(successor)
+
+    def __append_successor(self, successor: AnyTask):
+        # Make sure self._successors is a list
+        if self._successors is None:
+            self._successors = []
+        elif isinstance(self._successors, AnyTask):
+            self._successors = [self._successors]
+        # Add successor if it was not on self._successors
+        if successor not in self._successors:
+            self._successors.append(successor)
+
     @property
     def readiness_checks(self) -> list[AnyTask]:
         if self._readiness_checks is None:
@@ -150,6 +190,25 @@ class BaseTask(AnyTask):
             return [self._readiness_checks]
         return self._readiness_checks
 
+    def append_readiness_check(self, readiness_checks: AnyTask | list[AnyTask]):
+        readiness_check_list = (
+            [readiness_checks]
+            if isinstance(readiness_checks, AnyTask)
+            else readiness_checks
+        )
+        for readiness_check in readiness_check_list:
+            self.__append_readiness_check(readiness_check)
+
+    def __append_readiness_check(self, readiness_check: AnyTask):
+        # Make sure self._readiness_checks is a list
+        if self._readiness_checks is None:
+            self._readiness_checks = []
+        elif isinstance(self._readiness_checks, AnyTask):
+            self._readiness_checks = [self._readiness_checks]
+        # Add readiness_check if it was not on self._readiness_checks
+        if readiness_check not in self._readiness_checks:
+            self._readiness_checks.append(readiness_check)
+
     @property
     def upstreams(self) -> list[AnyTask]:
         if self._upstreams is None:
@@ -158,7 +217,7 @@ class BaseTask(AnyTask):
             return [self._upstreams]
         return self._upstreams
 
-    def append_upstreams(self, upstreams: AnyTask | list[AnyTask]):
+    def append_upstream(self, upstreams: AnyTask | list[AnyTask]):
         upstream_list = [upstreams] if isinstance(upstreams, AnyTask) else upstreams
         for upstream in upstream_list:
             self.__append_upstream(upstream)
@@ -374,6 +433,7 @@ class BaseTask(AnyTask):
                 # Put result on xcom
                 task_xcom: Xcom = ctx.xcom.get(self.name)
                 task_xcom.push(result)
+                await run_async(self.__exec_successors(session))
                 return result
             except (asyncio.CancelledError, KeyboardInterrupt):
                 ctx.log_info("Marked as failed")
@@ -390,6 +450,13 @@ class BaseTask(AnyTask):
                 await run_async(self.__exec_fallbacks(session))
                 raise e
 
+    async def __exec_successors(self, session: AnySession) -> Any:
+        successors: list[AnyTask] = self.successors
+        successor_coros = [
+            run_async(successor.exec_chain(session)) for successor in successors
+        ]
+        await asyncio.gather(*successor_coros)
+
     async def __exec_fallbacks(self, session: AnySession) -> Any:
         fallbacks: list[AnyTask] = self.fallbacks
         fallback_coros = [

{zrb-1.0.0a4.dist-info → zrb-1.0.0a6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zrb
-Version: 1.0.0a4
+Version: 1.0.0a6
 Summary: Your Automation Powerhouse
 Home-page: https://github.com/state-alchemists/zrb
 License: AGPL-3.0-or-later

{zrb-1.0.0a4.dist-info → zrb-1.0.0a6.dist-info}/RECORD

@@ -74,7 +74,7 @@ zrb/builtin/shell/autocomplete/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5
 zrb/builtin/shell/autocomplete/bash.py,sha256=-7YDVV7txgJH9mAYSYN0jmvUEeDIzWFvVNY-cY0myF8,1181
 zrb/builtin/shell/autocomplete/subcmd.py,sha256=WZI6cGWJcn80zSyxOHG7sCMO3Ucix3mZf4xm_xyB_Y0,606
 zrb/builtin/shell/autocomplete/zsh.py,sha256=9hlq0Wt3fhRz326mAQTypEd4_4lZdrbBx_3A-Ti3mvw,1022
-zrb/builtin/todo.py,sha256=tMz3ACo5TibJok9Dyw3T8rtSIFZYyL4ZdqXvL6sfmT8,6855
+zrb/builtin/todo.py,sha256=_mIKFD0Ah37yzDjn5-gbYvdbYLX4g5w4N2LKsz0JV6A,6809
 zrb/callback/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/callback/any_callback.py,sha256=Yhdv5UWHAZSVzj5K2JdxcVQx8x8VX8aZJEivj3NTfZc,247
 zrb/callback/callback.py,sha256=IQ7r9EnXYHHcNXKBJAk4WFqCqj7WDvflAuCyu5y-27I,849
@@ -112,7 +112,7 @@ zrb/input/str_input.py,sha256=NevZHX9rf1g8eMatPyy-kUX3DglrVAQpzvVpKAzf7bA,81
 zrb/input/text_input.py,sha256=te86xFpzIZnWb9xOeKHykNKTbY3pe1CdoaRCKr7UUQM,3054
 zrb/runner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/runner/cli.py,sha256=tM61thLwJNfjrHFVJqWmGuzE0MB273JZ8ANlROsKH1E,7024
-zrb/runner/web_app.py,sha256=Y44CxXCnsEjgGIDdGqTTzTF2M8hVojt5R_1-EcDEu-Q,6182
+zrb/runner/web_app.py,sha256=giULuphQhb_lJP95RiXm5i-Uk9MrnIrSXhRVLK73-8s,5987
 zrb/runner/web_controller/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/runner/web_controller/group_info_ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/runner/web_controller/group_info_ui/controller.py,sha256=sI1UKnRcr5K-a_lGMm5H54hbhdQwIMLlXYmwfxoIqSY,2831
@@ -149,8 +149,8 @@ zrb/session_state_logger/any_session_state_logger.py,sha256=W_G1fCw9ZVj4LRTplTpB
 zrb/session_state_logger/default_session_state_logger.py,sha256=w_cAaNUg1ZmJk-ge1kh3xtag3SApC3ZdB3VbxUvU5Ro,197
 zrb/session_state_logger/file_session_state_logger.py,sha256=0lMtx7Othu4-jhL_iDHFbZWF_5HX84StU134QNCVgeQ,3753
 zrb/task/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-zrb/task/any_task.py,sha256=QCuFCDXmfzvS09SWN1uFGUHheJlkKkii5oZDjO3s9tA,3896
-zrb/task/base_task.py,sha256=pXFhZ0aJNdGXBBnOLSNiAXQ9MCRIpuqjB-Yfn_t8MB8,16293
+zrb/task/any_task.py,sha256=9rCdKe-Sayr34Han9AsbhRxFpkbk6Rteg1DOyETulwQ,4917
+zrb/task/base_task.py,sha256=Vn_MTR5aa3jIEWmh5LXpzezh-JwaEXPbjGKptx-Q-U8,19161
 zrb/task/base_trigger.py,sha256=milE5BNeIeq8jGCP38qTfstSvrc0CkSnO2sV-vlhzsM,4491
 zrb/task/cmd_task.py,sha256=3N3pyvz7qZ8lDB9pxGVFvfpubE33hXo48UKSmuZDGc0,10249
 zrb/task/http_check.py,sha256=TwQCql3589a4-H2c7hgS1HayyU-NdBAdJ4qQNTvjXHM,2474
@@ -191,7 +191,7 @@ zrb/util/string/name.py,sha256=8picJfUBXNpdh64GNaHv3om23QHhUZux7DguFLrXHp8,1163
 zrb/util/todo.py,sha256=Nbe1a-7O5FSkIE7BZxQQt7AhbHFPDbreJJI6C7Rga4o,9171
 zrb/xcom/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/xcom/xcom.py,sha256=P4aYHdE3FRsTsNrXGyW8N44IWZjw-vG_qys1Ymn3aBg,1572
-zrb-1.0.0a4.dist-info/METADATA,sha256=sasI6wQ_ZB5ckHwgVeKkOjrpvjN_O_whxw6sBHyJHr8,4105
-zrb-1.0.0a4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-zrb-1.0.0a4.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
-zrb-1.0.0a4.dist-info/RECORD,,
+zrb-1.0.0a6.dist-info/METADATA,sha256=iCUlGjhUx7-sUKffDJns3kMgzyt1GblHKpkUEjDn39U,4105
+zrb-1.0.0a6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+zrb-1.0.0a6.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
+zrb-1.0.0a6.dist-info/RECORD,,