zrb 0.0.72__py3-none-any.whl → 0.0.73__py3-none-any.whl

zrb/task/base_task.py

@@ -344,56 +344,70 @@ class TaskModel(
             if override or key not in self._env_map:
                 self._env_map[key] = val
 
-    def render_any(self, val: Any) -> Any:
+    def render_any(
+        self, val: Any, data: Optional[Mapping[str, Any]] = None
+    ) -> Any:
         if isinstance(val, str):
-            return self.render_str(val)
+            return self.render_str(val, data)
         return val
 
-    def render_float(self, val: Union[str, float]) -> float:
+    def render_float(
+        self, val: Union[str, float], data: Optional[Mapping[str, Any]] = None
+    ) -> float:
         if isinstance(val, str):
-            return float(self.render_str(val))
+            return float(self.render_str(val, data))
         return val
 
-    def render_int(self, val: Union[str, int]) -> int:
+    def render_int(
+        self, val: Union[str, int], data: Optional[Mapping[str, Any]] = None
+    ) -> int:
         if isinstance(val, str):
-            return int(self.render_str(val))
+            return int(self.render_str(val, data))
         return val
 
-    def render_bool(self, val: Union[str, bool]) -> bool:
+    def render_bool(
+        self, val: Union[str, bool], data: Optional[Mapping[str, Any]] = None
+    ) -> bool:
         if isinstance(val, str):
-            return to_boolean(self.render_str(val))
+            return to_boolean(self.render_str(val, data))
         return val
 
-    def render_str(self, val: str) -> str:
+    def render_str(
+        self, val: str, data: Optional[Mapping[str, Any]] = None
+    ) -> str:
         if val in self._rendered_str:
             return self._rendered_str[val]
         if not is_probably_jinja(val):
             return val
         template = jinja2.Template(val)
-        data = self._get_render_data()
-        self.log_debug(f'Render string template: {val}, with data: {data}')
+        render_data = self._get_render_data(additional_data=data)
+        self.log_debug(f'Render string: {val}, with data: {render_data}')
         try:
-            rendered_text = template.render(data)
+            rendered_text = template.render(render_data)
             self.log_debug(f'Get rendered result: {rendered_text}')
         except Exception:
-            raise Exception(f'Fail to render "{val}" with data: {data}')
+            raise Exception(f'Fail to render "{val}" with data: {render_data}')
         self._rendered_str[val] = rendered_text
         return rendered_text
 
-    def render_file(self, location: str) -> str:
+    def render_file(
+        self, location: str, data: Optional[Mapping[str, Any]] = None
+    ) -> str:
         location_dir = os.path.dirname(location)
         env = jinja2.Environment(
             loader=AnyExtensionFileSystemLoader([location_dir])
         )
         template = env.get_template(location)
-        data = self._get_render_data()
-        data['TEMPLATE_DIR'] = location_dir
-        self.log_debug(f'Render template file: {template}, with data: {data}')
-        rendered_text = template.render(data)
+        render_data = self._get_render_data(additional_data=data)
+        render_data['TEMPLATE_DIR'] = location_dir
+        self.log_debug(f'Render template: {template} with data: {render_data}')
+        rendered_text = template.render(render_data)
         self.log_debug(f'Get rendered result: {rendered_text}')
         return rendered_text
 
-    def _get_render_data(self) -> Mapping[str, Any]:
+    def _get_render_data(
+        self, additional_data: Optional[Mapping[str, Any]] = None
+    ) -> Mapping[str, Any]:
         if self._render_data is not None:
             return self._render_data
         render_data = dict(DEFAULT_RENDER_DATA)
@@ -401,6 +415,8 @@ class TaskModel(
             'env': self._env_map,
             'input': self._input_map,
         })
+        if additional_data is not None:
+            render_data.update(additional_data)
         self._render_data = render_data
         return render_data
 
@@ -565,7 +581,7 @@ class BaseTask(TaskModel):
 
     def get_upstreams(self) -> Iterable[TTask]:
         return self._upstreams
-    
+
     def add_upstreams(self, *upstreams: TTask):
         if not self._can_add_upstream:
             raise Exception(f'Cannot add upstreams on `{self._name}`')

zrb/task/docker_compose_task.py

@@ -257,4 +257,4 @@ class DockerComposeTask(CmdTask):
             f'docker compose {options} {self._compose_cmd} {flags} {args}',
         ])
         self.log_info(f'Command: {cmd_str}')
