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

zrb/__init__.py

@@ -14,6 +14,7 @@ from zrb.task.base_remote_cmd_task import BaseRemoteCmdTask, RemoteConfig
 from zrb.task.checker import Checker
 from zrb.task.cmd_task import CmdTask
 from zrb.task.decorator import python_task
+from zrb.task.docker_compose_start_task import DockerComposeStartTask
 from zrb.task.docker_compose_task import DockerComposeTask, ServiceConfig
 from zrb.task.flow_task import FlowTask
 from zrb.task.http_checker import HTTPChecker
@@ -66,6 +67,7 @@ assert python_task
 assert Task
 assert CmdTask
 assert DockerComposeTask
+assert DockerComposeStartTask
 assert ServiceConfig
 assert BaseRemoteCmdTask
 assert RemoteConfig

zrb/builtin/devtool/install/_input.py

@@ -1,9 +1,9 @@
-from zrb.config.config import default_shell
+from zrb.config.config import DEFAULT_SHELL
 from zrb.task_input.str_input import StrInput
 
 terminal_config_file_input = StrInput(
     name="config-file",
     shortcut="c",
     prompt="Config file",
-    default="~/.zshrc" if default_shell == "zsh" else "~/.bashrc",
+    default="~/.zshrc" if DEFAULT_SHELL == "zsh" else "~/.bashrc",
 )

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

@@ -1,16 +1,17 @@
-from zrb import DockerComposeTask, HTTPChecker, runner
+from zrb import DockerComposeStartTask, HTTPChecker, runner
 
 from ..._project import start_project_containers
 from .._constant import 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 ._group import snake_zrb_app_name_container_group
 from ._service_config import snake_zrb_app_name_service_config
-from .init import init_snake_zrb_app_name_container
+from .remove import remove_snake_zrb_app_name_container
 
