zrb 0.18.0__py3-none-any.whl → 0.18.1__py3-none-any.whl

zrb/task/any_task.py

@@ -568,6 +568,13 @@ class AnyTask(ABC):
         """
         pass
 
+    @abstractmethod
+    def _lock_checkers(self):
+        """
+        Lock checkers so that it cannot be altered anymore
+        """
+        pass
+
     @abstractmethod
     def _lock_upstreams(self):
         """

zrb/task/base_task/base_task.py

@@ -467,10 +467,9 @@ class BaseTask(FinishTracker, AttemptTracker, Renderer, BaseTaskModel, AnyTask):
                 )
             )
         # set checker keyval
+        self._lock_checkers()
         checker_coroutines = []
         for checker_task in self._get_checkers():
-            checker_task.add_input(*self._get_inputs())
-            checker_task.add_env(*self._get_envs())
             checker_coroutines.append(
                 asyncio.create_task(
                     checker_task._set_keyval(kwargs=new_kwargs, env_prefix=env_prefix)

zrb/task/base_task/component/common_task_model.py

@@ -65,6 +65,11 @@ class CommonTaskModel:
         self._group = group
         if group is not None:
             group._add_task(self)
+        checkers_cp: List[AnyTask] = [checker.copy() for checker in checkers]
+        for checker in checkers_cp:
+            checker.add_env(*envs)
+            checker.add_env_file(*env_files)
+            checker.add_input(*inputs)
         self._description = coalesce_str(description, name)
         self._inputs = inputs
         self._envs = envs
@@ -75,7 +80,7 @@ class CommonTaskModel:
         self._retry_interval = retry_interval
         self._upstreams = upstreams
         self._fallbacks = fallbacks
-        self._checkers = [checker.copy() for checker in checkers]
+        self._checkers = checkers_cp
         self._checking_interval = checking_interval
         self._run_function: Optional[Callable[..., Any]] = run
         self._on_triggered = on_triggered
@@ -101,6 +106,9 @@ class CommonTaskModel:
         self.__has_already_inject_fallbacks: bool = False
         self.__all_inputs: Optional[List[AnyInput]] = None
 
+    def _lock_checkers(self):
+        self.__allow_add_checkers = False
+
     def _lock_upstreams(self):
         self.__allow_add_upstreams = False
 
@@ -164,11 +172,15 @@ class CommonTaskModel:
         if not self.__allow_add_inputs:
             raise Exception(f"Cannot insert inputs for `{self.get_name()}`")
         self._inputs = list(inputs) + list(self._inputs)
+        for checker in self._get_checkers():
+            checker.insert_input(*inputs)
 
     def add_input(self, *inputs: AnyInput):
         if not self.__allow_add_inputs:
             raise Exception(f"Cannot add inputs for `{self.get_name()}`")
         self._inputs = list(self._inputs) + list(inputs)
+        for checker in self._get_checkers():
+            checker.add_input(*inputs)
 
     def inject_inputs(self):
         pass
@@ -219,11 +231,15 @@ class CommonTaskModel:
         if not self.__allow_add_envs:
             raise Exception(f"Cannot insert envs to `{self.get_name()}`")
         self._envs = list(envs) + list(self._envs)
+        for checker in self._get_checkers():
+            checker.insert_env(*envs)
 
     def add_env(self, *envs: Env):
         if not self.__allow_add_envs:
             raise Exception(f"Cannot add envs to `{self.get_name()}`")
         self._envs = list(self._envs) + list(envs)
+        for checker in self._get_checkers():
+            checker.add_env(*envs)
 
     def inject_envs(self):
         pass
@@ -255,11 +271,15 @@ class CommonTaskModel:
         if not self.__allow_add_env_files:
             raise Exception(f"Cannot insert env_files to `{self.get_name()}`")
         self._env_files = list(env_files) + list(self._env_files)
+        for checker in self._get_checkers():
+            checker.insert_env_file(*env_files)
 
     def add_env_file(self, *env_files: EnvFile):
         if not self.__allow_add_env_files:
             raise Exception(f"Cannot add env_files to `{self.get_name()}`")
         self._env_files = list(self._env_files) + list(env_files)
+        for checker in self._get_checkers():
+            checker.add_env_file(*env_files)
 
     def inject_env_files(self):
         pass
@@ -317,15 +337,26 @@ class CommonTaskModel:
     def insert_checker(self, *checkers: AnyTask):
         if not self.__allow_add_checkers:
             raise Exception(f"Cannot insert checkers to `{self.get_name()}`")
-        additional_checkers = [checker.copy() for checker in checkers]
+        additional_checkers = self.__complete_new_checkers(checkers)
         self._checkers = additional_checkers + self._checkers
 
     def add_checker(self, *checkers: AnyTask):
         if not self.__allow_add_checkers:
             raise Exception(f"Cannot add checkers to `{self.get_name()}`")
-        additional_checkers = [checker.copy() for checker in checkers]
+        additional_checkers = self.__complete_new_checkers(checkers)
         self._checkers = self._checkers + additional_checkers
 
+    def __complete_new_checkers(self, new_checkers: List[AnyTask]) -> List[AnyTask]:
+        """
+        For internal use: copy and completing new checkers
+        """
+        checkers: List[AnyTask] = [checker.copy() for checker in new_checkers]
+        for checker in checkers:
+            checker.add_input(*self._get_inputs())
+            checker.add_env(*self._get_envs())
+            checker.add_env_file(*self._get_env_files())
+        return checkers
+
     def inject_checkers(self):
         pass
 

zrb/task/cmd_task.py

@@ -1,5 +1,6 @@
 import asyncio
 import atexit
+import logging
 import os
 import pathlib
 import signal
@@ -7,7 +8,7 @@ import subprocess
 import sys
 import time
 
-from zrb.config.config import default_shell
+from zrb.config.config import default_shell, logging_level
 from zrb.helper.accessories.color import colored
 from zrb.helper.log import logger
 from zrb.helper.typecheck import typechecked
@@ -55,6 +56,18 @@ def _reset_stty():
             _has_stty = False
 
 
+def _log_error(message: Any):
+    if logging_level > logging.ERROR:
+        return
+    colored_message = colored(f"{message}", color="red", attrs=["bold"])
+    logger.error(colored_message, exc_info=True)
+
+
+def _print_out_dark(message: Any):
+    message_str = f"{message}"
+    print(colored(message_str, attrs=["dark"]), file=sys.stderr)
+
+
 CmdVal = Union[
     JinjaTemplate,
     Iterable[JinjaTemplate],
@@ -272,7 +285,7 @@ class CmdTask(BaseTask):
     def __on_kill(self, signum: Any, frame: Any):
         self._global_state.no_more_attempt = True
         self._global_state.is_killed_by_signal = True
-        self.print_out_dark(f"Getting signal {signum}")
+        _print_out_dark(f"Getting signal {signum}")
         for pid in self._pids:
             self.__kill_by_pid(pid)
         tasks = asyncio.all_tasks()
@@ -282,7 +295,7 @@ class CmdTask(BaseTask):
             except Exception as e:
                 self.print_err(e)
         time.sleep(0.3)
-        self.print_out_dark(f"Exiting with signal {signum}")
+        _print_out_dark(f"Exiting with signal {signum}")
         sys.exit(signum)
 
     def __on_exit(self):
@@ -297,20 +310,20 @@ class CmdTask(BaseTask):
             process_ever_exists = False
             if self.__is_process_exist(pid):
                 process_ever_exists = True
-                self.print_out_dark(f"Send SIGTERM to process {pid}")
+                _print_out_dark(f"Send SIGTERM to process {pid}")
                 os.killpg(os.getpgid(pid), signal.SIGTERM)
                 time.sleep(0.3)
             if self.__is_process_exist(pid):
-                self.print_out_dark(f"Send SIGINT to process {pid}")
+                _print_out_dark(f"Send SIGINT to process {pid}")
                 os.killpg(os.getpgid(pid), signal.SIGINT)
                 time.sleep(0.3)
             if self.__is_process_exist(pid):
-                self.print_out_dark(f"Send SIGKILL to process {pid}")
+                _print_out_dark(f"Send SIGKILL to process {pid}")
                 os.killpg(os.getpgid(pid), signal.SIGKILL)
             if process_ever_exists:
-                self.print_out_dark(f"Process {pid} is killed successfully")
+                _print_out_dark(f"Process {pid} is killed successfully")
         except Exception:
-            self.log_error(f"Cannot kill process {pid}")
+            _log_error(f"Cannot kill process {pid}")
 
     def __is_process_exist(self, pid: int) -> bool:
         try:

{zrb-0.18.0.dist-info → zrb-0.18.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zrb
-Version: 0.18.0
+Version: 0.18.1
 Summary: A Framework to Enhance Your Workflow
 Home-page: https://github.com/state-alchemists/zrb
 License: AGPL-3.0-or-later

{zrb-0.18.0.dist-info → zrb-0.18.1.dist-info}/RECORD

@@ -1355,19 +1355,19 @@ zrb/shell-scripts/notify.ps1,sha256=6_xPoIwuxARpYljcjVV-iRJS3gJqGfx-B6kj719cJ9o,
 zrb/shell-scripts/rsync-util.sh,sha256=QzdhSBvUNMxB4U2B4m0Dxg9czGckRjB7Vk4A1ObG0-k,353
 zrb/shell-scripts/ssh-util.sh,sha256=9lXDzw6oO8HuA4vdbfps_uQMMwKyNYX9fZkZgpK52g8,401
 zrb/task/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-zrb/task/any_task.py,sha256=hrgsYikSe_C6JDSWeHNGCCvefNrkVioJWUunrqSFGLE,39199
+zrb/task/any_task.py,sha256=nKcCj_RbSC-MUSi4rxcIAC2eEFo7uKwODkgglxp3mj8,39346
 zrb/task/any_task_event_handler.py,sha256=AjTC6lIcprutRusNBGl83EifQe4TbZzxdlVIR4ndWN4,524
 zrb/task/base_remote_cmd_task.py,sha256=q2Kwo5OMahL5gPSxwp_9zZLYouFfFc6Ru_p6ApOI-pk,12124
 zrb/task/base_task/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-zrb/task/base_task/base_task.py,sha256=IvOBbuzIHLWP3RrlkK0NZXa1L7XlO1m0uLEYIxJt8sU,20388
+zrb/task/base_task/base_task.py,sha256=rPWMIBNnNtwn0q3VEUDw3HfbSPWtww_lyOA3rUh5aq0,20310
 zrb/task/base_task/component/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/task/base_task/component/base_task_model.py,sha256=i6TrtTusZ71ZnOnx8yM0aJl8uF6R1hKdAf62bEdpdCs,10379
-zrb/task/base_task/component/common_task_model.py,sha256=h81BGqplsaWJCQl0Zigl24LLkCUKPEfJikSbITREQnM,12288
+zrb/task/base_task/component/common_task_model.py,sha256=OaliFPkL9HQPuoMBsmmVkJ6xxyQd3GoTJS0u5LaVeNk,13538
 zrb/task/base_task/component/pid_model.py,sha256=RjJIqOpavucDssnd3q3gT4q8QnP8I9SUdlv1b9pR7kU,292
 zrb/task/base_task/component/renderer.py,sha256=9wP2IW811Ta81IoPWmeQ7yVc7eG-uaSnOVbEyeaOIuk,4439
 zrb/task/base_task/component/trackers.py,sha256=c5xhZ6agICxKPI5Va1sn66_9OqC92ebF5CNhcwVUNUE,2074
 zrb/task/checker.py,sha256=raYNBHgeyEqkyfBRsPPgSV7ukEfMlJOCUn97WQNl6mU,3384
-zrb/task/cmd_task.py,sha256=Bfu29x5Cy10gCazIItCEOzrafU7r7z5WlWS4_wD7Znk,14184
+zrb/task/cmd_task.py,sha256=z20xSsFTjnMToTgORzToKRn8_AwubLC0Sm6b-3z58_c,14526
 zrb/task/decorator.py,sha256=stxrl6aXbuUDK83lVf8m8uni3Ii6egLl0TCR0vxslUQ,3064
 zrb/task/docker_compose_task.py,sha256=hUKF7W3GwxFuEWmlPPFxa7h8npEnig2sm7KjlidHFBI,14911
 zrb/task/flow_task.py,sha256=QBOoyIrqc6ToSf3RF8xu8h4yxCWCerUAu2Ba0GxAqgg,5147
@@ -1403,8 +1403,8 @@ zrb/task_input/int_input.py,sha256=d2fXcm5fCo09472eMAm6PdzLQD82ZBV9ARq5CjKepAo,4
 zrb/task_input/password_input.py,sha256=g_g8ZWAzDaHx4h2EHY3UCGvTigC6esAUBzXU0T9nDUk,4192
 zrb/task_input/str_input.py,sha256=BNflOhrJvST9bWK0rGdCi7C7y-QDvHj9ISQMRmujIWU,4200
 zrb/task_input/task_input.py,sha256=DcHgKie5Oo1sUxj41t1ZQjCIK1aAfTgGzaKr7_ap7ZI,2248
-zrb-0.18.0.dist-info/LICENSE,sha256=WfnGCl8G60EYOPAEkuc8C9m9pdXWDe08NsKj3TBbxsM,728
-zrb-0.18.0.dist-info/METADATA,sha256=qEsdwPUflSN8YiBhgngtzvaQLXQemLtihXgGeSpKyPk,17076
-zrb-0.18.0.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-zrb-0.18.0.dist-info/entry_points.txt,sha256=xTgXc1kBKYhJHEujdaSPHUcJT3-hbyP1mLgwkv-5sSk,40
-zrb-0.18.0.dist-info/RECORD,,
+zrb-0.18.1.dist-info/LICENSE,sha256=WfnGCl8G60EYOPAEkuc8C9m9pdXWDe08NsKj3TBbxsM,728
+zrb-0.18.1.dist-info/METADATA,sha256=RnbEITp7ykt9BYdrmFaPEX71dBHXmFfVvL3n8ble_jA,17076
+zrb-0.18.1.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+zrb-0.18.1.dist-info/entry_points.txt,sha256=xTgXc1kBKYhJHEujdaSPHUcJT3-hbyP1mLgwkv-5sSk,40
+zrb-0.18.1.dist-info/RECORD,,