zrb 0.23.0__tar.gz → 0.24.0__tar.gz

{zrb-0.23.0 → zrb-0.24.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zrb
-Version: 0.23.0
+Version: 0.24.0
 Summary: A Framework to Enhance Your Workflow
 Home-page: https://github.com/state-alchemists/zrb
 License: AGPL-3.0-or-later
@@ -63,7 +63,7 @@ pip install zrb
 Alternatively, you can also use our installation script to install Zrb along with some prerequisites:
 
 ```bash
-source <(curl -s https://raw.githubusercontent.com/state-alchemists/zrb/main/install.sh)
+bash -c "$(curl -fsSL https://raw.githubusercontent.com/state-alchemists/zrb/main/install.sh)"
 ```
 
 Check our [installation guide](https://github.com/state-alchemists/zrb/blob/main/docs/installation.md) for more information about the installation methods, including installation as a docker container.
@@ -257,7 +257,7 @@ zrb project add fastapp crud --project-dir . --app-name "fastapp" --module-name
 
 # Add column to the entity
 zrb project add fastapp field --project-dir . --app-name "fastapp" --module-name "library" \
-    --entity-name "book" --column-name "title" --column-type "str"
+    --entity-name "book" --column-name "title" --column-type "string"
 
 # Run Fastapp as monolith
 zrb project fastapp monolith start

{zrb-0.23.0 → zrb-0.24.0}/README.md

@@ -31,7 +31,7 @@ pip install zrb
 Alternatively, you can also use our installation script to install Zrb along with some prerequisites:
 
 ```bash
-source <(curl -s https://raw.githubusercontent.com/state-alchemists/zrb/main/install.sh)
+bash -c "$(curl -fsSL https://raw.githubusercontent.com/state-alchemists/zrb/main/install.sh)"
 ```
 
 Check our [installation guide](https://github.com/state-alchemists/zrb/blob/main/docs/installation.md) for more information about the installation methods, including installation as a docker container.
@@ -225,7 +225,7 @@ zrb project add fastapp crud --project-dir . --app-name "fastapp" --module-name
 
 # Add column to the entity
 zrb project add fastapp field --project-dir . --app-name "fastapp" --module-name "library" \
-    --entity-name "book" --column-name "title" --column-type "str"
+    --entity-name "book" --column-name "title" --column-type "string"
 
 # Run Fastapp as monolith
 zrb project fastapp monolith start

{zrb-0.23.0 → zrb-0.24.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "zrb"
-version = "0.23.0"
+version = "0.24.0"
 description = "A Framework to Enhance Your Workflow"
 authors = ["Go Frendi Gunawan <gofrendiasgard@gmail.com>"]
 license = "AGPL-3.0-or-later"

{zrb-0.23.0 → zrb-0.24.0}/src/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-0.23.0 → zrb-0.24.0}/src/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-0.23.0 → zrb-0.24.0}/src/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-0.23.0 → zrb-0.24.0}/src/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-0.24.0/src/zrb/builtin/project/add/fastapp/app/template/_automate/snake_zrb_app_name/container/_helper.py

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

{zrb-0.23.0 → zrb-0.24.0}/src/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-0.23.0 → zrb-0.24.0}/src/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-0.23.0 → zrb-0.24.0}/src/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-0.23.0 → zrb-0.24.0}/src/zrb/builtin/project/add/fastapp/app/template/src/kebab-zrb-app-name/README.md

@@ -132,12 +132,81 @@ If you want to run PascalZrbAppName on containers, you will also need `Docker` w
 
 You will also need `Pulumi` if you want to deploy PascalZrbAppName into your Kubernetes cluster.
 
