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

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/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/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

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

@@ -1,5 +1,6 @@
 import logging
-from typing import Any, List, Mapping, Optional, Type, TypeVar
+from collections.abc import Mapping
+from typing import Any, Optional, Type, TypeVar
 
 from component.repo.repo import Repo
 from component.repo.search_filter import SearchFilter
@@ -28,8 +29,8 @@ class DBRepo(Repo[Schema, SchemaData]):
     ):
         self.logger = logger
         self.engine = engine
-        self.db_entity_attribute_names: List[str] = dir(self.db_entity_cls)
-        self._keyword_fields: Optional[List[InstrumentedAttribute]] = None
+        self.db_entity_attribute_names: list[str] = dir(self.db_entity_cls)
+        self._keyword_fields: Optional[list[InstrumentedAttribute]] = None
 
     async def get_by_id(self, id: str) -> Schema:
         """
@@ -48,7 +49,7 @@ class DBRepo(Repo[Schema, SchemaData]):
         search_filter: Optional[SearchFilter] = None,
         limit: int = 100,
         offset: int = 0,
-    ) -> List[Schema]:
+    ) -> list[Schema]:
         """
         Find multiple records by keyword with limit and offset.
         """
@@ -164,7 +165,7 @@ class DBRepo(Repo[Schema, SchemaData]):
         criterion: _ColumnExpressionArgument[bool],
         limit: int = 100,
         offset: int = 0,
-    ) -> List[DBEntity]:
+    ) -> list[DBEntity]:
         try:
             db_query = db.query(self.db_entity_cls).filter(criterion)
             if "created_at" in self.db_entity_attribute_names:
@@ -245,7 +246,7 @@ class DBRepo(Repo[Schema, SchemaData]):
         ]
         return or_(*keyword_criterion)
 
-    def _get_keyword_fields(self) -> List[InstrumentedAttribute]:
+    def _get_keyword_fields(self) -> list[InstrumentedAttribute]:
         """
         Return list of fields for keyword filtering
         """

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

@@ -1,5 +1,5 @@
 from abc import ABC, abstractmethod
-from typing import Generic, List, Optional, TypeVar
+from typing import Generic, Optional, TypeVar
 
 from component.repo.search_filter import SearchFilter
 from pydantic import BaseModel
@@ -16,7 +16,7 @@ class Repo(Generic[Schema, SchemaData], ABC):
     @abstractmethod
     async def get(
         self, search_filter: Optional[SearchFilter], limit: int, offset: int
-    ) -> List[Schema]:
+    ) -> list[Schema]:
         pass
 
     @abstractmethod

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

@@ -1,4 +1,5 @@
-from typing import Any, Mapping
+from collections.abc import Mapping
+from typing import Any
 
 from pydantic import BaseModel
 

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

@@ -1,6 +1,7 @@
 import asyncio
 import logging
-from typing import Any, Callable
+from collections.abc import Callable
+from typing import Any
 
 from component.messagebus.messagebus import Admin, Consumer, Publisher
 from component.rpc.rpc import Caller, Message, Result

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

@@ -1,6 +1,7 @@
 import inspect
 import logging
-from typing import Any, Mapping
+from collections.abc import Mapping
+from typing import Any
 
 from component.messagebus.messagebus import Consumer, Publisher
 from component.rpc.rpc import Message, Result, Server, TRPCHandler

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

@@ -1,5 +1,6 @@
 from abc import ABC, abstractmethod
-from typing import Any, Callable, List, Mapping, TypeVar
+from collections.abc import Callable, Mapping
+from typing import Any, TypeVar
 
 TRPCHandler = Callable[..., Any]
 TMessage = TypeVar("TMessage", bound="Message")
@@ -27,7 +28,7 @@ class Server(ABC):
 
 
 class Message:
-    def __init__(self, reply_event: str, args: List[Any], kwargs: Mapping[str, Any]):
+    def __init__(self, reply_event: str, args: list[Any], kwargs: Mapping[str, Any]):
         self.reply_event = reply_event
         self.args = args
         self.kwargs = kwargs

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

@@ -1,5 +1,6 @@
 from abc import ABC, abstractmethod
-from typing import Any, Callable
+from collections.abc import Callable
+from typing import Any
 
 import jsons
 

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

@@ -1,6 +1,5 @@
 import json
 import os
-from typing import List
 
 from helper.conversion import str_to_boolean, str_to_logging_level
 
@@ -80,14 +79,14 @@ APP_KAFKA_SASL_MECHANISM = os.getenv("APP_KAFKA_SASL_MECHANISM", "SCRAM-SHA-512"
 APP_KAFKA_SASL_USER = os.getenv("APP_KAFKA_SASL_USER", "admin")
 APP_KAFKA_SASL_PASS = os.getenv("APP_KAFKA_SASL_PASS", "admin")
 
-APP_CORS_ALLOW_ORIGINS: List[str] = json.loads(
+APP_CORS_ALLOW_ORIGINS: list[str] = json.loads(
     os.getenv("APP_CORS_ALLOW_ORIGINS", '["*"]')
 )
 APP_CORS_ALLOW_ORIGIN_REGEX: str = os.getenv("APP_CORS_ALLOW_ORIGIN_REGEX", "")
-APP_CORS_ALLOW_METHODS: List[str] = json.loads(
+APP_CORS_ALLOW_METHODS: list[str] = json.loads(
     os.getenv("APP_CORS_ALLOW_METHODS", '["*"]')
 )
-APP_CORS_ALLOW_HEADERS: List[str] = json.loads(
+APP_CORS_ALLOW_HEADERS: list[str] = json.loads(
     os.getenv("APP_CORS_ALLOW_HEADERS", '["*"]')
 )
 APP_CORS_ALLOW_CREDENTIALS: bool = str_to_boolean(