-start_snake_zrb_app_name_container = DockerComposeTask(
+start_snake_zrb_app_name_container = DockerComposeStartTask(
     icon="🐳",
     name="start",
     description="Start human readable zrb app name container",
@@ -22,10 +23,8 @@ start_snake_zrb_app_name_container = DockerComposeTask(
         image_input,
     ],
     should_execute="{{ input.local_snake_zrb_app_name}}",
-    upstreams=[init_snake_zrb_app_name_container],
+    upstreams=[build_snake_zrb_app_name_image, remove_snake_zrb_app_name_container],
     cwd=RESOURCE_DIR,
-    compose_cmd="logs",
-    compose_flags=["-f"],
     compose_env_prefix="CONTAINER_ZRB_ENV_PREFIX",
     compose_service_configs={"snake_zrb_app_name": snake_zrb_app_name_service_config},
     env_files=[compose_env_file],

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

@@ -1,16 +1,17 @@
-from zrb import DockerComposeTask, HTTPChecker, runner
+from zrb import DockerComposeStartTask, HTTPChecker, runner
 
 from ..._project import start_project_containers
 from .._constant import 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 ._group import snake_zrb_app_name_container_group
 from ._service_config import snake_zrb_app_name_service_config
-from .init import init_snake_zrb_app_name_container
+from .remove import remove_snake_zrb_app_name_container
 
-start_snake_zrb_app_name_container = DockerComposeTask(
+start_snake_zrb_app_name_container = DockerComposeStartTask(
     icon="🐳",
     name="start",
     description="Start human readable zrb app name container",
@@ -22,10 +23,8 @@ start_snake_zrb_app_name_container = DockerComposeTask(
         image_input,
     ],
     should_execute="{{ input.local_snake_zrb_app_name}}",
-    upstreams=[init_snake_zrb_app_name_container],
+    upstreams=[build_snake_zrb_app_name_image, remove_snake_zrb_app_name_container],
     cwd=RESOURCE_DIR,
-    compose_cmd="logs",
-    compose_flags=["-f"],
     compose_env_prefix="CONTAINER_ZRB_ENV_PREFIX",
     compose_service_configs={"snake_zrb_app_name": snake_zrb_app_name_service_config},
     env_files=[compose_env_file],

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

@@ -1,51 +1,4 @@
-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:
@@ -53,7 +6,3 @@ def activate_all_compose_profile(*args: Any, **kwargs: Any) -> str:
         ["monitoring", "monolith", "microservices", "kafka", "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/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/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/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/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/config.py

@@ -4,100 +4,98 @@ from typing import List
 
 from helper.conversion import str_to_boolean, str_to_logging_level
 
-app_src_dir = os.path.dirname(__file__)
+APP_SRC_DIR = os.path.dirname(__file__)
 
-zrb_app_name = os.getenv("APP_NAME", "app")
-app_logging_level = str_to_logging_level(os.getenv("APP_LOGGING_LEVEL", "INFO"))
-app_host = os.getenv("APP_HOST", "0.0.0.0")
-app_port = int(os.getenv("APP_PORT", "8080"))
-app_reload = str_to_boolean(os.getenv("APP_RELOAD", "true"))
-app_max_not_ready = int(os.getenv("APP_MAX_NOT_READY", "10"))
+APP_NAME = os.getenv("APP_NAME", "app")
+APP_BRAND = os.getenv("PUBLIC_BRAND", "PascalZrbAppName")
+APP_TITLE = os.getenv("PUBLIC_TITLE", "PascalZrbAppName")
 
-app_enable_otel = str_to_boolean(os.getenv("APP_ENABLE_OTEL", "false"))
-app_otel_exporter_otlp_endpoint = os.getenv(
+APP_LOGGING_LEVEL = str_to_logging_level(os.getenv("APP_LOGGING_LEVEL", "INFO"))
+APP_HOST = os.getenv("APP_HOST", "0.0.0.0")
+APP_PORT = int(os.getenv("APP_PORT", "8080"))
+APP_RELOAD = str_to_boolean(os.getenv("APP_RELOAD", "true"))
+APP_MAX_NOT_READY = int(os.getenv("APP_MAX_NOT_READY", "10"))
+
+APP_ENABLE_OTEL = str_to_boolean(os.getenv("APP_ENABLE_OTEL", "false"))
+APP_OTEL_EXPORTER_OTLP_ENDPOINT = os.getenv(
     "APP_OTEL_EXPORTER_OTLP_ENDPOINT", "http://localhost:4317"
 )
 
-app_auth_access_token_cookie_key = os.getenv(
-    "PUBLIC_AUTH_ACCESS_TOKEN_COOKIE_KEY", "access_token"
+APP_AUTH_ACCESS_TOKEN_COOKIE_KEY = os.getenv(
+    "APP_AUTH_ACCESS_TOKEN_COOKIE_KEY", "access_token"
 )
-app_auth_refresh_token_cookie_key = os.getenv(
-    "PUBLIC_AUTH_REFRESH_TOKEN_COOKIE_KEY", "refresh_token"
+APP_AUTH_REFRESH_TOKEN_COOKIE_KEY = os.getenv(
+    "APP_AUTH_REFRESH_TOKEN_COOKIE_KEY", "refresh_token"
 )
 
-app_auth_access_token_type = os.getenv("APP_AUTH_ACCESS_TOKEN_TYPE", "jwt")
-app_auth_access_token_expire_seconds = int(
+APP_AUTH_ACCESS_TOKEN_TYPE = os.getenv("APP_AUTH_ACCESS_TOKEN_TYPE", "jwt")
+APP_AUTH_ACCESS_TOKEN_EXPIRE_SECONDS = int(
     os.getenv("APP_AUTH_ACCESS_TOKEN_EXPIRE_SECONDS", "300")
 )
-app_auth_refresh_token_type = os.getenv("APP_AUTH_REFRESH_TOKEN_TYPE", "jwt")
-app_auth_refresh_token_expire_seconds = int(
+APP_AUTH_REFRESH_TOKEN_TYPE = os.getenv("APP_AUTH_REFRESH_TOKEN_TYPE", "jwt")
+APP_AUTH_REFRESH_TOKEN_EXPIRE_SECONDS = int(
     os.getenv("APP_AUTH_REFRESH_TOKEN_EXPIRE_SECONDS", "86400")
 )
-app_auth_jwt_token_secret_key = os.getenv("APP_AUTH_JWT_TOKEN_SECRET_KEY", "secret")
-app_auth_jwt_token_algorithm = os.getenv("APP_AUTH_JWT_TOKEN_ALGORITHM", "HS256")
+APP_AUTH_JWT_TOKEN_SECRET_KEY = os.getenv("APP_AUTH_JWT_TOKEN_SECRET_KEY", "secret")
+APP_AUTH_JWT_TOKEN_ALGORITHM = os.getenv("APP_AUTH_JWT_TOKEN_ALGORITHM", "HS256")
+
+APP_AUTH_ADMIN_ACTIVE = str_to_boolean(os.getenv("APP_AUTH_ADMIN_ACTIVE", "true"))
+APP_AUTH_ADMIN_USER_ID = os.getenv("APP_AUTH_ADMIN_USER_ID", "root")
+APP_AUTH_ADMIN_USERNAME = os.getenv("APP_AUTH_ADMIN_USERNAME", "admin")
+APP_AUTH_ADMIN_PASSWORD = os.getenv("APP_AUTH_ADMIN_PASSWORD", "admin")
+APP_AUTH_ADMIN_EMAIL = os.getenv("APP_AUTH_ADMIN_EMAIL", "")
+APP_AUTH_ADMIN_PHONE = os.getenv("APP_AUTH_ADMIN_PHONE", "")
+APP_AUTH_GUEST_USER_ID = os.getenv("APP_AUTH_GUEST_USER_ID", "guest")
+APP_AUTH_GUEST_USERNAME = os.getenv("APP_AUTH_GUEST_USERNAME", "guest")
+APP_AUTH_GUEST_EMAIL = os.getenv("APP_AUTH_GUEST_EMAIL", "")
+APP_AUTH_GUEST_PHONE = os.getenv("APP_AUTH_GUEST_PHONE", "")
 
-app_auth_admin_active = str_to_boolean(os.getenv("APP_AUTH_ADMIN_ACTIVE", "true"))
-app_auth_admin_user_id = os.getenv("APP_AUTH_ADMIN_USER_ID", "root")
-app_auth_admin_username = os.getenv("APP_AUTH_ADMIN_USERNAME", "admin")
-app_auth_admin_password = os.getenv("APP_AUTH_ADMIN_PASSWORD", "admin")
-app_auth_admin_email = os.getenv("APP_AUTH_ADMIN_EMAIL", "")
-app_auth_admin_phone = os.getenv("APP_AUTH_ADMIN_PHONE", "")
-app_auth_guest_user_id = os.getenv("APP_AUTH_GUEST_USER_ID", "guest")
-app_auth_guest_username = os.getenv("APP_AUTH_GUEST_USERNAME", "guest")
-app_auth_guest_email = os.getenv("APP_AUTH_GUEST_EMAIL", "")
-app_auth_guest_phone = os.getenv("APP_AUTH_GUEST_PHONE", "")
+APP_DB_CONNECTION = os.getenv("APP_DB_CONNECTION", "sqlite://")
+APP_DB_ENGINE_SHOW_LOG = str_to_boolean(os.getenv("APP_DB_ENGINE_SHOW_LOG", "false"))
+APP_DB_AUTO_MIGRATE = str_to_boolean(os.getenv("APP_DB_AUTO_MIGRATE", "true"))
+APP_DB_POOL_PRE_PING = str_to_boolean(os.getenv("APP_DB_POOL_PRE_PING", "true"))
+APP_DB_POOL_SIZE = int(os.getenv("APP_DB_POOL_SIZE", "20"))
+APP_DB_POOL_MAX_OVERFLOW = int(os.getenv("APP_DB_POOL_MAX_OVERFLOW", "0"))
 
-app_db_connection = os.getenv("APP_DB_CONNECTION", "sqlite://")
-app_db_engine_show_log = str_to_boolean(os.getenv("APP_DB_ENGINE_SHOW_LOG", "false"))
-app_db_auto_migrate = str_to_boolean(os.getenv("APP_DB_AUTO_MIGRATE", "true"))
 
-app_broker_type = os.getenv("APP_BROKER_TYPE", "mock")
+APP_BROKER_TYPE = os.getenv("APP_BROKER_TYPE", "mock")
 
-app_enable_rpc_server: bool = str_to_boolean(os.getenv("APP_ENABLE_RPC_SERVER", "true"))
+APP_ENABLE_RPC_SERVER: bool = str_to_boolean(os.getenv("APP_ENABLE_RPC_SERVER", "true"))
 
-app_enable_event_handler: bool = str_to_boolean(
+APP_ENABLE_EVENT_HANDLER: bool = str_to_boolean(
     os.getenv("APP_ENABLE_EVENT_HANDLER", "true")
 )
 
-app_enable_frontend: bool = str_to_boolean(os.getenv("APP_ENABLE_FRONTEND", "true"))
+APP_ENABLE_FRONTEND: bool = str_to_boolean(os.getenv("APP_ENABLE_FRONTEND", "true"))
 
-app_enable_api: bool = str_to_boolean(os.getenv("APP_ENABLE_API", "true"))
+APP_ENABLE_API: bool = str_to_boolean(os.getenv("APP_ENABLE_API", "true"))
 
-app_rmq_connection_string = os.getenv(
+APP_RMQ_CONNECTION_STRING = os.getenv(
     "APP_RMQ_CONNECTION", "amqp://guest:guest@localhost/"
 )
 
-app_kafka_bootstrap_servers = os.getenv("APP_KAFKA_BOOTSTRAP_SERVERS", "localhost:9092")
-app_kafka_security_protocol = os.getenv("APP_KAFKA_SECURITY_PROTOCOL", "PLAINTEXT")
-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_KAFKA_BOOTSTRAP_SERVERS = os.getenv("APP_KAFKA_BOOTSTRAP_SERVERS", "localhost:9092")
+APP_KAFKA_SECURITY_PROTOCOL = os.getenv("APP_KAFKA_SECURITY_PROTOCOL", "PLAINTEXT")
+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_ORIGIN_REGEX: str = os.getenv("APP_CORS_ALLOW_ORIGIN_REGEX", "")
+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(
+APP_CORS_ALLOW_CREDENTIALS: bool = str_to_boolean(
     os.getenv("APP_CORS_ALLOW_CREDENTIALS", "false")
 )
-app_cors_expose_headers: bool = str_to_boolean(
+APP_CORS_EXPOSE_HEADERS: bool = str_to_boolean(
     os.getenv("APP_CORS_EXPOSE_HEADERS", "false")
 )
-app_cors_max_age: int = int(os.getenv("APP_CORS_MAX_AGE", "600"))
-app_enable_auth_module = str_to_boolean(os.getenv("APP_ENABLE_AUTH_MODULE", "true"))
-app_enable_log_module = str_to_boolean(os.getenv("APP_ENABLE_LOG_MODULE", "true"))
-
-public_brand = os.getenv("PUBLIC_BRAND", "PascalZrbAppName")
-public_title = os.getenv("PUBLIC_TITLE", "PascalZrbAppName")
-public_auth_access_token_cookie_key = os.getenv(
-    "PUBLIC_AUTH_ACCESS_TOKEN_COOKIE_KEY", "access_token"
-)
-public_auth_refresh_token_cookie_key = os.getenv(
-    "PUBLIC_AUTH_REFRESH_TOKEN_COOKIE_KEY", "refresh_token"
-)
+APP_CORS_MAX_AGE: int = int(os.getenv("APP_CORS_MAX_AGE", "600"))
+APP_ENABLE_AUTH_MODULE = str_to_boolean(os.getenv("APP_ENABLE_AUTH_MODULE", "true"))
+APP_ENABLE_LOG_MODULE = str_to_boolean(os.getenv("APP_ENABLE_LOG_MODULE", "true"))

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

@@ -1,17 +1,17 @@
 from config import (
-    app_cors_allow_credentials,
-    app_cors_allow_headers,
-    app_cors_allow_methods,
-    app_cors_allow_origin_regex,
-    app_cors_allow_origins,
-    app_cors_expose_headers,
-    app_cors_max_age,
-    app_enable_frontend,
-    public_auth_access_token_cookie_key,
-    public_auth_refresh_token_cookie_key,
-    public_brand,
-    public_title,
-    zrb_app_name,
+    APP_AUTH_ACCESS_TOKEN_COOKIE_KEY,
+    APP_AUTH_REFRESH_TOKEN_COOKIE_KEY,
+    APP_BRAND,
+    APP_CORS_ALLOW_CREDENTIALS,
+    APP_CORS_ALLOW_HEADERS,
+    APP_CORS_ALLOW_METHODS,
+    APP_CORS_ALLOW_ORIGIN_REGEX,
+    APP_CORS_ALLOW_ORIGINS,
+    APP_CORS_EXPOSE_HEADERS,
+    APP_CORS_MAX_AGE,
+    APP_ENABLE_FRONTEND,
+    APP_NAME,
+    APP_TITLE,
 )
 from fastapi import FastAPI, status
 from fastapi.middleware.cors import CORSMiddleware
@@ -21,9 +21,9 @@ from integration.app.app_state import app_state
 from integration.frontend_index import frontend_index_response
 from schema.frontend_config import FrontendConfig
 
-app = FastAPI(title=zrb_app_name, lifespan=app_lifespan)
+app = FastAPI(title=APP_NAME, lifespan=app_lifespan)
 
-if app_enable_frontend:
+if APP_ENABLE_FRONTEND:
 
     @app.middleware("http")
     async def catch_all(request, call_next):
@@ -38,13 +38,13 @@ if app_enable_frontend:
 
 app.add_middleware(
     CORSMiddleware,
-    allow_origins=app_cors_allow_origins,
-    allow_origin_regex=app_cors_allow_origin_regex,
-    allow_methods=app_cors_allow_methods,
-    allow_headers=app_cors_allow_headers,
-    allow_credentials=app_cors_allow_credentials,
-    expose_headers=app_cors_expose_headers,
-    max_age=app_cors_max_age,
+    allow_origins=APP_CORS_ALLOW_ORIGINS,
+    allow_origin_regex=APP_CORS_ALLOW_ORIGIN_REGEX,
+    allow_methods=APP_CORS_ALLOW_METHODS,
+    allow_headers=APP_CORS_ALLOW_HEADERS,
+    allow_credentials=APP_CORS_ALLOW_CREDENTIALS,
+    expose_headers=APP_CORS_EXPOSE_HEADERS,
+    max_age=APP_CORS_MAX_AGE,
 )
 
 
@@ -60,7 +60,7 @@ def get_application_liveness_status():
     """
     if app_state.get_liveness():
         return JSONResponse(
-            content={"app": zrb_app_name, "alive": True}, status_code=status.HTTP_200_OK
+            content={"app": APP_NAME, "alive": True}, status_code=status.HTTP_200_OK
         )
     return JSONResponse(
         content={"message": "Service is not alive"},
@@ -81,7 +81,7 @@ def get_application_readiness_status():
     """
     if app_state.get_readiness():
         return JSONResponse(
-            content={"app": zrb_app_name, "ready": True}, status_code=status.HTTP_200_OK
+            content={"app": APP_NAME, "ready": True}, status_code=status.HTTP_200_OK
         )
     return JSONResponse(
         content={"message": "Service is not ready"},
@@ -93,8 +93,8 @@ def get_application_readiness_status():
 @app.get("/api/v1/frontend/configs", response_model=FrontendConfig)
 def get_configs() -> FrontendConfig:
     return FrontendConfig(
-        brand=public_brand,
-        title=public_title,
-        access_token_cookie_key=public_auth_access_token_cookie_key,
-        refresh_token_cookie_key=public_auth_refresh_token_cookie_key,
+        brand=APP_BRAND,
+        title=APP_TITLE,
+        access_token_cookie_key=APP_AUTH_ACCESS_TOKEN_COOKIE_KEY,
+        refresh_token_cookie_key=APP_AUTH_REFRESH_TOKEN_COOKIE_KEY,
     )

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

@@ -2,12 +2,12 @@ import os
 from contextlib import asynccontextmanager
 
 from config import (
-    app_db_auto_migrate,
-    app_enable_event_handler,
-    app_enable_frontend,
-    app_enable_rpc_server,
-    app_src_dir,
-    zrb_app_name,
+    APP_DB_AUTO_MIGRATE,
+    APP_ENABLE_EVENT_HANDLER,
+    APP_ENABLE_FRONTEND,
+    APP_ENABLE_RPC_SERVER,
+    APP_NAME,
+    APP_SRC_DIR,
 )
 from fastapi import FastAPI
 from fastapi.staticfiles import StaticFiles
@@ -21,24 +21,24 @@ from migrate import migrate
 
 @asynccontextmanager
 async def app_lifespan(app: FastAPI):
-    logger.info(f"{zrb_app_name} started")
-    if app_db_auto_migrate:
+    logger.info(f"{APP_NAME} started")
+    if APP_DB_AUTO_MIGRATE:
         await migrate()
     app_state.set_liveness(True)
-    if app_enable_event_handler:
+    if APP_ENABLE_EVENT_HANDLER:
         create_task(consumer.start(), on_error=set_not_ready_on_error)
-    if app_enable_rpc_server:
+    if APP_ENABLE_RPC_SERVER:
         create_task(rpc_server.start(), on_error=set_not_ready_on_error)
-    if app_enable_frontend:
-        build_path = os.path.join(app_src_dir, "frontend", "build")
+    if APP_ENABLE_FRONTEND:
+        build_path = os.path.join(APP_SRC_DIR, "frontend", "build")
         app.mount(
             path="",
             app=StaticFiles(directory=build_path, html=True),
             name="frontend-static-resources",
         )
     app_state.set_readiness(True)
-    logger.info(f"{zrb_app_name} started")
+    logger.info(f"{APP_NAME} started")
     yield
-    if app_enable_event_handler:
+    if APP_ENABLE_EVENT_HANDLER:
         await consumer.stop()
-    logger.info(f"{zrb_app_name} closed")
+    logger.info(f"{APP_NAME} closed")

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

@@ -1,6 +1,6 @@
 import asyncio
 
-from config import app_max_not_ready
+from config import APP_MAX_NOT_READY
 from integration.log import logger
 
 
@@ -35,5 +35,5 @@ app_state = AppState()
 async def set_not_ready_on_error(exception: Exception):
     logger.critical(exception)
     app_state.set_readiness(False)
-    await asyncio.sleep(app_max_not_ready)
+    await asyncio.sleep(APP_MAX_NOT_READY)
     app_state.set_liveness(False)

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

@@ -1,6 +1,12 @@
 import time
 
-from config import app_db_connection, app_db_engine_show_log
+from config import (
+    APP_DB_CONNECTION,
+    APP_DB_ENGINE_SHOW_LOG,
+    APP_DB_POOL_MAX_OVERFLOW,
+    APP_DB_POOL_PRE_PING,
+    APP_DB_POOL_SIZE,
+)
 from integration.log import logger
 from sqlalchemy import Engine, create_engine, event
 
@@ -27,4 +33,10 @@ def after_cursor_execute(conn, cursor, statement, parameters, context, executema
     )
 
 
-engine: Engine = create_engine(app_db_connection, echo=app_db_engine_show_log)
+engine: Engine = create_engine(
+    APP_DB_CONNECTION,
+    echo=APP_DB_ENGINE_SHOW_LOG,
+    pool_pre_ping=APP_DB_POOL_PRE_PING,
+    pool_size=APP_DB_POOL_SIZE,
+    max_identifier_length=APP_DB_POOL_MAX_OVERFLOW,
+)

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

@@ -1,9 +1,9 @@
 import os
 
-from config import app_src_dir
+from config import APP_SRC_DIR
 from fastapi.responses import HTMLResponse
 
-index_html_path = os.path.join(app_src_dir, "frontend", "build", "index.html")
+index_html_path = os.path.join(APP_SRC_DIR, "frontend", "build", "index.html")
 with open(index_html_path, "r") as f:
     index_html_content = f.read()