+# High Level Architecture
+
+PascalZrbAppName heavily uses dependency inversion and avoids dependency injection on the same time.
+
+This architecture aims to let the developers define and choose new implementations without breaking any existing part.
+
+To achieve this, we use two elements:
+
+- __Component__: Containing interface and implementation
+- __Integration__: Instantiation of the components. Here is where you choose which component implementation to use and how we tailor the implementations.
+
+Let's see the following example.
+
+```
+     ┌────────────────────────────────────────────┐     
+     │ Component                                  │     
+     │   ┌───────────────┐     ┌────────────────┐ │     
+     │   │ Messagebus    │     │ RPC Caller     │ │     
+     │   │   ┌────────┐  │     │   ┌──────────┐ │ │     
+     │   │   │Kafka   │  ├─────┼──►│Messagebus├─┼─┼────┐
+     │   │   └────────┘  │     │   └──────────┘ │ │    │
+     │   │   ┌────────┐  │     │   ┌──────────┐ │ │    │
+  ┌──┼───┼───┤Rabbitmq│  │     │   │Grpc      │ │ │    │
+  │  │   │   └────────┘  │     │   └──────────┘ │ │    │
+  │  │   │   ┌────────┐  │     └────────────────┘ │    │
+  │  │   │   │Other   │  ├──┐                     │    │
+  │  │   │   └────────┘  │  │  ┌────────────────┐ │    │
+  │  │   └───────────────┘  │  │ RPC Server     │ │    │
+  │  │                      │  │   ┌──────────┐ │ │    │
+  │  │                      └──┼──►│Messagebus├─┼─┼─┐  │
+  │  │                         │   └──────────┘ │ │ │  │
+  │  │                         │   ┌──────────┐ │ │ │  │
+  │  │                         │   │Grpc      │ │ │ │  │
+  │  │                         │   └──────────┘ │ │ │  │
+  │  │                         └────────────────┘ │ │  │
+  │  └────────────────────────────────────────────┘ │  │
+  │                                                 │  │
+  │  ┌────────────────────────────────────────────┐ │  │
+  │  │ Integration                                │ │  │
+  │  │  ┌──────────┐                              │ │  │
+  └──┼─►│Messagebus├───────┬──────────────┐       │ │  │
+     │  └──────────┘       │              │       │ │  │
+     │                ┌────▼─────┐  ┌─────▼────┐  │ │  │
+     │                │RPC Caller│  │RPC Server│◄─┼─┘  │
+     │                └────▲─────┘  └──────────┘  │    │
+     └─────────────────────┼──────────────────────┘    │
+                           └───────────────────────────┘
+```
+
+__Components__
+
+In the example, there are three component interfaces:
+- `Messagebus`
+- `RPC Caller`
+- `RPC Server`
+
+Each interface has several implementations, for example there are two implementation of `RPC Caller`:
+- `RPCCaller.Messagebus`: RPC Caller implementation that need `Messagebus`.
+- `RPCCaller.Grpc`: RPC Caller through GRPC, doesn't need any other component.
+
+__Integration__
+
+As for integration, we need to choose particular component implementations.
+
+- `Messagebus`: For Messagebus, we choose `Messagebus.Rabbitmq` component.
+- `RPC Caller`: For RPC Caller, we choose `RPCCaller.Messasgebus`. This implementation need a `Messagebus` interface.
+- `RPC Server`: For RPC Server, we choose `RPCServer.Messasgebus`. This implementation need a `Messagebus` interface.
+
+
 # Directory Structure
 
 - `docker-compose.yml`: A multi-profile docker-compose file. This helps you to run your application as a monolith/microservices.
 - `all-module-disabled.env`: Feature flags to be used when you deactivate all modules.
 - `all-module-enabled.env`: Feature flags to be used when you activate all modules.
-- `deployment/`: Deployment directory. By default, we put deployment along with the source code to make it easier to maintain/manage. You can later move your deployments to another repository if you think you need to.
+- `deployment/`: Deployment directory. By default, we put deployment along with the source code to make it easier to maintain/manage. You can later move your deployments to another repository if you need to do so.
     - `/helm-charts`: Helm charts for Rabbitmq, Redpanda, and Postgre.
     - `__main__.py`: Main Pulumi script.
     - `template.env`: Default configuration for deployment
@@ -187,12 +256,19 @@ You will also need `Pulumi` if you want to deploy PascalZrbAppName into your Kub
 
 # Decisions and Constraints
 
+## Dependency Inversion without Dependency Injection
+
+We tend to avoid magical dependency inversion unless necessary. We want PascalZrbEntityName to be as explicit as possible. We do this by providing two elements:
+
+- Component: Containing all interfaces and implementations
+- Integration: Instantiation of components. This is where we choose and tailor the component's implementation.
+
 ## Frontend
-- PascalZrbAppName's Frontend is served as static files and is built before runtime (not SSR/Server Side Rendering). That's mean.
+PascalZrbAppName's front end serves static files built before runtime (not SSR/Server Side Rendering). That's mean.
     - The SEO is probably not good.
     - The page load is sensibly good.
 - We use Svelte for Frontend because it is easier to read/learn compared to React, Vue, or Angular.
-- At the moment, the frontend use:
+- At the moment, the front end use:
     - Sveltekit
     - TailwindCSS
     - DaisyUI
