zrb 0.24.0__py3-none-any.whl → 0.26.0__py3-none-any.whl

zrb/action/runner.py

@@ -1,11 +1,13 @@
 import sys
+from collections.abc import Callable, Mapping
+from typing import Any, Union
 
 import click
 
 from zrb.helper.accessories.color import colored
+from zrb.helper.asyncio_task import stop_asyncio_sync
 from zrb.helper.log import logger
 from zrb.helper.typecheck import typechecked
-from zrb.helper.typing import Any, Callable, List, Mapping, Union
 from zrb.task.any_task import AnyTask
 from zrb.task_group.group import Group as TaskGroup
 
@@ -24,11 +26,11 @@ class Runner:
     def __init__(self, env_prefix: str = ""):
         logger.info(colored("Create runner", attrs=["dark"]))
         self.__env_prefix = env_prefix
-        self.__tasks: List[AnyTask] = []
+        self.__tasks: list[AnyTask] = []
         self.__registered_groups: Mapping[str, click.Group] = {}
-        self.__top_levels: List[CliSubcommand] = []
-        self.__subcommands: Mapping[str, List[click.Group]] = {}
-        self.__registered_task_cli_name: List[str] = []
+        self.__top_levels: list[CliSubcommand] = []
+        self.__subcommands: Mapping[str, list[click.Group]] = {}
+        self.__registered_task_cli_name: list[str] = []
         logger.info(colored("Runner created", attrs=["dark"]))
 
     def register(self, *tasks: AnyTask):
@@ -119,6 +121,7 @@ class Runner:
             try:
                 function(*args, **kwargs)
             except Exception:
+                stop_asyncio_sync()
                 sys.exit(1)
             finally:
                 task.clear_xcom()

zrb/advertisement.py

@@ -1,13 +1,12 @@
 from zrb.helper.accessories.color import colored
 from zrb.helper.advertisement import Advertisement
 from zrb.helper.log import logger
-from zrb.helper.typing import List
 
 logger.debug(colored("Loading zrb.advertisement", attrs=["dark"]))
 
 # flake8: noqa E501
 
