zrb 0.27.1__py3-none-any.whl → 0.28.1__py3-none-any.whl

zrb/action/runner.py

@@ -1,4 +1,3 @@
-import sys
 from collections.abc import Callable, Mapping
 from typing import Any, Union
 
@@ -122,7 +121,6 @@ class Runner:
                 function(*args, **kwargs)
             except Exception:
                 stop_asyncio_sync()
-                sys.exit(1)
             finally:
                 task.clear_xcom()
 

zrb/builtin/devtool/install/zsh/install.sh

@@ -48,7 +48,7 @@ fi
 if command_exists chsh
 then
     log_info "Changing default shell to zsh..."
-     try_sudo chsh -s zsh
+    chsh -s $(which zsh)
 else
     log_info "chsh command not found. Please change the default shell manually."
 fi

zrb/builtin/git/get_file_changes.py

@@ -16,12 +16,19 @@ from zrb.task_input.str_input import StrInput
     description="Get modified files",
     inputs=[
         StrInput(
-            name="commit",
+            name="current-commit",
             shortcut="c",
-            description="commit hash/tag",
-            prompt="Commit hash/Tag",
+            description="current commit hash/tag",
+            prompt="Current commit hash/Tag",
             default="HEAD",
         ),
+        StrInput(
+            name="source-commit",
+            shortcut="s",
+            description="source commit hash/tag",
+            prompt="Source commit hash/Tag",
+            default="main",
+        ),
         BoolInput(
             name="include-new",
             description="include new files",
@@ -44,11 +51,12 @@ from zrb.task_input.str_input import StrInput
     runner=runner,
 )
 async def get_git_file_changes(*args: Any, **kwargs: Any):
-    commit = kwargs.get("commit", "HEAD")
+    current_commit = kwargs.get("current_commit", "HEAD")
+    source_commit = kwargs.get("source_commit", "main")
     include_new = kwargs.get("include_new", True)
     include_removed = kwargs.get("include_removed", True)
     include_updated = kwargs.get("include_updated", True)
-    modified_file_states = get_modified_file_states(commit)
+    modified_file_states = get_modified_file_states(current_commit, source_commit)
     modified_file_keys = []
     output = []
     for modified_file, state in modified_file_states.items():

zrb/builtin/project/add/fastapp/app/template/_automate/snake_zrb_app_name/container/microservices/start.py

@@ -21,7 +21,6 @@ from .._input import enable_monitoring_input
 from .._service_config import snake_zrb_app_name_service_configs
 from ..remove import remove_snake_zrb_app_name_container
 from ._group import snake_zrb_app_name_microservices_container_group
-from ._helper import activate_microservices_compose_profile
 
 start_snake_zrb_app_name_microservices_container = DockerComposeStartTask(
     icon="🐳",
@@ -38,7 +37,13 @@ start_snake_zrb_app_name_microservices_container = DockerComposeStartTask(
     should_execute="{{ input.local_snake_zrb_app_name}}",
     upstreams=[build_snake_zrb_app_name_image, remove_snake_zrb_app_name_container],
     cwd=RESOURCE_DIR,
-    setup_cmd=activate_microservices_compose_profile,
+    compose_profiles=[
+        '{{"postgres" if env.APP_DB_CONNECTION.startswith("postgresql") else ""}}',
+        '{{"kafka" if env.APP_BROKER_TYPE == "kafka" else ""}}',
+        '{{"rabbitmq" if env.APP_BROKER_TYPE == "rabbitmq" else ""}}',
+        '{{"monitoring" if input.enable_snake_zrb_app_name_monitoring else ""}}',
+        "microservices",
+    ],
     compose_env_prefix="CONTAINER_ZRB_ENV_PREFIX",
     compose_service_configs=snake_zrb_app_name_service_configs,
     env_files=[compose_env_file],

zrb/builtin/project/add/fastapp/app/template/_automate/snake_zrb_app_name/container/monolith/start.py

@@ -21,7 +21,6 @@ from .._input import enable_monitoring_input
 from .._service_config import snake_zrb_app_name_service_configs
 from ..remove import remove_snake_zrb_app_name_container
 from ._group import snake_zrb_app_name_monolith_container_group
-from ._helper import activate_monolith_compose_profile
 
 start_snake_zrb_app_name_monolith_container = DockerComposeStartTask(
     icon="🐳",
@@ -38,7 +37,13 @@ start_snake_zrb_app_name_monolith_container = DockerComposeStartTask(
     should_execute="{{ input.local_snake_zrb_app_name}}",
     upstreams=[build_snake_zrb_app_name_image, remove_snake_zrb_app_name_container],
     cwd=RESOURCE_DIR,
-    setup_cmd=activate_monolith_compose_profile,
+    compose_profiles=[
+        '{{"postgres" if env.APP_DB_CONNECTION.startswith("postgresql") else ""}}',
+        '{{"kafka" if env.APP_BROKER_TYPE == "kafka" else ""}}',
+        '{{"rabbitmq" if env.APP_BROKER_TYPE == "rabbitmq" else ""}}',
+        '{{"monitoring" if input.enable_snake_zrb_app_name_monitoring else ""}}',
+        "monolith",
+    ],
     compose_env_prefix="CONTAINER_ZRB_ENV_PREFIX",
     compose_service_configs=snake_zrb_app_name_service_configs,
     env_files=[compose_env_file],

zrb/builtin/project/add/fastapp/app/template/_automate/snake_zrb_app_name/container/remove.py

@@ -5,7 +5,6 @@ from .._constant import RESOURCE_DIR
 from ..image._env import image_env
 from ._env import compose_env_file
 from ._group import snake_zrb_app_name_container_group
-from ._helper import activate_all_compose_profile
 from ._service_config import snake_zrb_app_name_service_configs
 
 remove_snake_zrb_app_name_container = DockerComposeTask(
@@ -14,8 +13,15 @@ remove_snake_zrb_app_name_container = DockerComposeTask(
     description="Remove human readable zrb app name container",
     group=snake_zrb_app_name_container_group,
     cwd=RESOURCE_DIR,
-    setup_cmd=activate_all_compose_profile,
     compose_cmd="down",
+    compose_profiles=[
+        "postgres",
+        "kafka",
+        "rabbitmq",
+        "monitoring",
+        "monolith",
+        "microservices",
+    ],
     compose_env_prefix="CONTAINER_ZRB_ENV_PREFIX",
     compose_service_configs=snake_zrb_app_name_service_configs,
     env_files=[compose_env_file],

zrb/builtin/project/add/fastapp/app/template/_automate/snake_zrb_app_name/container/stop.py

@@ -5,7 +5,6 @@ from .._constant import RESOURCE_DIR
 from ..image._env import image_env
 from ._env import compose_env_file, host_port_env
 from ._group import snake_zrb_app_name_container_group
-from ._helper import activate_all_compose_profile
 from ._service_config import snake_zrb_app_name_service_configs
 
 stop_snake_zrb_app_name_container = DockerComposeTask(
@@ -14,8 +13,15 @@ stop_snake_zrb_app_name_container = DockerComposeTask(
     description="Stop human readable zrb app name container",
     group=snake_zrb_app_name_container_group,
     cwd=RESOURCE_DIR,
-    setup_cmd=activate_all_compose_profile,
     compose_cmd="stop",
+    compose_profiles=[
+        "postgres",
+        "kafka",
+        "rabbitmq",
+        "monitoring",
+        "monolith",
+        "microservices",
+    ],
     compose_env_prefix="CONTAINER_ZRB_ENV_PREFIX",
     compose_service_configs=snake_zrb_app_name_service_configs,
     env_files=[compose_env_file],

zrb/builtin/project/add/fastapp/app/template/_automate/snake_zrb_app_name/container/support/start.py

@@ -17,7 +17,6 @@ from .._input import enable_monitoring_input
 from .._service_config import snake_zrb_app_name_service_configs
 from ..remove import remove_snake_zrb_app_name_container
 from ._group import snake_zrb_app_name_support_container_group
-from ._helper import activate_support_compose_profile, should_start_support_container
 
 start_snake_zrb_app_name_support_container = DockerComposeStartTask(
     icon="🐳",
@@ -31,10 +30,23 @@ start_snake_zrb_app_name_support_container = DockerComposeStartTask(
         https_input,
         image_input,
     ],
-    should_execute=should_start_support_container,
     upstreams=[remove_snake_zrb_app_name_container],
     cwd=RESOURCE_DIR,
-    setup_cmd=activate_support_compose_profile,
+    should_execute=" ".join(
+        [
+            "{{",
+            'env.APP_DB_CONNECTION.startswith("postgresql")',
+            'or env.APP_BROKER_TYPE in ("kafka", "rabbitmq")',
+            "or input.enable_snake_zrb_app_name_monitoring",
+            "}}",
+        ]
+    ),
+    compose_profiles=[
+        '{{"postgres" if env.APP_DB_CONNECTION.startswith("postgresql") else ""}}',
+        '{{"kafka" if env.APP_BROKER_TYPE == "kafka" else ""}}',
+        '{{"rabbitmq" if env.APP_BROKER_TYPE == "rabbitmq" else ""}}',
+        '{{"monitoring" if input.enable_snake_zrb_app_name_monitoring else ""}}',
+    ],
     compose_env_prefix="CONTAINER_ZRB_ENV_PREFIX",
     compose_service_configs=snake_zrb_app_name_service_configs,
     env_files=[compose_env_file],

zrb/config/config.py

@@ -18,12 +18,6 @@ def _get_current_shell() -> str:
     return "bash"
 
 
-def _get_valid_container_backend(container_backend: str) -> str:
-    if container_backend.lower().strip() == "podman":
-        return "podman"
-    return "docker"
-
-
 def _get_default_tmp_dir() -> str:
     if os.path.isdir("/tmp"):
         return "/tmp"
@@ -52,7 +46,4 @@ SHOW_ADVERTISEMENT = untyped_to_boolean(os.getenv("ZRB_SHOW_ADVERTISEMENT", "1")
 SHOW_PROMPT = untyped_to_boolean(os.getenv("ZRB_SHOW_PROMPT", "1"))
 SHOW_TIME = untyped_to_boolean(os.getenv("ZRB_SHOW_TIME", "1"))
 VERSION = _get_version()
-CONTAINER_BACKEND = _get_valid_container_backend(
-    os.getenv("ZRB_CONTAINER_BACKEND", "docker")
-)
 ENABLE_TYPE_CHECKING = untyped_to_boolean(os.getenv("ZRB_ENABLE_TYPE_CHECKING", "1"))

zrb/helper/asyncio_task.py

@@ -1,4 +1,5 @@
 import asyncio
+import sys
 
 from zrb.helper.accessories.color import colored
 from zrb.helper.log import logger
@@ -6,11 +7,22 @@ from zrb.helper.log import logger
 logger.debug(colored("Loading zrb.helper.asyncio_task", attrs=["dark"]))
 
 
+def _surpress_event_loop_error(unraisable):
+    if not (
+        isinstance(unraisable.exc_value, RuntimeError)
+        and str(unraisable.exc_value) == "Event loop is closed"
+    ):
+        # Raise exception for anything except "event loop is closed"
+        sys.__unraisablehook__(unraisable)
+
+
+sys.unraisablehook = _surpress_event_loop_error
+
+
 async def stop_asyncio():
     tasks = [task for task in asyncio.all_tasks() if task is not asyncio.current_task()]
     for task in tasks:
         task.cancel()
-
     # Wait until all tasks are cancelled
     await asyncio.gather(*tasks, return_exceptions=True)
 
@@ -20,7 +32,5 @@ def stop_asyncio_sync():
         loop = asyncio.get_event_loop()
         if loop.is_running():
             loop.create_task(stop_asyncio())
-        else:
-            loop.run_until_complete(stop_asyncio())
-    except Exception:
-        pass
+    except asyncio.CancelledError:
+        logger.warning("Task is cancelled")

zrb/helper/git/detect_changes.py

@@ -16,8 +16,13 @@ class ModificationState:
 
 
 @typechecked
-def get_modified_file_states(commit: str) -> Mapping[str, ModificationState]:
-    exit_status, output = subprocess.getstatusoutput(f"git show {commit}")
+def get_modified_file_states(
+    current_commit: str, source_commit: str = "main"
+) -> Mapping[str, ModificationState]:
+    # git show b176b5a main
+    exit_status, output = subprocess.getstatusoutput(
+        f"git diff {source_commit} {current_commit}"
+    )
     if exit_status != 0:
         raise Exception(output)
     lines = output.split("\n")

zrb/task/base_task/base_task.py

@@ -159,16 +159,15 @@ class BaseTask(FinishTracker, AttemptTracker, Renderer, BaseTaskModel, AnyTask):
     def copy(self) -> AnyTask:
         return copy.deepcopy(self)
 
-    def to_function(
+    def __get_async_function(
         self,
         env_prefix: str = "",
         raise_error: bool = True,
-        is_async: bool = False,
         show_done_info: bool = True,
         should_clear_xcom: bool = False,
         should_stop_looper: bool = False,
     ) -> Callable[..., Any]:
-        async def function(*args: Any, **kwargs: Any) -> Any:
+        async def async_function(*args: Any, **kwargs: Any) -> Any:
             self.log_info("Copy task")
             self_cp: AnyTask = self.copy()
             result = await self_cp._run_and_check_all(
@@ -184,9 +183,41 @@ class BaseTask(FinishTracker, AttemptTracker, Renderer, BaseTaskModel, AnyTask):
                 self_cp.clear_xcom()
             return result
 
+        return async_function
+
+    def __to_sync_function(
+        self, async_function: Callable[..., Any]
+    ) -> Callable[..., Any]:
+        def sync_function(*args: Any, **kwargs: Any) -> Any:
+            try:
+                return asyncio.run(async_function(*args, **kwargs))
+            except RuntimeError as e:
+                if "event loop is closed" not in str(e).lower():
+                    raise e
+            except asyncio.CancelledError:
+                self.print_out_dark("Task is cancelled")
+
+        return sync_function
+
+    def to_function(
+        self,
+        env_prefix: str = "",
+        raise_error: bool = True,
+        is_async: bool = False,
+        show_done_info: bool = True,
+        should_clear_xcom: bool = False,
+        should_stop_looper: bool = False,
+    ) -> Callable[..., Any]:
+        async_function = self.__get_async_function(
+            env_prefix=env_prefix,
+            raise_error=raise_error,
+            show_done_info=show_done_info,
+            should_clear_xcom=should_clear_xcom,
+            should_stop_looper=should_stop_looper,
+        )
         if is_async:
-            return function
-        return lambda *args, **kwargs: asyncio.run(function(*args, **kwargs))
+            return async_function
+        return self.__to_sync_function(async_function)
 
     async def run(self, *args: Any, **kwargs: Any) -> Any:
         if self._run_function is not None:
@@ -287,9 +318,6 @@ class BaseTask(FinishTracker, AttemptTracker, Renderer, BaseTaskModel, AnyTask):
             result = results[-1]
             self._print_result(result)
             return result
-        except RuntimeError as e:
-            if raise_error and ("event loop is closed" not in str(e).lower()):
-                raise e
         except Exception as e:
             self.log_error(f"{e}")
             if raise_error:
@@ -384,7 +412,9 @@ class BaseTask(FinishTracker, AttemptTracker, Renderer, BaseTaskModel, AnyTask):
         is_failed: bool = False
         while self._should_attempt():
             try:
-                self.log_debug(f"Started with args: {args} and kwargs: {local_kwargs}")
+                self.log_debug(
+                    f"Started with args: {args} and kwargs: {local_kwargs}"
+                )  # noqa
                 await self.on_started()
                 self.__running_tasks.append(self)
                 result = await run_async(self.run, *args, **local_kwargs)

zrb/task/cmd_task.py

@@ -291,8 +291,6 @@ class CmdTask(BaseTask):
         for pid in self._pids:
             self.__kill_by_pid(pid)
         stop_asyncio_sync()
-        _print_out_dark(f"Exiting with signal {signum}")
-        sys.exit(signum)
 
     def __on_exit(self):
         self._global_state.no_more_attempt = True
@@ -351,14 +349,15 @@ class CmdTask(BaseTask):
             )
         )
         # wait process
-        await process.wait()
-        # wait reader and logger
-        await stdout_process
-        await stderr_process
-        await stdout_queue.put(None)
-        await stderr_queue.put(None)
-        await stdout_log_process
-        await stderr_log_process
+        await asyncio.gather(
+            process.wait(),
+            stdout_process,
+            stderr_process,
+        )
+        # stop messages in queue
+        await asyncio.gather(stdout_queue.put(None), stderr_queue.put(None))
+        # end logging
+        await asyncio.gather(stdout_log_process, stderr_log_process)
 
     def get_cmd_script(self, *args: Any, **kwargs: Any) -> str:
         return self._create_cmd_script(self._cmd_path, self._cmd, *args, **kwargs)

zrb/task/docker_compose_start_task.py

@@ -45,6 +45,7 @@ class DockerComposeStartTask(DockerComposeTask):
         compose_options: Mapping[JinjaTemplate, JinjaTemplate] = {},
         compose_flags: Iterable[JinjaTemplate] = [],
         compose_args: Iterable[JinjaTemplate] = [],
+        compose_profiles: Iterable[JinjaTemplate] = [],
         compose_env_prefix: str = "",
         setup_cmd: CmdVal = "",
         setup_cmd_path: CmdVal = "",
@@ -85,9 +86,11 @@ class DockerComposeStartTask(DockerComposeTask):
             executable=executable,
             compose_service_configs=compose_service_configs,
             compose_file=compose_file,
+            compose_cmd="up",
             compose_options=compose_options,
             compose_flags=compose_flags,
             compose_args=compose_args,
+            compose_profiles=compose_profiles,
             compose_env_prefix=compose_env_prefix,
             setup_cmd=setup_cmd,
             setup_cmd_path=setup_cmd_path,
@@ -116,31 +119,31 @@ class DockerComposeStartTask(DockerComposeTask):
             should_show_working_directory=should_show_working_directory,
         )
 
-    def get_cmd_script(self, *args: Any, **kwargs: Any) -> str:
-        # setup
-        setup_cmd = self._create_cmd_script(
-            self._setup_cmd_path, self._setup_cmd, *args, **kwargs
+    def _get_execute_docker_compose_script(
+        self,
+        compose_cmd: JinjaTemplate,
+        compose_options: Mapping[JinjaTemplate, JinjaTemplate],
+        compose_flags: Iterable[JinjaTemplate],
+        compose_args: Iterable[JinjaTemplate],
+        *args: Any
+    ) -> JinjaTemplate:
+        return "\n".join(
+            [
+                # compose start
+                super()._get_execute_docker_compose_script(
+                    compose_cmd=compose_cmd,
+                    compose_options=compose_options,
+                    compose_flags=list(compose_flags) + ["-d"],
+                    compose_args=compose_args,
+                    *args,
+                ),
+                # compose log
+                super()._get_execute_docker_compose_script(
+                    compose_cmd="logs",
+                    compose_options={},
+                    compose_flags=["-f"],
+                    compose_args=[],
+                    *args,
+                ),
+            ]
         )
-        cmd_list = [setup_cmd] if setup_cmd.strip() != "" else []
-        # compose command
-        cmd_list = cmd_list + [
-            # compose start
-            self._get_docker_compose_cmd_script(
-                compose_cmd="up",
-                compose_options=self._compose_options,
-                compose_flags=list(self._compose_flags) + ["-d"],
-                compose_args=self._compose_args,
-                *args,
-            ),
-            # compose log
-            self._get_docker_compose_cmd_script(
-                compose_cmd="logs",
-                compose_options={},
-                compose_flags=["-f"],
-                compose_args=[],
-                *args,
-            ),
-        ]
-        cmd_str = "\n".join(cmd_list)
-        self.log_info(f"Command: {cmd_str}")
-        return cmd_str

zrb/task/docker_compose_task.py

@@ -3,7 +3,6 @@ import pathlib
 from collections.abc import Callable, Iterable, Mapping
 from typing import Any, Optional, TypeVar, Union
 
-from zrb.config.config import CONTAINER_BACKEND
 from zrb.helper.accessories.color import colored
 from zrb.helper.accessories.name import get_random_name
 from zrb.helper.docker_compose.fetch_external_env import fetch_compose_file_env_map
@@ -42,24 +41,13 @@ ensure_container_backend = CmdTask(
     name="ensure-compose-backend",
     cmd_path=[
         os.path.join(SHELL_SCRIPT_DIR, "_common-util.sh"),
-        os.path.join(SHELL_SCRIPT_DIR, f"ensure-{CONTAINER_BACKEND}-is-installed.sh"),
+        os.path.join(SHELL_SCRIPT_DIR, "ensure-docker-is-installed.sh"),
     ],
     preexec_fn=None,
     should_print_cmd_result=False,
     should_show_cmd=False,
     should_show_working_directory=False,
 )
-ensure_zrb_network_task = CmdTask(
-    name="ensure-zrb-network",
-    cmd=[
-        f"{CONTAINER_BACKEND} network inspect zrb >/dev/null 2>&1 || \\",
-        f"{CONTAINER_BACKEND} network create -d bridge zrb",
-    ],
-    upstreams=[ensure_container_backend],
-    should_print_cmd_result=False,
-    should_show_cmd=False,
-    should_show_working_directory=False,
-)
 
 
 @typechecked
@@ -94,6 +82,7 @@ class DockerComposeTask(CmdTask):
         compose_options: Mapping[JinjaTemplate, JinjaTemplate] = {},
         compose_flags: Iterable[JinjaTemplate] = [],
         compose_args: Iterable[JinjaTemplate] = [],
+        compose_profiles: CmdVal = "",
         compose_env_prefix: str = "",
         setup_cmd: CmdVal = "",
         setup_cmd_path: CmdVal = "",
@@ -134,7 +123,7 @@ class DockerComposeTask(CmdTask):
             executable=executable,
             cwd=cwd,
             should_render_cwd=should_render_cwd,
-            upstreams=[ensure_zrb_network_task] + upstreams,
+            upstreams=[ensure_container_backend] + upstreams,
             fallbacks=fallbacks,
             on_triggered=on_triggered,
             on_waiting=on_waiting,
@@ -168,6 +157,7 @@ class DockerComposeTask(CmdTask):
         self._compose_flags = compose_flags
         self._compose_args = compose_args
         self._compose_env_prefix = compose_env_prefix
+        self._compose_profiles = compose_profiles
         self._compose_template_file = self.__get_compose_template_file(compose_file)
         self._compose_runtime_file = self.__get_compose_runtime_file(
             self._compose_template_file
@@ -333,14 +323,24 @@ class DockerComposeTask(CmdTask):
         raise Exception(f"Invalid compose file: {compose_file}")
 
     def get_cmd_script(self, *args: Any, **kwargs: Any) -> str:
+        cmd_list = []
+        # create network
+        create_network_script = self._get_create_compose_network_script()
+        if create_network_script.strip() != "":
+            cmd_list.append(create_network_script)
+        # set compose profiles
+        compose_profile_script = self._get_compose_profile_script(*args, **kwargs)
+        if compose_profile_script.strip() != "":
+            cmd_list.append(compose_profile_script)
         # setup
-        setup_cmd = self._create_cmd_script(
+        setup_script = self._create_cmd_script(
             self._setup_cmd_path, self._setup_cmd, *args, **kwargs
         )
-        cmd_list = [setup_cmd] if setup_cmd.strip() != "" else []
+        if setup_script.strip() != "":
+            cmd_list.append(setup_script)
         # compose command
         cmd_list.append(
-            self._get_docker_compose_cmd_script(
+            self._get_execute_docker_compose_script(
                 compose_cmd=self._compose_cmd,
                 compose_options=self._compose_options,
                 compose_flags=self._compose_flags,
@@ -352,7 +352,38 @@ class DockerComposeTask(CmdTask):
         self.log_info(f"Command: {cmd_str}")
         return cmd_str
 
-    def _get_docker_compose_cmd_script(
+    def _get_compose_profile_script(self, *args, **kwargs) -> str:
+        # Get list representation of self._compose_profiles
+        compose_profiles = self._compose_profiles
+        if callable(compose_profiles):
+            compose_profiles = self._compose_profiles(*args, **kwargs)
+        if isinstance(compose_profiles, str):
+            compose_profiles = compose_profiles.split(",")
+        # Get only non empty profiles
+        filtered_compose_profiles = [
+            self.render_str(profile)
+            for profile in compose_profiles
+            if self.render_str(profile).strip() != ""
+        ]
+        if len(filtered_compose_profiles) == 0:
+            return ""
+        compose_profiles_str = ",".join(filtered_compose_profiles)
+        return f"export COMPOSE_PROFILES={compose_profiles_str}"
+
+    def _get_create_compose_network_script(self) -> str:
+        compose_data = read_compose_file(self._compose_runtime_file)
+        networks: Mapping[str, Mapping[str, Any]] = compose_data.get("networks", {})
+        scripts = []
+        for key, config in networks.items():
+            if not config.get("external", False):
+                continue
+            network_name = config.get("name", key)
+            scripts.append(
+                f"docker network inspect {network_name} > /dev/null 2>&1 || docker network create -d bridge{network_name}"  # noqa
+            )
+        return "\n".join(scripts)
+
+    def _get_execute_docker_compose_script(
         self,
         compose_cmd: str,
         compose_options: Mapping[JinjaTemplate, JinjaTemplate],
@@ -383,4 +414,4 @@ class DockerComposeTask(CmdTask):
                 if self.render_str(arg) != ""
             ]
         )
-        return f"{CONTAINER_BACKEND} compose {options} {compose_cmd} {flags} {args}"
+        return f"docker compose {options} {compose_cmd} {flags} {args}"

zrb/task/looper.py

@@ -1,4 +1,4 @@
-from collections.abc import Callable
+from collections.abc import Callable, Mapping
 from typing import Optional
 
 from zrb.helper.accessories.color import colored

{zrb-0.27.1.dist-info → zrb-0.28.1.dist-info}/METADATA

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

{zrb-0.27.1.dist-info → zrb-0.28.1.dist-info}/RECORD

@@ -1,7 +1,7 @@
 zrb/__init__.py,sha256=dQs1S6z3XbG1BeQ62YYxc6cUs5ejw9T9ajkPgNVEs34,2875
 zrb/__main__.py,sha256=-_k0XOahDF-06n41Uly-oUMkZ8XDSxO-WUUImWz6GiA,171
 zrb/action/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-zrb/action/runner.py,sha256=aB46inPOs7CDckfIsS_mlgQ92_bfKltcnb77PjW6Tfw,5179
+zrb/action/runner.py,sha256=pSQMtJKP7xb0IZ1X5iGPX0y4ZA8COO7gGQGfjlVKKtc,5140
 zrb/advertisement.py,sha256=E-8Dv0oPhw0j-bKEc_IsWV9NPUIs24r1Jgp0p0exAMU,664
 zrb/builtin/__init__.py,sha256=Nw3gZS1S-HKt_LTQuhffZT4NcZAdelJabCSFdkm6E8g,3407
 zrb/builtin/_helper/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -59,7 +59,7 @@ zrb/builtin/devtool/install/terraform/terraform.py,sha256=jBtBFoSEh6jrDV2_mUOqty
 zrb/builtin/devtool/install/tmux/install.sh,sha256=RsmLzKVzY9O7wBNMc-xE7S1sH0aJDsCiVgEXsRXqQ8w,1229
 zrb/builtin/devtool/install/tmux/resource/config.sh,sha256=wQCb4Q-mNkxIPOcvpN84X9RUWkGY16u3Vd-pOhVidgg,416
 zrb/builtin/devtool/install/tmux/tmux.py,sha256=Qvv9mSZhzBtoPRL5zs49G2GdJpY674s8Bt4nFWbIF-o,1322
-zrb/builtin/devtool/install/zsh/install.sh,sha256=wHOLrsEKdqtJWoJbfixxJVsVoTGH7gitKIepgDcZMZ0,1720
+zrb/builtin/devtool/install/zsh/install.sh,sha256=J2GdFuTRo8s33LcFmjKMYpCZ_wZB4iK0aEeL7XtcYyE,1719
 zrb/builtin/devtool/install/zsh/resource/config.sh,sha256=2ZEmmiu5KS-FSMlj48IDPh5dhx5fnbzri86CtzI5Np0,5068
 zrb/builtin/devtool/install/zsh/zsh.py,sha256=JJMyNSDt0uMTJppYRT2bWy446D8ArQ8ZRPZLV117s7g,1325
 zrb/builtin/docker/__init__.py,sha256=H6mkl7hojJYiHArn2Q1ppw9yZC8TxTRnrYajRJcR77Y,142
@@ -80,7 +80,7 @@ zrb/builtin/explain/task.py,sha256=HaWEwHn9lwXT1hrEgmQw-sW2qY62qaPsCEtY92F7yzA,3
 zrb/builtin/git/__init__.py,sha256=1oIuwaOTyXomYGLjS65VLRXCLgTOqT79R2YGkVhcdGk,239
 zrb/builtin/git/_group.py,sha256=yDZD0dIXDI8oG2DQpWsZhDS07HKAHrLj-luKTscI0ng,106
 zrb/builtin/git/clear_branch.py,sha256=4eccEAlSoo1GcP7VZQTg-0d8gohuxlBZpBQohGIe3tg,479
-zrb/builtin/git/get_file_changes.py,sha256=rlzYJuAe30uPYrfEaAN_vnfXpVIjukf5BiSPqXb7qq0,2432
+zrb/builtin/git/get_file_changes.py,sha256=ejnRt4iL8T7yKKygHfvE1YweUMB7gJwXr0BzQdfu53s,2763
 zrb/builtin/group.py,sha256=6k4TM49C93GZF63srUNkoVwdoIaoD5__dw66krPipGo,1292
 zrb/builtin/md5/__init__.py,sha256=UQVSJdQTrLF8XDKNRhkFG05DHjfGQiarlwoatqRJwn0,196
 zrb/builtin/md5/_group.py,sha256=dimqCmJItc7qx7yRm64tL608oMAjOVXRycP7NTSSFi0,100
@@ -226,23 +226,19 @@ zrb/builtin/project/add/fastapp/app/template/_automate/snake_zrb_app_name/config
 zrb/builtin/project/add/fastapp/app/template/_automate/snake_zrb_app_name/container/__init__.py,sha256=UllmGaHqIT4JrsyVN6kQAcSVA32sUdYpBpOQpxmLQ_M,988
 zrb/builtin/project/add/fastapp/app/template/_automate/snake_zrb_app_name/container/_env.py,sha256=2ysgQ6yJWb6h3u0tMvNXFgXwbUEE7CJX6k_8VxOOnNg,333
 zrb/builtin/project/add/fastapp/app/template/_automate/snake_zrb_app_name/container/_group.py,sha256=WbQq0AprHwudJPP38VpDB0cTnQP1HCZK_xVJY8_D1n0,240
-zrb/builtin/project/add/fastapp/app/template/_automate/snake_zrb_app_name/container/_helper.py,sha256=uXHHTi3qjmgPd-hBsXdbCjyXHVxl84nZQao1eaQb5xk,280
 zrb/builtin/project/add/fastapp/app/template/_automate/snake_zrb_app_name/container/_input.py,sha256=uBXfLqOQxiVn8UGfGhgTbUV_1Se6nNVQZKxF9mpTW6k,246
 zrb/builtin/project/add/fastapp/app/template/_automate/snake_zrb_app_name/container/_service_config.py,sha256=lOvwhfIbdMuQ-QYoibG5FMW2U-ZuOWcLd-puWAVcj-A,2048
 zrb/builtin/project/add/fastapp/app/template/_automate/snake_zrb_app_name/container/microservices/__init__.py,sha256=ftU92OGyRh2VZr-fkR1rJA-VLxevBlIypHqrlNW3OMc,250
 zrb/builtin/project/add/fastapp/app/template/_automate/snake_zrb_app_name/container/microservices/_group.py,sha256=PI6pgBfZRyG6YQqLoEZQLD9TKVZcrn2Yx8wqpunROwo,292
-zrb/builtin/project/add/fastapp/app/template/_automate/snake_zrb_app_name/container/microservices/_helper.py,sha256=_SY-bY7aG3HDI7AZpTPPb7TelLijXXeA0kY-xD0Bt5I,903
-zrb/builtin/project/add/fastapp/app/template/_automate/snake_zrb_app_name/container/microservices/start.py,sha256=NHvC5A1A--bM0hQ53Zu1rJMtFUm5UVBwhD4-SJ67L0Y,2216
+zrb/builtin/project/add/fastapp/app/template/_automate/snake_zrb_app_name/container/microservices/start.py,sha256=h-a72rEk0ZwSVwZ_xXBAqe0Y280ieLUKfxS9yZHXumw,2459
 zrb/builtin/project/add/fastapp/app/template/_automate/snake_zrb_app_name/container/monolith/__init__.py,sha256=1ELaHwNeMmFO9Hy9foqsM-EHgesKYlnQsbUI_i_KYiA,230
 zrb/builtin/project/add/fastapp/app/template/_automate/snake_zrb_app_name/container/monolith/_group.py,sha256=u-vUVCZ8Q8LIVlw4lpduZYImIpSsNmO5FfUqsGrVFLc,277
-zrb/builtin/project/add/fastapp/app/template/_automate/snake_zrb_app_name/container/monolith/_helper.py,sha256=1Eu33q5vR3xcT2wAN9aEjMXaZvnNQky7pbxNxTOR7yY,867
-zrb/builtin/project/add/fastapp/app/template/_automate/snake_zrb_app_name/container/monolith/start.py,sha256=b-2vArVVxa-bSzlSriVmEOMEFD0BtFD_Kim6lN1xBzs,2185
-zrb/builtin/project/add/fastapp/app/template/_automate/snake_zrb_app_name/container/remove.py,sha256=sZaecjWGYqv834hh_MyDr5yKOFj8HkdraMREmR5AJI8,956
-zrb/builtin/project/add/fastapp/app/template/_automate/snake_zrb_app_name/container/stop.py,sha256=SAOiJdc2wSOnpzsx5pBtX1qwP2BYbZCT2peqD-8YT4s,994
+zrb/builtin/project/add/fastapp/app/template/_automate/snake_zrb_app_name/container/monolith/start.py,sha256=9QTneFfh5lxwaiIJrUM6fAhbj38sgevj6ZVjDKzhaKo,2433
+zrb/builtin/project/add/fastapp/app/template/_automate/snake_zrb_app_name/container/remove.py,sha256=A87V06Du_V4kG1EK9aWlrFAwvazu8ucv9Rak6_Nu1kQ,1016
+zrb/builtin/project/add/fastapp/app/template/_automate/snake_zrb_app_name/container/stop.py,sha256=rxtG4P4MFVYGhTq2Al6WooGghaQ2xmplXWo_mZXuxHU,1054
 zrb/builtin/project/add/fastapp/app/template/_automate/snake_zrb_app_name/container/support/__init__.py,sha256=TKNXysArhYcwaeLWCTrim3U599JXs_IkgKF0y7urYVI,226
 zrb/builtin/project/add/fastapp/app/template/_automate/snake_zrb_app_name/container/support/_group.py,sha256=NbgCdPT5lGEd9ce4bid_HuFVp9loDKDA7qA7KfPsowA,274
-zrb/builtin/project/add/fastapp/app/template/_automate/snake_zrb_app_name/container/support/_helper.py,sha256=gL36Db-0Qu6lTc161YjwzJfrk5xTD2NrIpMn1UziQAY,1176
-zrb/builtin/project/add/fastapp/app/template/_automate/snake_zrb_app_name/container/support/start.py,sha256=Q_j94fC3moUi_xxbna6JbCdsUYmlUEg77y58B_FSh1w,1773
+zrb/builtin/project/add/fastapp/app/template/_automate/snake_zrb_app_name/container/support/start.py,sha256=DK-gEEsxAafI0Ai9viaLABaumJ8QtKctmEdkC2r6pmI,2198
 zrb/builtin/project/add/fastapp/app/template/_automate/snake_zrb_app_name/destroy.py,sha256=hMwW7c-kRfDAc_ndLJ--1yu4KbPzdhM5bcOq1wpml1A,1161
 zrb/builtin/project/add/fastapp/app/template/_automate/snake_zrb_app_name/destroy.sh,sha256=Yc-jb01oostiRMtrsTNWJXn_Fee5iDfv16L4DaoklEA,29
 zrb/builtin/project/add/fastapp/app/template/_automate/snake_zrb_app_name/frontend/__init__.py,sha256=oUAubQE0KGRd04wSURGC87ZRoCl58yPGccRiey7tJBQ,299
@@ -278,7 +274,6 @@ zrb/builtin/project/add/fastapp/app/template/_automate/snake_zrb_app_name/monoli
 zrb/builtin/project/add/fastapp/app/template/_automate/snake_zrb_app_name/monolith/start.sh,sha256=KI-PqiOes-xWA2thSW2icD3VEgxRJUxjRmc_3y9mS14,57
 zrb/builtin/project/add/fastapp/app/template/_automate/snake_zrb_app_name/test.py,sha256=RuZGmP2OTPZcDOuBX5p-j5TizakkDxEClWhB2Fg64M4,1826
 zrb/builtin/project/add/fastapp/app/template/_automate/snake_zrb_app_name/test.sh,sha256=ibnoS4kV1p-3JREJKlX2UsziP009zHzP9miPxID1tpk,308
-zrb/builtin/project/add/fastapp/app/template/src/kebab-zrb-app-name/.generator-version,sha256=7kobEqGURA6fqyUvQGmQgHfJ7qsL3tXgh_8IUo4M7PY,10
 zrb/builtin/project/add/fastapp/app/template/src/kebab-zrb-app-name/.gitignore,sha256=YFrq8n_0yn9FT0XqcPVftHmKj31DSh4ftIY8EvQm0ik,53
 zrb/builtin/project/add/fastapp/app/template/src/kebab-zrb-app-name/README.md,sha256=mIE-CBlKzx_wEQdGIuiJbzDX_bCC13ckMnOYU8erHpI,15200
 zrb/builtin/project/add/fastapp/app/template/src/kebab-zrb-app-name/all-module-disabled.env,sha256=eIbYiufwRJ-artnA7Cw2y4YzGrPw2XtEb-ih_f4tCuw,56
@@ -1327,7 +1322,7 @@ zrb/builtin/update.py,sha256=89i_fPUlL27IXczLI7Lr7k4STMpnxyw2je8daCKUTQo,225
 zrb/builtin/version.py,sha256=i0pnnLQFLdTwcVqZs6xsGkbAY-IPbmelip7HuZVjgv0,384
 zrb/builtin/watch_changes.py,sha256=Vr__e_T31nnbefcPftvyn78dT3-UXqNRpH0KO-COeKQ,1220
 zrb/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-zrb/config/config.py,sha256=k_3HaOljqKWr1TKZ0Ap7_E2BRqejkVNChMMA13PqEwM,1891
+zrb/config/config.py,sha256=CBzfexBmP5cFPYuOM0SruCT4jWha73qe8YqwV9T8fdM,1625
 zrb/helper/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/helper/accessories/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/helper/accessories/color.py,sha256=7bj2-K_sn1leXN_C9eeOWXZBfnsBAFOzfirSiM8vCMw,964
@@ -1335,7 +1330,7 @@ zrb/helper/accessories/icon.py,sha256=uKm3w5G1fV454MUhz_CZMy48AD99kBV9j2zRlJWzB1
 zrb/helper/accessories/name.py,sha256=e1uvU3MzuvDb5j6YIWBA048y4qeM-LfrxRKWlMehliE,1638
 zrb/helper/accessories/untyped_color.py,sha256=4wRbHSClbCzPRWtW-Cy2agOMozANVi7u4p8lMXMSuJg,194
 zrb/helper/advertisement.py,sha256=GOaCtWYL9Oj_tAg4jqsCuFsdinHaOSH_6d57y8BbsVU,912
-zrb/helper/asyncio_task.py,sha256=0CYQZcMnIO3514b8P0FJnTF9z7UasjJCf9TTDHfZLzM,686
+zrb/helper/asyncio_task.py,sha256=UcE2axvWDh8GCFYtPUZCrSZ8VfRS-lsffyDEupjK1-8,1021
 zrb/helper/callable.py,sha256=usatPKPkK_67G9dWreaGXskOaGHd_hE8MiTWAUhfojE,563
 zrb/helper/cli.py,sha256=cb82aZCX5NoOHQNTx3wtdKOAQJP79ky4HA6w0VjVBh0,2603
 zrb/helper/codemod/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -1360,7 +1355,7 @@ zrb/helper/file/copy_tree.py,sha256=Tm1ImZWJ9tKB3sQd-4M0Kk1NSuBMLDlkYQfSKV_Grsc,
 zrb/helper/file/match.py,sha256=wUan0dYRhzSW0_vU247SH3hEeZ_MWyDacoJdmnlS3cY,713
 zrb/helper/file/text.py,sha256=7JqNbk8hC7Y4UopEmhiGYkxDAauepvI1tEkbfpzcI84,963
 zrb/helper/git/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-zrb/helper/git/detect_changes.py,sha256=blRGkLarFh88X-G2XHP2h0bRzropT-Hqfqjbp2uRcx4,1311
+zrb/helper/git/detect_changes.py,sha256=jrfSe8po4f9ynTl05PBHAThaESw9ZeqfalR_rNR_VhQ,1420
 zrb/helper/loader/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/helper/loader/load_module.py,sha256=OfF7rtiXjNqAjIycLveXcmrWz8bZ0R9uqKeae_xYc2c,570
 zrb/helper/loader/load_script.py,sha256=LvIRB4-f3ft-wEp1amhws-L-mCKDQ1rFUzrdc16AwGE,1998
@@ -1384,7 +1379,6 @@ zrb/helper/util.py,sha256=s3Wdg-hYbhkttW7o2-C8erQqMuxStSpR8f2psgZzP68,3836
 zrb/runner.py,sha256=9huyeIi8gqbMQV3u6CRBeB8s9WVynECR0jECuCAYm9c,261
 zrb/shell-scripts/_common-util.sh,sha256=8zvSAbDp8z4JWxMT6s6bSnNBCfCB88gLLpK5LOhyPBg,229
 zrb/shell-scripts/ensure-docker-is-installed.sh,sha256=8CL5gYs428LPWcF43X-1O1i2YyWAOGzXTKZttiS9J1Q,2999
-zrb/shell-scripts/ensure-podman-is-installed.sh,sha256=RvLLQIBN5cfLEsFkTpomgl_PxJZ6z0Wl0VGGtjIA5JM,1529
 zrb/shell-scripts/ensure-rsync-is-installed.sh,sha256=ffr8avoCUSoDQkEBWmeelgn-EtF9reQTaM0wfW6B0hc,1146
 zrb/shell-scripts/ensure-ssh-is-installed.sh,sha256=w5pCzsbEa3bnxT07q6gX0nWn-7HXsMiwBRrg7dMD57w,2414
 zrb/shell-scripts/notify.ps1,sha256=6_xPoIwuxARpYljcjVV-iRJS3gJqGfx-B6kj719cJ9o,843
@@ -1392,7 +1386,7 @@ zrb/task/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/task/any_task.py,sha256=SlAp6LY-8TGopaQm3eZD3ZEx3wxvCff8UfcnYyu-aiY,39344
 zrb/task/any_task_event_handler.py,sha256=ay4v7eXatF4sCiXpUYaHVJZljpnKlvBbFIwvZqXW8Mo,541
 zrb/task/base_task/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-zrb/task/base_task/base_task.py,sha256=oihVRUHAvNMwlfLEWQoixt5OwyMLyW9w6bSGD9WGVIk,20457
+zrb/task/base_task/base_task.py,sha256=iieOSoDvKVJpDpTH1LdO-uA1yBPRHxMDPyEgS0wKwmc,21434
 zrb/task/base_task/component/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/task/base_task/component/base_task_model.py,sha256=EuTWvY54mD_ATy4-VFZw4uCOu3Mfe8hgZikwTnIjmkY,10381
 zrb/task/base_task/component/common_task_model.py,sha256=X_Ubu5kNycQJ-dFiLMARvC6GWQ9pIjBCdxh3MVelc-A,13544
@@ -1400,13 +1394,13 @@ zrb/task/base_task/component/pid_model.py,sha256=RjJIqOpavucDssnd3q3gT4q8QnP8I9S
 zrb/task/base_task/component/renderer.py,sha256=xxcMbHhWPMUgAO3DWec_E-OeqlCKtwCBGFzLoc5g8BE,4484
 zrb/task/base_task/component/trackers.py,sha256=3G4dMhh1kVaJrmRwiGzWQSbr1fB-w9xXjBKz_vRifYc,2063
 zrb/task/checker.py,sha256=mh_2ajZqpNdJQ8AFVQ6ZArYtBUOXST3aZSisINuEivk,3400
-zrb/task/cmd_task.py,sha256=B3kRtpb0QVjusPWAMLjpfGxvAdEfgD9_N0jiU55S3rA,14718
+zrb/task/cmd_task.py,sha256=BcWXiikCQqFHIYs-PPSnvFTM10HKntj76h3wCE6sqKs,14701
 zrb/task/decorator.py,sha256=SuajollezbwiSOs29bv8A6PmFcFs_RH4pr4TPcQPDHM,3081
-zrb/task/docker_compose_start_task.py,sha256=n4mLejebyy8sF4rbcfWZucPcBiqPSkDAdGZvOhk4Xt8,5335
-zrb/task/docker_compose_task.py,sha256=NuNevzooQVn3wgMNrBBdVD2FepRpE38ouYkRNXeqQ2s,15543
+zrb/task/docker_compose_start_task.py,sha256=XjE2bV9bnqaMhgtElR-gC1as1uM9_-ozX7qzubyteQY,5453
+zrb/task/docker_compose_task.py,sha256=6nywyIMrOuQMJ5bsDaWEyUm91NkIP6HL0nnmKI_IEf8,17081
 zrb/task/flow_task.py,sha256=wkvvUCrt6n1ul-o3STCPMdrlBuGBrNCRgtRzGyXir9o,5079
 zrb/task/http_checker.py,sha256=gXqBlEStMnIhzmQ7FX9Zo-nG3-wsiVEML8IOJiSG5JI,5705
-zrb/task/looper.py,sha256=zInLRgcQlReGXz4Ffxc2W99RovSChj6kHuGEGmaPb-Q,1432
+zrb/task/looper.py,sha256=tYMG9rTMEd5-FP0CIBfbcWfahsg6W-ED66AV5C-kCrk,1441
 zrb/task/notifier.py,sha256=xjqT5Vydr_0cc1m4jA-odhHMZg6CSGciFCs0rhVkvPM,6265
 zrb/task/parallel.py,sha256=Xz9az51hHfkeEmOEo3Xb-B7GPoOT_DxuakpAfCbzzV0,1176
 zrb/task/path_checker.py,sha256=xkOpxlLUaEXlsiWh1o-ghqQNWYadXvTl3QV4yeIC2Rc,4677
@@ -1438,8 +1432,8 @@ zrb/task_input/multiline_input.py,sha256=KNto5k5X1C6KE_A-vX0OjpQyjgCRJ6BR2PwHXNQ
 zrb/task_input/password_input.py,sha256=95NlJ9xIq7z_evpAyR2XsBpeuWpBXd2Ezn3P7oDOttk,4360
 zrb/task_input/str_input.py,sha256=0nje7vI9fs_xqQBbmKB8Yn7wevlWp9Qebv7f8-GmiXs,4350
 zrb/task_input/task_input.py,sha256=WTj_qIQyRs-04-VotjNTcVyIuf6b2afInVoCQHoRmr0,2327
-zrb-0.27.1.dist-info/LICENSE,sha256=WfnGCl8G60EYOPAEkuc8C9m9pdXWDe08NsKj3TBbxsM,728
-zrb-0.27.1.dist-info/METADATA,sha256=-ckE3NSw1Xels6NSJMCI3kRdv55-x21CTF9UE6LpdiM,17094
-zrb-0.27.1.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-zrb-0.27.1.dist-info/entry_points.txt,sha256=xTgXc1kBKYhJHEujdaSPHUcJT3-hbyP1mLgwkv-5sSk,40
-zrb-0.27.1.dist-info/RECORD,,
+zrb-0.28.1.dist-info/LICENSE,sha256=WfnGCl8G60EYOPAEkuc8C9m9pdXWDe08NsKj3TBbxsM,728
+zrb-0.28.1.dist-info/METADATA,sha256=G0gdU5pa1asXppGDzHH6NFIdDc7gXAstIsznDYCd53E,17094
+zrb-0.28.1.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+zrb-0.28.1.dist-info/entry_points.txt,sha256=xTgXc1kBKYhJHEujdaSPHUcJT3-hbyP1mLgwkv-5sSk,40
+zrb-0.28.1.dist-info/RECORD,,

zrb/builtin/project/add/fastapp/app/template/_automate/snake_zrb_app_name/container/_helper.py

@@ -1,8 +0,0 @@
-from typing import Any
-
-
-def activate_all_compose_profile(*args: Any, **kwargs: Any) -> str:
-    compose_profile_str = ",".join(
-        ["monitoring", "monolith", "microservices", "kafka", "postgres", "rabbitmq"]
-    )
-    return f"export COMPOSE_PROFILES={compose_profile_str}"

zrb/builtin/project/add/fastapp/app/template/_automate/snake_zrb_app_name/container/microservices/_helper.py

@@ -1,24 +0,0 @@
-from typing import Any
-
-from ..support._helper import get_support_container_compose_profiles
-
-
-def activate_microservices_compose_profile(*args: Any, **kwargs: Any) -> str:
-    compose_profiles = _get_microservices_container_compose_profiles(*args, **kwargs)
-    compose_profile_str = ",".join(compose_profiles)
-    return f"export COMPOSE_PROFILES={compose_profile_str}"
-
-
-def should_start_microservices_container(*args: Any, **kwargs: Any) -> bool:
-    if not kwargs.get("local_snake_zrb_app_name", True):
-        return False
-    compose_profiles = _get_microservices_container_compose_profiles(*args, **kwargs)
-    return len(compose_profiles) > 0
-
-
-def _get_microservices_container_compose_profiles(
-    *args: Any, **kwargs: Any
-) -> list[str]:
-    compose_profiles = get_support_container_compose_profiles(*args, **kwargs)
-    compose_profiles.append("microservices")
-    return compose_profiles

zrb/builtin/project/add/fastapp/app/template/_automate/snake_zrb_app_name/container/monolith/_helper.py

@@ -1,22 +0,0 @@
-from typing import Any
-
-from ..support._helper import get_support_container_compose_profiles
-
-
-def activate_monolith_compose_profile(*args: Any, **kwargs: Any) -> str:
-    compose_profiles = _get_monolith_container_compose_profiles(*args, **kwargs)
-    compose_profile_str = ",".join(compose_profiles)
-    return f"export COMPOSE_PROFILES={compose_profile_str}"
-
-
-def should_start_monolith_container(*args: Any, **kwargs: Any) -> bool:
-    if not kwargs.get("local_snake_zrb_app_name", True):
-        return False
-    compose_profiles = _get_monolith_container_compose_profiles(*args, **kwargs)
-    return len(compose_profiles) > 0
-
-
-def _get_monolith_container_compose_profiles(*args: Any, **kwargs: Any) -> list[str]:
-    compose_profiles = get_support_container_compose_profiles(*args, **kwargs)
-    compose_profiles.append("monolith")
-    return compose_profiles

zrb/builtin/project/add/fastapp/app/template/_automate/snake_zrb_app_name/container/support/_helper.py

@@ -1,30 +0,0 @@
-from typing import Any
-
-from zrb import Task
-
-
-def activate_support_compose_profile(*args: Any, **kwargs: Any) -> str:
-    compose_profiles = get_support_container_compose_profiles(*args, **kwargs)
-    compose_profile_str = ",".join(compose_profiles)
-    return f"export COMPOSE_PROFILES={compose_profile_str}"
-
-
-def should_start_support_container(*args: Any, **kwargs: Any) -> bool:
-    if not kwargs.get("local_snake_zrb_app_name", True):
-        return False
-    compose_profiles = get_support_container_compose_profiles(*args, **kwargs)
-    return len(compose_profiles) > 0
-
-
-def get_support_container_compose_profiles(*args: Any, **kwargs: Any) -> list[str]:
-    task: Task = kwargs.get("_task")
-    env_map = task.get_env_map()
-    compose_profiles: list[str] = []
-    if env_map.get("APP_DB_CONNECTION", "").startswith("postgresql"):
-        compose_profiles.append("postgres")
-    broker_type = env_map.get("APP_BROKER_TYPE", "rabbitmq")
-    if broker_type in ["rabbitmq", "kafka"]:
-        compose_profiles.append(broker_type)
-    if kwargs.get("enable_snake_zrb_app_name_monitoring", False):
-        compose_profiles.append("monitoring")
-    return compose_profiles

zrb/builtin/project/add/fastapp/app/template/src/kebab-zrb-app-name/.generator-version

@@ -1 +0,0 @@
-zrbVersion

zrb/shell-scripts/ensure-podman-is-installed.sh

@@ -1,55 +0,0 @@
-set -e
-if command_exists podman
-then
-    log_info "Podman is already installed."
-else
-    log_info "Installing Podman..."
-    if [ "$OS_TYPE" = "Darwin" ]
-    then
-        if command_exists brew
-        then
-            brew install --cask podman
-            log_info "Please start Podman before proceeding."
-        else
-            log_info "Homebrew not found. Please install Homebrew and try again."
-            exit 1
-        fi
-    elif [ "$OS_TYPE" = "Linux" ]
-    then
-        if command_exists apt
-        then
-            try_sudo apt update
-            try_sudo apt install -y podman
-        elif command_exists yum
-        then
-            try_sudo yum install -y podman
-        elif command_exists dnf
-        then
-            try_sudo dnf install -y podman
-        elif command_exists pacman
-        then
-            try_sudo pacman -Syu --noconfirm podman
-        else
-            log_info "No known package manager found. Please install Podman manually."
-            exit 1
-        fi
-    else
-        log_info "Unsupported OS type. Please install Podman manually."
-        exit 1
-    fi
-fi
-
-if ! command_exists podman-compose
-then
-    log_info "Installing Podman Compose plugin..."
-    pip install podman-compose
-fi
-
-# Check Podman Compose plugin installation
-if command_exists podman && command_exists podman-compose
-then
-    log_info "Podman Compose plugin is already installed."
-else
-    log_info "Podman Compose plugin is not installed or podman is not running. Please check your installation."
-    exit 1
-fi