@@ -203,7 +279,7 @@ You will also need `Pulumi` if you want to deploy PascalZrbAppName into your Kub
     - Database connection
     - Database migration
     - Data manipulation
-- To create a custom database implementation, you need to create an implementation that complies with `core.repo.Repo`.
+- To create a custom database implementation, you must create one that complies with `core.repo.Repo`.
 
 ## Messaging
 
@@ -215,11 +291,11 @@ You will also need `Pulumi` if you want to deploy PascalZrbAppName into your Kub
     - No messaging platform, a.k.a: in memory. This will only work properly if you run PascalZrbAppName as a monolith.
         - `APP_BROKER_TYPE=mock`
 - To create custom event handlers, you need to implement two interfaces:
-    - `core.messagebus.Publisher`
-    - `core.messagebus.Server`
+    - `component.messagebus.Publisher`
+    - `component.messagebus.Server`
 
 ## RPC
 
 - Currently, RPC implementation depends on the messaging platforms. It is possible to override this behavior by creating you custom implementation. There are two interfaces you need to override:
-    - `core.rpc.Caller`
-    - `core.rpc.Server`
+    - `component.rpc.Caller`
+    - `component.rpc.Server`

{zrb-0.23.0 → zrb-0.24.0}/src/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-0.23.0 → zrb-0.24.0}/src/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-0.24.0/src/zrb/builtin/project/add/fastapp/app/template/src/kebab-zrb-app-name/src/config.py

@@ -0,0 +1,101 @@
+import json
+import os
+from typing import List
+
+from helper.conversion import str_to_boolean, str_to_logging_level
+
+APP_SRC_DIR = os.path.dirname(__file__)
+
+APP_NAME = os.getenv("APP_NAME", "app")
+APP_BRAND = os.getenv("PUBLIC_BRAND", "PascalZrbAppName")
+APP_TITLE = os.getenv("PUBLIC_TITLE", "PascalZrbAppName")
+
+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(
+    "APP_AUTH_ACCESS_TOKEN_COOKIE_KEY", "access_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(
+    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(
+    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_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_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_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_API: bool = str_to_boolean(os.getenv("APP_ENABLE_API", "true"))
+
+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_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(
+    os.getenv("APP_CORS_ALLOW_METHODS", '["*"]')
+)
+APP_CORS_ALLOW_HEADERS: List[str] = json.loads(
+    os.getenv("APP_CORS_ALLOW_HEADERS", '["*"]')
+)
+APP_CORS_ALLOW_CREDENTIALS: bool = str_to_boolean(
+    os.getenv("APP_CORS_ALLOW_CREDENTIALS", "false")
+)
+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"))

{zrb-0.23.0 → zrb-0.24.0}/src/zrb/builtin/project/add/fastapp/app/template/src/kebab-zrb-app-name/src/frontend/src/routes/+layout.svelte

@@ -3,7 +3,7 @@
 	import Navigation from '$lib/components/navigation/Navigation.svelte';
 	import { navData } from '$lib/config/navData';
 	import { getBrand, getTitle } from '$lib/config/app';
-	import logo from '/static/logo.png';
+	import logo from '@static/logo.png';
   	import "../app.css";
 
 	let appBrand = '';

{zrb-0.23.0 → zrb-0.24.0}/src/zrb/builtin/project/add/fastapp/app/template/src/kebab-zrb-app-name/src/frontend/vite.config.ts

@@ -1,9 +1,15 @@
 import { sveltekit } from '@sveltejs/kit/vite';
 import { defineConfig } from 'vitest/config';
+import path from 'path';
 
 export default defineConfig({
 	plugins: [sveltekit()],
 	test: {
 		include: ['src/**/*.{test,spec}.{js,ts}']
-	}
+	},
+	resolve: {
+		alias: {
+			'@static': path.resolve(__dirname, 'static'),
+		},
+	},
 });

{zrb-0.23.0/src/zrb/builtin/project/add/fastapp/app/template/src/kebab-zrb-app-name/src/integration → zrb-0.24.0/src/zrb/builtin/project/add/fastapp/app/template/src/kebab-zrb-app-name/src/integration/app}/app.py

@@ -1,28 +1,29 @@
 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
 from fastapi.responses import JSONResponse
-from integration.app_lifespan import app_lifespan, app_state
+from integration.app.app_lifespan import app_lifespan
+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):
@@ -37,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,
 )
 
 
@@ -59,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"},
@@ -80,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"},
@@ -92,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,
     )