-advertisements: List[Advertisement] = [
+advertisements: list[Advertisement] = [
     Advertisement(
         content="\n".join(
             [

zrb/builtin/__init__.py

@@ -24,6 +24,7 @@ from zrb.builtin.eval import evaluate
 from zrb.builtin.explain import explain_group, explain_tasks
 from zrb.builtin.git import clear_git_branch, get_git_file_changes, git_group
 from zrb.builtin.md5 import hash_text_md5, md5_group, sum_file_md5
+from zrb.builtin.monorepo import add_to_monorepo, pull_from_monorepo, push_to_monorepo
 from zrb.builtin.process import (
     get_process_pid_by_name,
     get_process_pid_by_port,
@@ -113,6 +114,9 @@ assert add_project_tasks
 assert add_cmd_task
 assert add_docker_compose_task
 assert add_python_task
+assert add_to_monorepo
+assert pull_from_monorepo
+assert push_to_monorepo
 assert ubuntu_group
 assert ubuntu_install_group
 assert update_ubuntu

zrb/builtin/base64/decode.py

@@ -1,8 +1,8 @@
 import base64
+from typing import Any
 
 from zrb.builtin.base64._group import base64_group
 from zrb.builtin.base64._input import text_input
-from zrb.helper.typing import Any
 from zrb.runner import runner
 from zrb.task.decorator import python_task
 

zrb/builtin/base64/encode.py

@@ -1,8 +1,8 @@
 import base64
+from typing import Any
 
 from zrb.builtin.base64._group import base64_group
 from zrb.builtin.base64._input import text_input
-from zrb.helper.typing import Any
 from zrb.runner import runner
 from zrb.task.decorator import python_task
 

zrb/builtin/devtool/install/_helper.py

@@ -1,8 +1,9 @@
 import os
+from collections.abc import Callable
+from typing import Any
 
 from zrb.helper.file.text import read_text_file_async, write_text_file_async
 from zrb.helper.typecheck import typechecked
-from zrb.helper.typing import Any, Callable
 from zrb.task.task import Task
 
 

zrb/builtin/docker/prune.py

@@ -1,15 +1,23 @@
 from zrb.builtin.docker._group import docker_group
 from zrb.runner import runner
 from zrb.task.cmd_task import CmdTask
+from zrb.task_input.bool_input import BoolInput
 
 prune_docker = CmdTask(
     name="prune",
     group=docker_group,
     description="Prune unused images and volumes",
+    inputs=[
+        BoolInput(
+            name="all", shortcut="a", prompt="Remove all unused images", default=False
+        ),
+        BoolInput(
+            name="volume", shortcut="v", prompt="Prune anonymous volume", default=False
+        ),
+    ],
     cmd=[
-        "docker system prune -af",
-        "docker image prune -af",
-        "docker system prune -af --volumes",
+        "docker system prune -f {% if input.all %}-a{% endif %} {% if input.volume %}--volumes{% endif %}",  # noqa
+        "docker image prune -f {% if input.all %}-a{% endif %}",
         "docker system df",
     ],
 )

zrb/builtin/env/get.py

@@ -1,6 +1,7 @@
+from typing import Any
+
 from zrb.builtin.env._group import env_group
 from zrb.helper.accessories.color import colored
-from zrb.helper.typing import Any, List
 from zrb.runner import runner
 from zrb.task.decorator import python_task
 from zrb.task.task import Task
@@ -15,7 +16,7 @@ async def get_env(*args: Any, **kwargs: Any):
     names = list(env_map.keys())
     names.sort()
     colored_equal = colored("=", color="grey", attrs=["dark"])
-    env_lines: List[str] = []
+    env_lines: list[str] = []
     for name in names:
         value = env_map[name]
         colored_name = colored(name, color="green", attrs=["bold"])

zrb/builtin/eval.py

@@ -1,4 +1,5 @@
-from zrb.helper.typing import Any
+from typing import Any
+
 from zrb.runner import runner
 from zrb.task.decorator import python_task
 from zrb.task_input.str_input import StrInput

zrb/builtin/git/get_file_changes.py

@@ -1,8 +1,9 @@
+from typing import Any
+
 from zrb.builtin.git._group import git_group
 from zrb.helper.accessories.color import colored
 from zrb.helper.git.detect_changes import get_modified_file_states
 from zrb.helper.task import show_lines
-from zrb.helper.typing import Any
 from zrb.runner import runner
 from zrb.task.decorator import python_task
 from zrb.task_input.bool_input import BoolInput

zrb/builtin/md5/hash.py

@@ -1,7 +1,7 @@
 import hashlib
+from typing import Any
 
 from zrb.builtin.md5._group import md5_group
-from zrb.helper.typing import Any
 from zrb.runner import runner
 from zrb.task.decorator import python_task
 from zrb.task_input.str_input import StrInput

zrb/builtin/md5/sum.py

@@ -1,9 +1,9 @@
 import hashlib
+from typing import Any
 
 import aiofiles
 
 from zrb.builtin.md5._group import md5_group
-from zrb.helper.typing import Any
 from zrb.runner import runner
 from zrb.task.decorator import python_task
 from zrb.task_input.str_input import StrInput

zrb/builtin/monorepo/__init__.py

@@ -0,0 +1,7 @@
+from zrb.builtin.monorepo.add import add_to_monorepo
+from zrb.builtin.monorepo.pull import pull_from_monorepo
+from zrb.builtin.monorepo.push import push_to_monorepo
+
+assert add_to_monorepo
+assert pull_from_monorepo
+assert push_to_monorepo

zrb/builtin/monorepo/_config.py

@@ -0,0 +1,11 @@
+import json
+import os
+from collections.abc import Mapping
+
+_PROJECT_DIR = os.getenv("ZRB_PROJECT_DIR", ".")
+MONOREPO_CONFIG_FILE = os.path.join(_PROJECT_DIR, "monorepo.zrb.json")
+MONOREPO_CONFIG: Mapping[str, Mapping[str, str]] = {}
+
+if os.path.isfile(MONOREPO_CONFIG_FILE):
+    with open(MONOREPO_CONFIG_FILE, "r") as file:
+        MONOREPO_CONFIG = json.load(file)

zrb/builtin/monorepo/_group.py

@@ -0,0 +1,3 @@
+from zrb.task_group.group import Group
+
+monorepo_group = Group(name="monorepo", description="Monorepo management")

zrb/builtin/monorepo/_task.py

@@ -0,0 +1,99 @@
+import os
+from datetime import datetime
+
+from zrb.builtin.monorepo._config import MONOREPO_CONFIG
+from zrb.builtin.monorepo._group import monorepo_group
+from zrb.helper.util import to_kebab_case
+from zrb.runner import runner
+from zrb.task.cmd_task import CmdTask
+from zrb.task_group.group import Group
+from zrb.task_input.str_input import StrInput
+
+_PROJECT_DIR = os.getenv("ZRB_PROJECT_DIR", ".")
+
+_pull_monorepo = CmdTask(
+    name="pull-monorepo",
+    inputs=[StrInput(name="message")],
+    cwd=_PROJECT_DIR,
+    cmd=[
+        "git add . -A",
+        'git commit -m "{{input.message}}"',
+        'git pull origin "$(git branch --show-current)"',
+    ],
+    retry=0,
+)
+
+PULL_SUBREPO_UPSTREAM = _pull_monorepo
+PUSH_SUBREPO_UPSTREAM = _pull_monorepo
+for name, config in MONOREPO_CONFIG.items():
+    kebab_name = to_kebab_case(name)
+    group = Group(
+        name=kebab_name, parent=monorepo_group, description=f"Subrepo {name} management"
+    )
+    subrepo_origin = config.get("origin", "")
+    subrepo_folder = config.get("folder", "")
+    subrepo_branch = config.get("branch", "main")
+
+    # define pull subrepo
+    pull_subrepo = CmdTask(
+        name="pull",
+        group=group,
+        inputs=[
+            StrInput(
+                name="message",
+                shortcut="m",
+                prompt="Commit Messsage",
+                default=lambda m: f"Pulling from subrepo at {datetime.now().strftime('%Y-%m-%d %I:%M:%p')}",  # noqa
+            )
+        ],
+        cmd=[
+            f'if [ ! -d "{subrepo_folder}" ]',
+            "then",
+            "   echo Run subtree add",
+            f'  git subtree add --prefix "{subrepo_folder}" "{subrepo_origin}" "{subrepo_branch}"',  # noqa
+            "fi",
+            "echo Run subtree pull",
+            "set -e",
+            f'git subtree pull --prefix "{subrepo_folder}" "{subrepo_origin}" "{subrepo_branch}"',  # noqa
+        ],
+        retry=0,
+    )
+    _pull_monorepo >> pull_subrepo
+    linked_pull_subrepo = pull_subrepo.copy()
+    PULL_SUBREPO_UPSTREAM >> linked_pull_subrepo
+    PULL_SUBREPO_UPSTREAM = linked_pull_subrepo
+    runner.register(pull_subrepo)
+
+    # define push subrepo
+    push_subrepo = CmdTask(
+        name="push",
+        group=group,
+        inputs=[
+            StrInput(
+                name="message",
+                shortcut="m",
+                prompt="Commit Messsage",
+                default=lambda m: f"Pushing to subrepo at {datetime.now().strftime('%Y-%m-%d %I:%M:%p')}",  # noqa
+            )
+        ],
+        cmd=[
+            f'if [ ! -d "{subrepo_folder}" ]',
+            "then",
+            "   echo Run subtree add",
+            f'  git subtree add --prefix "{subrepo_folder}" "{subrepo_origin}" "{subrepo_branch}"',  # noqa
+            "fi",
+            "echo Run subtree pull",
+            "set -e",
+            f'git subtree pull --prefix "{subrepo_folder}" "{subrepo_origin}" "{subrepo_branch}"',  # noqa
+            "set +e",
+            "git add . -A",
+            'git commit -m "{{input.message}}"',
+            f'git subtree push --prefix "{subrepo_folder}" "{subrepo_origin}" "{subrepo_branch}"',  # noqa
+        ],
+        retry=0,
+    )
+    _pull_monorepo >> push_subrepo
+    linked_push_subrepo = push_subrepo.copy()
+    PUSH_SUBREPO_UPSTREAM >> push_subrepo
+    PUSH_SUBREPO_UPSTREAM = linked_push_subrepo
+    runner.register(push_subrepo)

zrb/builtin/monorepo/add.py

@@ -0,0 +1,40 @@
+import json
+from collections.abc import Mapping
+
+from zrb.builtin.monorepo._config import MONOREPO_CONFIG, MONOREPO_CONFIG_FILE
+from zrb.builtin.monorepo._group import monorepo_group
+from zrb.runner import runner
+from zrb.task.any_task import AnyTask
+from zrb.task.decorator import python_task
+from zrb.task_input.str_input import StrInput
+
+
+@python_task(
+    name="add",
+    group=monorepo_group,
+    inputs=[
+        StrInput(name="alias", shortcut="a", prompt="Repo Alias", prompt_required=True),
+        StrInput(name="folder", shortcut="d", prompt="Directory", prompt_required=True),
+        StrInput(name="origin", shortcut="o", prompt="Repo URL", prompt_required=True),
+        StrInput(
+            name="branch",
+            shortcut="b",
+            prompt="Repo Branch",
+            prompt_required=True,
+            default="main",
+        ),
+    ],
+    description="Add repo to monorepo",
+    runner=runner,
+)
+def add_to_monorepo(*args, **kwargs):
+    task: AnyTask = kwargs.get("_task")
+    input_map: Mapping[str, str] = task.get_input_map()
+    config = dict(MONOREPO_CONFIG)
+    config[input_map.get("alias", "")] = {
+        "folder": input_map.get("folder", ""),
+        "branch": input_map.get("branch", ""),
+        "origin": input_map.get("origin", ""),
+    }
+    with open(MONOREPO_CONFIG_FILE, "w") as file:
+        json.dump(config, file, indent=2)

zrb/builtin/monorepo/pull.py

@@ -0,0 +1,23 @@
+from datetime import datetime
+
+from zrb.builtin.monorepo._group import monorepo_group
+from zrb.builtin.monorepo._task import PULL_SUBREPO_UPSTREAM
+from zrb.runner import runner
+from zrb.task.task import Task
+from zrb.task_input.str_input import StrInput
+
+pull_from_monorepo = Task(
+    name="pull",
+    group=monorepo_group,
+    description="Pulling from subrepos",
+    inputs=[
+        StrInput(
+            name="message",
+            shortcut="m",
+            prompt="Commit Messsage",
+            default=lambda m: f"Pulling from subrepos at {datetime.now().strftime('%Y-%m-%d %I:%M:%p')}",  # noqa
+        )
+    ],
+)
+PULL_SUBREPO_UPSTREAM >> pull_from_monorepo
+runner.register(pull_from_monorepo)

zrb/builtin/monorepo/push.py

@@ -0,0 +1,35 @@
+from datetime import datetime
+
+from zrb.builtin.monorepo._group import monorepo_group
+from zrb.builtin.monorepo._task import PUSH_SUBREPO_UPSTREAM
+from zrb.runner import runner
+from zrb.task.cmd_task import CmdTask
+from zrb.task.task import Task
+from zrb.task_input.str_input import StrInput
+
+_push_monorepo = CmdTask(
+    name="push-monorepo",
+    inputs=[StrInput(name="message")],
+    cmd=[
+        "git add . -A",
+        'git commit -m "{{input.message}}"',
+        'git push origin "$(git branch --show-current)"',
+    ],
+    retry=0,
+)
+
+push_to_monorepo = Task(
+    name="push",
+    group=monorepo_group,
+    description="Pushing to subrepos",
+    inputs=[
+        StrInput(
+            name="message",
+            shortcut="m",
+            prompt="Commit Messsage",
+            default=lambda m: f"Pushing to subrepos at {datetime.now().strftime('%Y-%m-%d %I:%M:%p')}",  # noqa
+        )
+    ],
+)
+PUSH_SUBREPO_UPSTREAM >> _push_monorepo >> push_to_monorepo
+runner.register(push_to_monorepo)

zrb/builtin/project/_helper.py

@@ -1,4 +1,5 @@
 import os
+from typing import Any, Optional
 
 from zrb.builtin.project._input import project_dir_input
 from zrb.helper import util
@@ -7,7 +8,6 @@ from zrb.helper.codemod.add_assert_resource import add_assert_resource
 from zrb.helper.codemod.add_import_module import add_import_module
 from zrb.helper.file.text import read_text_file_async, write_text_file_async
 from zrb.helper.typecheck import typechecked
-from zrb.helper.typing import Any, List, Optional
 from zrb.task.any_task import AnyTask
 from zrb.task.decorator import python_task
 from zrb.task.task import Task
@@ -61,8 +61,8 @@ async def register_module_to_project(
 @typechecked
 def create_register_module(
     module_path: str,
-    inputs: Optional[List[AnyInput]] = None,
-    upstreams: Optional[List[AnyTask]] = None,
+    inputs: Optional[list[AnyInput]] = None,
+    upstreams: Optional[list[AnyTask]] = None,
     alias: Optional[str] = None,
     task_name: str = "register-module",
 ) -> Task:

zrb/builtin/project/_input.py

@@ -2,12 +2,12 @@ import os
 
 from zrb.task_input.str_input import StrInput
 
-SYSTEM_USER = os.getenv("USER", "incognito")
+_PROJECT_DIR = os.getenv("ZRB_PROJECT_DIR", ".")
 
 project_dir_input = StrInput(
     name="project-dir",
     shortcut="d",
     description="Project directory",
     prompt="Project directory",
-    default=".",
+    default=_PROJECT_DIR,
 )

zrb/builtin/project/add/app/generator/generator.py

@@ -1,4 +1,5 @@
 import os
+from typing import Any
 
 from zrb.builtin.project._helper import validate_existing_project_dir
 from zrb.builtin.project._input import project_dir_input
@@ -13,7 +14,6 @@ from zrb.builtin.project.add.app.generator._input import (
 from zrb.helper.accessories.color import colored
 from zrb.helper.codemod.add_assert_resource import add_assert_resource
 from zrb.helper.codemod.add_import_module import add_import_module
-from zrb.helper.typing import Any
 from zrb.helper.util import to_kebab_case, to_snake_case
 from zrb.runner import runner
 from zrb.task.decorator import python_task

zrb/builtin/project/add/app/generator/template/src/kebab-zrb-package-name/src/snake_zrb_package_name/snake_zrb_generator_name/snake_zrb_generator_name.py

@@ -1,4 +1,5 @@
 import os
+from typing import Any
 
 from zrb.builtin.project._helper import (
     create_register_module,
@@ -8,7 +9,6 @@ from zrb.builtin.project._helper import (
 from zrb.builtin.project._input import project_dir_input
 from zrb.builtin.project.add.app._group import project_add_app_group
 from zrb.helper.accessories.color import colored
-from zrb.helper.typing import Any
 from zrb.helper.util import to_kebab_case
 from zrb.runner import runner
 from zrb.task.decorator import python_task

zrb/builtin/project/add/app/generator/template/src/kebab-zrb-package-name/src/snake_zrb_package_name/snake_zrb_generator_name/template/_automate/snake_zrb_app_name/container/remove.py

@@ -15,7 +15,7 @@ remove_snake_zrb_app_name_container = DockerComposeTask(
     cwd=RESOURCE_DIR,
     compose_cmd="down",
     compose_env_prefix="CONTAINER_ZRB_ENV_PREFIX",
-    compose_service_configs={"snake_zrb_app_name": snake_zrb_app_name_service_config},
+    compose_service_configs={"kebab-zrb-app-name": snake_zrb_app_name_service_config},
     env_files=[compose_env_file],
     envs=[
         image_env,

zrb/builtin/project/add/app/generator/template/src/kebab-zrb-package-name/src/snake_zrb_package_name/snake_zrb_generator_name/template/_automate/snake_zrb_app_name/container/start.py

@@ -26,7 +26,7 @@ start_snake_zrb_app_name_container = DockerComposeStartTask(
     upstreams=[build_snake_zrb_app_name_image, remove_snake_zrb_app_name_container],
     cwd=RESOURCE_DIR,
     compose_env_prefix="CONTAINER_ZRB_ENV_PREFIX",
-    compose_service_configs={"snake_zrb_app_name": snake_zrb_app_name_service_config},
+    compose_service_configs={"kebab-zrb-app-name": snake_zrb_app_name_service_config},
     env_files=[compose_env_file],
     envs=[
         image_env,

zrb/builtin/project/add/app/generator/template/src/kebab-zrb-package-name/src/snake_zrb_package_name/snake_zrb_generator_name/template/_automate/snake_zrb_app_name/container/stop.py

@@ -15,7 +15,7 @@ stop_snake_zrb_app_name_container = DockerComposeTask(
     cwd=RESOURCE_DIR,
     compose_cmd="stop",
     compose_env_prefix="CONTAINER_ZRB_ENV_PREFIX",
-    compose_service_configs={"snake_zrb_app_name": snake_zrb_app_name_service_config},
+    compose_service_configs={"kebab-zrb-app-name": snake_zrb_app_name_service_config},
     env_files=[compose_env_file],
     envs=[
         image_env,

zrb/builtin/project/add/app/generator/template/src/kebab-zrb-package-name/src/snake_zrb_package_name/snake_zrb_generator_name/template/src/kebab-zrb-app-name/docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3'
-
 x-logging: &default-logging
   options:
     max-size: "100m"

zrb/builtin/project/add/app/python/python.py

@@ -1,4 +1,5 @@
 import os
+from typing import Any
 
 from zrb.builtin.project._helper import (
     create_register_module,
@@ -17,7 +18,6 @@ from zrb.builtin.project.add.app.python._input import (
     http_port_input,
 )
 from zrb.helper.accessories.color import colored
-from zrb.helper.typing import Any
 from zrb.helper.util import to_kebab_case
 from zrb.runner import runner
 from zrb.task.decorator import python_task

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

@@ -15,7 +15,7 @@ remove_snake_zrb_app_name_container = DockerComposeTask(
     cwd=RESOURCE_DIR,
     compose_cmd="down",
     compose_env_prefix="CONTAINER_ZRB_ENV_PREFIX",
-    compose_service_configs={"snake_zrb_app_name": snake_zrb_app_name_service_config},
+    compose_service_configs={"kebab-zrb-app-name": snake_zrb_app_name_service_config},
     env_files=[compose_env_file],
     envs=[
         image_env,

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

@@ -26,7 +26,7 @@ start_snake_zrb_app_name_container = DockerComposeStartTask(
     upstreams=[build_snake_zrb_app_name_image, remove_snake_zrb_app_name_container],
     cwd=RESOURCE_DIR,
     compose_env_prefix="CONTAINER_ZRB_ENV_PREFIX",
-    compose_service_configs={"snake_zrb_app_name": snake_zrb_app_name_service_config},
+    compose_service_configs={"kebab-zrb-app-name": snake_zrb_app_name_service_config},
     env_files=[compose_env_file],
     envs=[
         image_env,

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

@@ -15,7 +15,7 @@ stop_snake_zrb_app_name_container = DockerComposeTask(
     cwd=RESOURCE_DIR,
     compose_cmd="stop",
     compose_env_prefix="CONTAINER_ZRB_ENV_PREFIX",
-    compose_service_configs={"snake_zrb_app_name": snake_zrb_app_name_service_config},
+    compose_service_configs={"kebab-zrb-app-name": snake_zrb_app_name_service_config},
     env_files=[compose_env_file],
     envs=[
         image_env,

zrb/builtin/project/add/app/python/template/src/kebab-zrb-app-name/docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3'
-
 x-logging: &default-logging
   options:
     max-size: "100m"

zrb/builtin/project/add/fastapp/app/app.py

@@ -1,4 +1,5 @@
 import os
+from typing import Any
 
 from zrb.builtin.project._helper import (
     create_register_module,
@@ -16,8 +17,8 @@ from zrb.builtin.project.add.fastapp.app._input import (
     env_prefix_input,
     http_port_input,
 )
+from zrb.config.config import VERSION
 from zrb.helper.accessories.color import colored
-from zrb.helper.typing import Any
 from zrb.helper.util import to_kebab_case
 from zrb.runner import runner
 from zrb.task.decorator import python_task
@@ -70,6 +71,7 @@ copy_resource = ResourceMaker(
         "zrb-app-image-name": "{{input.app_image_name}}",
         "zrbAppHttpAuthPort": '{{util.coalesce(input.http_port, "3001") + 1}}',
         "zrbAppHttpLogPort": '{{util.coalesce(input.http_port, "3001") + 2}}',
+        "zrbVersion": VERSION,
     },
     template_path=os.path.join(_CURRENT_DIR, "template"),
     destination_path="{{ input.project_dir }}",

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

@@ -3,6 +3,6 @@ from typing import Any
 
 def activate_all_compose_profile(*args: Any, **kwargs: Any) -> str:
     compose_profile_str = ",".join(
-        ["monitoring", "monolith", "microservices", "kafka", "rabbitmq"]
+        ["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/_service_config.py

@@ -1,5 +1,5 @@
 import os
-from typing import Mapping
+from collections.abc import Mapping
 
 from zrb import Env, EnvFile, ServiceConfig
 from zrb.helper.util import to_kebab_case

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

@@ -1,4 +1,4 @@
-from typing import Any, List
+from typing import Any
 
 from ..support._helper import get_support_container_compose_profiles
 
@@ -18,7 +18,7 @@ def should_start_microservices_container(*args: Any, **kwargs: Any) -> bool:
 
 def _get_microservices_container_compose_profiles(
     *args: Any, **kwargs: Any
-) -> List[str]:
+) -> 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,4 +1,4 @@
-from typing import Any, List
+from typing import Any
 
 from ..support._helper import get_support_container_compose_profiles
 
@@ -16,7 +16,7 @@ def should_start_monolith_container(*args: Any, **kwargs: Any) -> bool:
     return len(compose_profiles) > 0
 
 
-def _get_monolith_container_compose_profiles(*args: Any, **kwargs: Any) -> List[str]:
+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