-        return cmd_str
+        return cmd_str

{zrb-0.0.72.dist-info → zrb-0.0.73.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zrb
-Version: 0.0.72
+Version: 0.0.73
 Summary: Your faithful companion
 Author-email: Go Frendi Gunawan <gofrendiasgard@gmail.com>
 Requires-Python: >=3.8

{zrb-0.0.72.dist-info → zrb-0.0.73.dist-info}/RECORD

@@ -618,10 +618,10 @@ zrb/helper/string/double_quote.py,sha256=uYIdgotgVvMWxffJhrgb1TQI5v1-QdA0UByE2xG
 zrb/helper/string/jinja.py,sha256=yXX79mYJ-s1wRqGJpms1xKTrZE6Ts_OE_YDLIazrBvI,261
 zrb/helper/string/parse_replacement.py,sha256=g4GHaZqncBIZyyZrcZJtylz6gySEU18A27S4XPTEDEI,222
 zrb/task/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-zrb/task/base_task.py,sha256=-OwBMPVmSQt6-sUcGj2vqheh-IXB9k7Gf6kcQrd1JIc,30033
+zrb/task/base_task.py,sha256=Cauf0Gaak9a0rpxxwCivSmQBWiAHk7ara4mXxAb3wJE,30625
 zrb/task/cmd_task.py,sha256=LBCukVTK-1FQG58JHRyyPEeguFl5q-xy27hns7NlvNM,8612
 zrb/task/decorator.py,sha256=xw2iE_nin5FEOxtkUy-1j1Dr_h4_Iy3VyCX9ngcaFiA,1590
-zrb/task/docker_compose_task.py,sha256=r6ZHpO0d8UApcUCWQOgIrRqciVED9URRahApSF1rArQ,10451
+zrb/task/docker_compose_task.py,sha256=dTJ3d61P235QvGIB3pLwZiZo2LQ1rYYurO8haWc4nTs,10452
 zrb/task/flow_task.py,sha256=SV8qZ69wQjsqdKYdRO3GeNzV0PKzZpXb-UYppmQnvXg,5101
 zrb/task/http_checker.py,sha256=POMrs_kswhOPICXE8mxthI2vmHXP1lGw9VRnVlf06xg,4515
 zrb/task/path_checker.py,sha256=4GaqHVRdk4LHVJOoxs9e9fGXrBP8U7qZMRkcr-LqVZU,2875
@@ -640,8 +640,8 @@ zrb/task_input/input.py,sha256=I4KrdJR3muxAWgd8zX6CErogHYcFM80Si0DmC5-YJGE,69
 zrb/task_input/int_input.py,sha256=YTxeRvHGe60hUto3vGtjA3GVLsR2zPtlIca20XO_94A,1568
 zrb/task_input/password_input.py,sha256=-ygMqy3JoHtZB5aA7uwlwgntFBJKBasfP3eX9iaOxKE,1521
 zrb/task_input/str_input.py,sha256=RUw5zTUDAo1kyl5kcUpXyk073xh09N04D41PmH76RVk,1568
-zrb-0.0.72.dist-info/entry_points.txt,sha256=xTgXc1kBKYhJHEujdaSPHUcJT3-hbyP1mLgwkv-5sSk,40
-zrb-0.0.72.dist-info/LICENSE,sha256=hVM_U_SOdNZ9mLpaAZ5qn3HRXQXucGX9rliGPEifzVs,1073
-zrb-0.0.72.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-zrb-0.0.72.dist-info/METADATA,sha256=tIDHkNz6NvZyhpm9PwGt8dojBWWluaAOn9b0v5aP-Og,8574
-zrb-0.0.72.dist-info/RECORD,,
+zrb-0.0.73.dist-info/entry_points.txt,sha256=xTgXc1kBKYhJHEujdaSPHUcJT3-hbyP1mLgwkv-5sSk,40
+zrb-0.0.73.dist-info/LICENSE,sha256=hVM_U_SOdNZ9mLpaAZ5qn3HRXQXucGX9rliGPEifzVs,1073
+zrb-0.0.73.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
+zrb-0.0.73.dist-info/METADATA,sha256=t8XtpN_RCnKUx_GS9Oa2aChvOP07hCfOpjPz_xFTZTo,8574
+zrb-0.0.73.dist-info/RECORD,,