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

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

@@ -1,59 +1,8 @@
-from typing import Any, List
-
-from zrb import Task
-
-
-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] = []
-    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
-
-
-def get_container_compose_profiles(*args: Any, **kwargs: Any) -> str:
-    compose_profiles = get_support_container_compose_profiles(*args, **kwargs)
-    compose_profiles.append(
-        kwargs.get("snake_zrb_app_name_run_mode", "monolith"),
-    )
-    return compose_profiles
-
-
-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 should_start_local_monolith(*args: Any, **kwargs: Any) -> bool:
-    if not kwargs.get("local_snake_zrb_app_name", True):
-        return False
-    return kwargs.get("snake_zrb_app_name_run_mode", "monolith") == "monolith"
-
-
-def activate_selected_compose_profile(*args: Any, **kwargs: Any) -> str:
-    compose_profiles = get_container_compose_profiles(*args, **kwargs)
-    compose_profile_str = ",".join(compose_profiles)
-    return f"export COMPOSE_PROFILES={compose_profile_str}"
+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}"
-
-
-def should_start_container(*args: Any, **kwargs: Any) -> bool:
-    return kwargs.get("local_snake_zrb_app_name", True)

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/microservices/start.py

@@ -1,4 +1,4 @@
-from zrb import DockerComposeTask, runner
+from zrb import DockerComposeStartTask, runner
 
 from ...._project import start_project_containers
 from ..._checker import (
@@ -13,16 +13,17 @@ from ..._checker import (
 )
 from ..._constant import PREFER_MICROSERVICES, RESOURCE_DIR
 from ..._input import host_input, https_input, local_input
+from ...image import build_snake_zrb_app_name_image
 from ...image._env import image_env
 from ...image._input import image_input
 from .._env import compose_env_file, host_port_env
 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
-from .init import init_snake_zrb_app_name_microservices_container
 
-start_snake_zrb_app_name_microservices_container = DockerComposeTask(
+start_snake_zrb_app_name_microservices_container = DockerComposeStartTask(
     icon="🐳",
     name="start",
     description="Start human readable zrb app name container",
@@ -35,11 +36,9 @@ start_snake_zrb_app_name_microservices_container = DockerComposeTask(
         image_input,
     ],
     should_execute="{{ input.local_snake_zrb_app_name}}",
-    upstreams=[init_snake_zrb_app_name_microservices_container],
+    upstreams=[build_snake_zrb_app_name_image, remove_snake_zrb_app_name_container],
     cwd=RESOURCE_DIR,
     setup_cmd=activate_microservices_compose_profile,
-    compose_cmd="logs",
-    compose_flags=["-f"],
     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/_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

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

@@ -1,4 +1,4 @@
-from zrb import DockerComposeTask, runner
+from zrb import DockerComposeStartTask, runner
 
 from ...._project import start_project_containers
 from ..._checker import (
@@ -13,16 +13,17 @@ from ..._checker import (
 )
 from ..._constant import PREFER_MICROSERVICES, RESOURCE_DIR
 from ..._input import host_input, https_input, local_input
+from ...image import build_snake_zrb_app_name_image
 from ...image._env import image_env
 from ...image._input import image_input
 from .._env import compose_env_file, host_port_env
 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
-from .init import init_snake_zrb_app_name_monolith_container
 
-start_snake_zrb_app_name_monolith_container = DockerComposeTask(
+start_snake_zrb_app_name_monolith_container = DockerComposeStartTask(
     icon="🐳",
     name="start",
     description="Start human readable zrb app name container",
@@ -35,11 +36,9 @@ start_snake_zrb_app_name_monolith_container = DockerComposeTask(
         image_input,
     ],
     should_execute="{{ input.local_snake_zrb_app_name}}",
-    upstreams=[init_snake_zrb_app_name_monolith_container],
+    upstreams=[build_snake_zrb_app_name_image, remove_snake_zrb_app_name_container],
     cwd=RESOURCE_DIR,
     setup_cmd=activate_monolith_compose_profile,
-    compose_cmd="logs",
-    compose_flags=["-f"],
     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,6 +5,7 @@ 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(
@@ -13,6 +14,7 @@ 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_env_prefix="CONTAINER_ZRB_ENV_PREFIX",
     compose_service_configs=snake_zrb_app_name_service_configs,

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

@@ -1,4 +1,4 @@
-from typing import Any, List
+from typing import Any
 
 from zrb import Task
 
@@ -16,10 +16,12 @@ def should_start_support_container(*args: Any, **kwargs: Any) -> bool:
     return len(compose_profiles) > 0
 
 
-def get_support_container_compose_profiles(*args: Any, **kwargs: Any) -> List[str]:
+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] = []
+    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)

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

@@ -1,4 +1,4 @@
-from zrb import DockerComposeTask, runner
+from zrb import DockerComposeStartTask, runner
 
 from ..._checker import (
     kafka_outside_checker,
@@ -15,11 +15,11 @@ from ...image._input import image_input
 from .._env import compose_env_file
 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
-from .init import init_snake_zrb_app_name_support_container
 
-start_snake_zrb_app_name_support_container = DockerComposeTask(
+start_snake_zrb_app_name_support_container = DockerComposeStartTask(
     icon="🐳",
     name="start",
     description="Start human readable zrb app name container",
@@ -32,11 +32,9 @@ start_snake_zrb_app_name_support_container = DockerComposeTask(
         image_input,
     ],
     should_execute=should_start_support_container,
-    upstreams=[init_snake_zrb_app_name_support_container],
+    upstreams=[remove_snake_zrb_app_name_container],
     cwd=RESOURCE_DIR,
     setup_cmd=activate_support_compose_profile,
-    compose_cmd="logs",
-    compose_flags=["-f"],
     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/frontend/build-once.sh

@@ -1,4 +1,4 @@
 echo "Installing node packages, might take a while"
 npm install --save-dev
 echo "Building frontend"
-npm run build:watch
+npm run build

zrb/builtin/project/add/fastapp/app/template/_automate/snake_zrb_app_name/frontend/build.sh

@@ -1,4 +1,4 @@
 echo "Installing node packages, might take a while"
 npm install --save-dev
 echo "Building frontend"
-npm run build
+npm run build:watch

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

@@ -1,5 +1,3 @@
-from typing import List
-
 from zrb import Env, EnvFile
 from zrb.helper.util import to_kebab_case, to_snake_case
 
@@ -7,7 +5,7 @@ from .._constant import APP_TEMPLATE_ENV_FILE_NAME, MODULES
 from .._env import app_enable_otel_env
 
 
-def get_service_envs(base_port: int, module_index: int, module_name: str) -> List[Env]:
+def get_service_envs(base_port: int, module_index: int, module_name: str) -> list[Env]:
     kebab_module_name = to_kebab_case(module_name)
     snake_module_name = to_snake_case(module_name)
     upper_snake_module_name = snake_module_name.upper()
@@ -48,8 +46,8 @@ def get_service_env_file(module_name: str) -> EnvFile:
     )
 
 
-def get_disable_all_module_envs() -> List[Env]:
-    disable_all_module_envs: List[Env] = []
+def get_disable_all_module_envs() -> list[Env]:
+    disable_all_module_envs: list[Env] = []
     for module in MODULES:
         snake_module_name = to_snake_case(module)
         upper_snake_module_name = snake_module_name.upper()

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

@@ -1,8 +1,8 @@
 import os
+from typing import Any
 
 from zrb import Task, python_task, runner
 from zrb.helper.accessories.color import colored
-from zrb.helper.typing import Any
 
 from ..._project import start_project
 from .._constant import PREFER_MICROSERVICES
@@ -10,7 +10,7 @@ from .._input import host_input, https_input, local_input
 from ..container._input import enable_monitoring_input
 from ._group import snake_zrb_app_name_microservices_group
 from .start_gateway import start_snake_zrb_app_name_gateway
-from .start_microservices import start_snake_zrb_app_name_microservices
+from .start_services import start_snake_zrb_app_name_services
 
 _CURRENT_DIR = os.path.dirname(__file__)
 
@@ -28,7 +28,7 @@ _CURRENT_DIR = os.path.dirname(__file__)
     ],
     upstreams=[
         start_snake_zrb_app_name_gateway,
-        *start_snake_zrb_app_name_microservices,
+        *start_snake_zrb_app_name_services,
     ],
 )
 def start_snake_zrb_app_name_microservices(*args: Any, **kwargs: Any):

zrb/builtin/project/add/fastapp/app/template/_automate/snake_zrb_app_name/microservices/{start_microservices.py → start_services.py}

@@ -1,5 +1,4 @@
 import os
-from typing import List
 
 from zrb import CmdTask, HTTPChecker, Task
 from zrb.helper.util import to_kebab_case
@@ -16,7 +15,7 @@ _CURRENT_DIR = os.path.dirname(__file__)
 
 
 _disable_all_module_envs = get_disable_all_module_envs()
-start_snake_zrb_app_name_microservices: List[Task] = []
+start_snake_zrb_app_name_services: list[Task] = []
 for _module_index, _module_name in enumerate(MODULES):
     _service_env_file = get_service_env_file(_module_name)
     _service_envs = get_service_envs(zrbAppHttpPort, _module_index, _module_name)
@@ -52,4 +51,4 @@ for _module_index, _module_name in enumerate(MODULES):
             )
         ],
     )
-    start_snake_zrb_app_name_microservices.append(_start_service)
+    start_snake_zrb_app_name_services.append(_start_service)

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

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

zrb/builtin/project/add/fastapp/app/template/src/kebab-zrb-app-name/deployment/_common.py

@@ -1,7 +1,7 @@
 import copy
 import os
 import re
-from typing import List, Mapping
+from collections.abc import Mapping
 
 import jsons
 from dotenv import dotenv_values
@@ -22,7 +22,7 @@ ENABLE_MONITORING: bool = os.getenv("ENABLE_MONITORING", "0") in [
 ]
 
 MODULE_JSON_STR: str = os.getenv("MODULES", "[]")
-MODULES: List[str] = jsons.loads(MODULE_JSON_STR)
+MODULES: list[str] = jsons.loads(MODULE_JSON_STR)
 
 APP_DIR: str = os.path.abspath(os.path.join(CURRENT_DIR, "..", "src"))
 TEMPLATE_ENV_FILE_NAME: str = os.path.join(APP_DIR, "template.env")
@@ -56,7 +56,7 @@ SIGNOZ_CLICKHOUSE_PASSWORD: str = os.getenv("SIGNOZ_CLICKHOUSE_PASSWORD", "toor"
 
 
 def get_app_monolith_env_map(
-    template_env_map: Mapping[str, str], modules: List[str]
+    template_env_map: Mapping[str, str], modules: list[str]
 ) -> Mapping[str, str]:
     env_map = copy.deepcopy(template_env_map)
     env_map["APP_RMQ_CONNECTION"] = (
@@ -84,7 +84,7 @@ def get_app_monolith_env_map(
 
 
 def get_app_gateway_env_map(
-    template_env_map: Mapping[str, str], modules: List[str]
+    template_env_map: Mapping[str, str], modules: list[str]
 ) -> Mapping[str, str]:
     env_map = get_app_monolith_env_map(template_env_map, modules)
     for module_name in modules:
@@ -99,7 +99,7 @@ def get_app_gateway_env_map(
 
 
 def get_app_service_env_map(
-    template_env_map: Mapping[str, str], modules: List[str], current_module: str
+    template_env_map: Mapping[str, str], modules: list[str], current_module: str
 ) -> Mapping[str, str]:
     env_map = get_app_monolith_env_map(template_env_map, modules)
     for module_name in modules:

zrb/builtin/project/add/fastapp/app/template/src/kebab-zrb-app-name/deployment/app_helper.py

@@ -1,5 +1,5 @@
 import os
-from typing import List, Mapping
+from collections.abc import Mapping
 
 import pulumi_kubernetes as k8s
 from _common import (
@@ -24,8 +24,8 @@ app_port = int(os.getenv("APP_PORT", app_monolith_env_map.get("APP_PORT", "8080"
 app_gateway_env_map = get_app_gateway_env_map(TEMPLATE_ENV_MAP, MODULES)
 
 
-def create_app_microservices_deployments() -> List[k8s.apps.v1.Deployment]:
-    deployments: List[k8s.apps.v1.Deployment] = []
+def create_app_microservices_deployments() -> list[k8s.apps.v1.Deployment]:
+    deployments: list[k8s.apps.v1.Deployment] = []
     deployments.append(
         _create_app_deployment(
             resource_name="kebab-zrb-app-name-gateway",
@@ -58,8 +58,8 @@ def create_app_microservices_deployments() -> List[k8s.apps.v1.Deployment]:
     return deployments
 
 
-def create_app_microservices_services() -> List[k8s.core.v1.Service]:
-    services: List[k8s.core.v1.Service] = []
+def create_app_microservices_services() -> list[k8s.core.v1.Service]:
+    services: list[k8s.core.v1.Service] = []
     services.append(
         _create_app_service(
             resource_name="kebab-zrb-app-name-gateway",

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

@@ -1,5 +1,3 @@
-version: '3'
-
 x-logging: &default-logging
   options:
     max-size: "100m"
@@ -112,6 +110,8 @@ services:
     container_name: ${CONTAINER_PREFIX:-my}-kebab-zrb-app-name-postgresql
     hostname: postgresql
     restart: unless-stopped
+    profiles:
+    - postgres
     environment:
       POSTGRES_USER: ${POSTGRES_USER:-postgres}
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-admin}

zrb/builtin/project/add/fastapp/app/template/src/kebab-zrb-app-name/loadtest/locustfile.py

@@ -2,9 +2,7 @@ import os
 
 from locust import HttpUser, between, task
 
-access_token_cookie_key = os.getenv(
-    "PUBLIC_AUTH_ACCESS_TOKEN_COOKIE_KEY", "access_token"
-)
+access_token_cookie_key = os.getenv("APP_AUTH_ACCESS_TOKEN_COOKIE_KEY", "access_token")
 admin_username = os.getenv("APP_AUTH_ADMIN_USERNAME", "root")
 admin_password = os.getenv("APP_AUTH_ADMIN_PASSWORD", "toor")
 

zrb/builtin/project/add/fastapp/app/template/src/kebab-zrb-app-name/loadtest/template.env

@@ -1,3 +1,3 @@
-PUBLIC_AUTH_ACCESS_TOKEN_COOKIE_KEY=access_token
+APP_AUTH_ACCESS_TOKEN_COOKIE_KEY=access_token
 APP_AUTH_ADMIN_USERNAME=root
 APP_AUTH_ADMIN_PASSWORD=toor

zrb/builtin/project/add/fastapp/app/template/src/kebab-zrb-app-name/src/component/error.py

@@ -1,4 +1,5 @@
-from typing import Any, Mapping, Optional
+from collections.abc import Mapping
+from typing import Any, Optional
 
 from fastapi import HTTPException
 

zrb/builtin/project/add/fastapp/app/template/src/kebab-zrb-app-name/src/component/messagebus/kafka/admin.py

@@ -1,6 +1,7 @@
 import asyncio
 import logging
-from typing import List, Mapping, Optional
+from collections.abc import Mapping
+from typing import Optional
 
 from aiokafka import __version__
 from aiokafka.admin import AIOKafkaAdminClient, NewTopic
@@ -44,7 +45,7 @@ class KafkaAdmin(Admin):
         self.sasl_oauth_token_provider = sasl_oauth_token_provider
         self._existing_events: Mapping[str, bool] = {}
 
-    async def create_events(self, event_names: List[str]):
+    async def create_events(self, event_names: list[str]):
         # Only handle non-existing events
         event_names = [
             event_name
@@ -72,7 +73,7 @@ class KafkaAdmin(Admin):
         for event_name in event_names:
             self._existing_events[event_name] = True
 
-    async def delete_events(self, event_names: List[str]):
+    async def delete_events(self, event_names: list[str]):
         # Only handle existing events
         event_names = [
             event_name

zrb/builtin/project/add/fastapp/app/template/src/kebab-zrb-app-name/src/component/messagebus/kafka/consumer.py

@@ -1,7 +1,8 @@
 import asyncio
 import inspect
 import logging
-from typing import Any, Callable, Mapping, Optional
+from collections.abc import Callable, Mapping
+from typing import Any, Optional
 
 from aiokafka import AIOKafkaConsumer, __version__
 from aiokafka.consumer.consumer import RoundRobinPartitionAssignor

zrb/builtin/project/add/fastapp/app/template/src/kebab-zrb-app-name/src/component/messagebus/messagebus.py

@@ -1,5 +1,6 @@
 from abc import ABC, abstractmethod
-from typing import Any, Callable, List, Mapping, Optional
+from collections.abc import Callable, Mapping
+from typing import Any, Optional
 
 from component.serializer.serializer import JsonSerializer, Serializer
 
@@ -8,11 +9,11 @@ TEventHandler = Callable[[Any], Any]
 
 class Admin(ABC):
     @abstractmethod
-    async def create_events(self, event_names: List[str]):
+    async def create_events(self, event_names: list[str]):
         pass
 
     @abstractmethod
-    async def delete_events(self, event_names: List[str]):
+    async def delete_events(self, event_names: list[str]):
         pass
 
 

zrb/builtin/project/add/fastapp/app/template/src/kebab-zrb-app-name/src/component/messagebus/mock.py

@@ -1,7 +1,8 @@
 import asyncio
 import inspect
 import logging
-from typing import Any, Callable, List, Mapping
+from collections.abc import Callable, Mapping
+from typing import Any
 
 from component.messagebus.messagebus import (
     Admin,
@@ -59,8 +60,8 @@ class MockPublisher(Publisher):
 
 
 class MockAdmin(Admin):
-    async def create_events(self, event_names: List[str]):
+    async def create_events(self, event_names: list[str]):
         return
 
-    async def delete_events(self, event_names: List[str]):
+    async def delete_events(self, event_names: list[str]):
         return

zrb/builtin/project/add/fastapp/app/template/src/kebab-zrb-app-name/src/component/messagebus/rabbitmq/admin.py

@@ -1,6 +1,7 @@
 import asyncio
 import logging
-from typing import Any, List, Mapping, Optional
+from collections.abc import Mapping
+from typing import Any, Optional
 
 import aiormq
 from component.messagebus.messagebus import Admin
@@ -28,7 +29,7 @@ class RMQAdmin(Admin):
         self.configs = configs
         self._existing_events: Mapping[str, bool] = {}
 
-    async def create_events(self, event_names: List[str]):
+    async def create_events(self, event_names: list[str]):
         # Only handle non-existing events
         event_names = [
             event_name
@@ -60,7 +61,7 @@ class RMQAdmin(Admin):
                 exc_info=True,
             )
 
-    async def delete_events(self, event_names: List[str]):
+    async def delete_events(self, event_names: list[str]):
         # Only handle existing events
         event_names = [
             event_name

zrb/builtin/project/add/fastapp/app/template/src/kebab-zrb-app-name/src/component/messagebus/rabbitmq/consumer.py

@@ -1,7 +1,8 @@
 import asyncio
 import inspect
 import logging
-from typing import Any, Callable, Mapping, Optional
+from collections.abc import Callable, Mapping
+from typing import Any, Optional
 
 import aiormq
 from component.messagebus.messagebus import (
@@ -68,7 +69,7 @@ class RMQConsumer(Consumer):
             await self._connect()
             event_names = list(self._handlers.keys())
             await self.rmq_admin.create_events(event_names)
-            f'🐰 [{self.identifier}] Listening from "{event_names}"'
+            f'🐰 [{self.identifier}] listening from "{event_names}"'
             for event_name in event_names:
                 queue_name = self.rmq_admin.get_queue_name(event_name)
                 on_message = self._create_consumer_callback(self.channel, event_name)

zrb/builtin/project/add/fastapp/app/template/src/kebab-zrb-app-name/src/component/model/repo_model.py

@@ -1,4 +1,4 @@
-from typing import Generic, List, Optional, Type, TypeVar
+from typing import Generic, Optional, Type, TypeVar
 
 from component.repo.repo import Repo
 from component.repo.search_filter import SearchFilter
@@ -18,10 +18,10 @@ class RepoModel(Generic[Schema, SchemaData, SchemaResult]):
     async def get_by_id(self, id: str) -> Schema:
         return await self.repo.get_by_id(id)
 
-    async def get_all(self) -> List[Schema]:
+    async def get_all(self) -> list[Schema]:
         count = await self.repo.count()
         limit = 1000
-        schema_list: List[Schema] = []
+        schema_list: list[Schema] = []
         for offset in range(0, count, limit):
             partial_schema_list = await self.repo.get(limit=limit, offset=offset)
             schema_list += partial_schema_list