zrb 0.0.46__py3-none-any.whl → 0.0.47__py3-none-any.whl

zrb/action/runner.py

@@ -69,7 +69,7 @@ class Runner(BaseAction):
         task_cmd_name = task.get_cmd_name()
         task_description = task.get_description()
         task_main_loop = task.create_main_loop(
-            env_prefix=self.env_prefix, raise_error=False
+            env_prefix=self.env_prefix, raise_error=True
          )
         command = click.Command(
             callback=task_main_loop, name=task_cmd_name, help=task_description

zrb/builtin/generator/_common.py

@@ -10,11 +10,12 @@ from ...task_input.int_input import IntInput
 from ...helper.accessories.name import get_random_name
 from ...helper.codemod.add_assert_resource import add_assert_resource
 from ...helper.codemod.add_import_module import add_import_module
-from ...helper import util
 from ...helper.middlewares.replacement import (
     add_pascal_key, add_snake_key, add_camel_key,
     add_kebab_key, add_human_readable_key
 )
+from ...helper.file.text import read_text_file_async, write_text_file_async
+from ...helper import util
 import os
 
 
@@ -130,7 +131,7 @@ def create_register_task_module(
         validate_project_dir(project_dir)
         task_name = kwargs.get('task_name')
         task.print_out(f'Register module: _automate.{task_name}')
-        register_module(
+        await register_module(
             project_dir=project_dir,
             module_name='.'.join([
                 '_automate', util.to_snake_case(task_name)
@@ -179,7 +180,7 @@ def _create_register_app_module(
         app_name = kwargs.get('app_name')
         task.print_out(f'Register module: _automate.{app_name}.{module}')
         snake_app_name = util.to_snake_case(app_name)
-        register_module(
+        await register_module(
             project_dir=project_dir,
             module_name='.'.join([
                 '_automate', snake_app_name, module
@@ -189,12 +190,11 @@ def _create_register_app_module(
     return task
 
 
-def register_module(
+async def register_module(
     project_dir: str, module_name: str, alias: Optional[str] = None
 ):
     zrb_init_path = os.path.join(project_dir, 'zrb_init.py')
-    with open(zrb_init_path, 'r') as f:
-        code = f.read()
+    code = await read_text_file_async(zrb_init_path)
     if alias is None:
         alias = module_name.split('.')[-1]
     code = add_import_module(
@@ -203,8 +203,7 @@ def register_module(
         alias=alias
     )
     code = add_assert_resource(code, alias)
-    with open(zrb_init_path, 'w') as f:
-        f.write(code)
+    await write_text_file_async(zrb_init_path, code)
     return True
 
 

zrb/builtin/generator/docker_compose_task/template/src/kebab-task-name/docker-compose.yml

@@ -9,4 +9,10 @@ services:
       APP_MESSAGE: '${MESSAGE:-Hello, world!}'
       APP_PORT: '${CONTAINER_PORT:-8080}'
     ports:
-      - ${HOST_PORT:-8080}:${CONTAINER_PORT:-8080}
+      - ${HOST_PORT:-8080}:${CONTAINER_PORT:-8080}
+    restart: on-failure
+    healthcheck:
+      test: ["CMD-SHELL", "curl --fail http://localhost:${APP_PORT:-8080}/ || exit 1"]
+      interval: 5s
+      timeout: 1s
+      retries: 30

zrb/builtin/generator/docker_compose_task/template/src/kebab-task-name/image/Dockerfile

@@ -1,5 +1,7 @@
 FROM python:3.10-slim
+ENV APP_MESSAGE "Hello, world!"
+ENV APP_PORT 8080
 WORKDIR /home
 COPY . .
 RUN pip install -r requirements.txt
-CMD python main.py
+CMD uvicorn main:app --host "0.0.0.0" --port "$APP_PORT"

zrb/builtin/generator/docker_compose_task/template/src/kebab-task-name/image/main.py

@@ -1,4 +1,3 @@
-import uvicorn
 import os
 
 MESSAGE = os.getenv('APP_MESSAGE', 'Hello, world!')
@@ -19,7 +18,3 @@ async def app(scope, receive, send):
         'type': 'http.response.body',
         'body': bytes(MESSAGE, 'utf-8'),
     })
-
-
-if __name__ == "__main__":
-    uvicorn.run("main:app", host='0.0.0.0', port=PORT, log_level="info")

zrb/builtin/generator/fastapp/add.py

@@ -71,15 +71,15 @@ register_local_app_module = create_register_local_app_module(
 )
 
 register_container_app_module = create_register_container_app_module(
-    upstreams=[copy_resource]
+    upstreams=[register_local_app_module]
 )
 
 register_image_app_module = create_register_image_app_module(
-    upstreams=[copy_resource]
+    upstreams=[register_container_app_module]
 )
 
 register_deployment_app_module = create_register_deployment_app_module(
-    upstreams=[copy_resource]
+    upstreams=[register_image_app_module]
 )
 
 add_project_task = create_add_project_automation(

zrb/builtin/generator/fastapp/template/_automate/snake_app_name/_common.py

@@ -1,5 +1,6 @@
 from zrb import (
-    BoolInput, ChoiceInput, IntInput, StrInput, Env, HTTPChecker, PortChecker
+    BoolInput, ChoiceInput, IntInput, StrInput, Env, EnvFile,
+    HTTPChecker, PortChecker
 )
 import os
 
@@ -154,6 +155,15 @@ pulumi_stack_input = StrInput(
     default=os.getenv('ZRB_ENV', 'dev')
 )
 
+###############################################################################
+# Env file Definitions
+###############################################################################
+
+compose_env_file = EnvFile(
+    env_file=os.path.join(CURRENT_DIR, 'config', 'docker-compose.env'),
+    prefix='CONTAINER_ENV_PREFIX'
+)
+
 ###############################################################################
 # Env Definitions
 ###############################################################################
@@ -200,12 +210,6 @@ compose_app_broker_type_env = Env(
     default='rabbitmq'
 )
 
-compose_app_host_port_env = Env(
-    name='APP_HOST_PORT',
-    os_name='CONTAINER_ENV_PREFIX_APP_HOST_PORT',
-    default='httpPort'
-)
-
 compose_rabbitmq_host_port_env = Env(
     name='RABBITMQ_HOST_PORT',
     os_name='CONTAINER_ENV_PREFIX_RABBITMQ_HOST_PORT',

zrb/builtin/generator/fastapp/template/_automate/snake_app_name/config/docker-compose.env

@@ -0,0 +1,3 @@
+APP_HOST_PORT=httpPort
+APP_GATEWAY_PORT=httpPort
+APP_GATEWAY_HOST_PORT=httpPort

zrb/builtin/generator/fastapp/template/_automate/snake_app_name/container.py

@@ -7,7 +7,7 @@ from ._common import (
     kafka_plaintext_checker, pandaproxy_outside_checker,
     pandaproxy_plaintext_checker,
     local_input, mode_input, host_input, https_input, image_input,
-    compose_app_broker_type_env, compose_app_host_port_env,
+    compose_env_file, compose_app_broker_type_env,
     start_container_compose_profile_env, all_compose_profile_env, image_env,
     compose_rabbitmq_host_port_env, compose_rabbitmq_management_host_port_env,
     compose_redpanda_console_host_port_env,
@@ -21,7 +21,6 @@ from .image import build_snake_app_name_image
 compose_env_prefix = 'CONTAINER_ENV_PREFIX'
 compose_envs = [
     compose_app_broker_type_env,
-    compose_app_host_port_env,
     compose_rabbitmq_host_port_env,
     compose_rabbitmq_management_host_port_env,
     compose_redpanda_console_host_port_env,
@@ -43,6 +42,7 @@ remove_snake_app_name_container = DockerComposeTask(
     cwd=RESOURCE_DIR,
     compose_cmd='down',
     compose_env_prefix=compose_env_prefix,
+    env_files=[compose_env_file],
     envs=compose_envs + [
         image_env,
         all_compose_profile_env
@@ -70,6 +70,7 @@ start_snake_app_name_container = DockerComposeTask(
     cwd=RESOURCE_DIR,
     compose_cmd='up',
     compose_env_prefix=compose_env_prefix,
+    env_files=[compose_env_file],
     envs=compose_envs + [
         start_container_compose_profile_env,
         image_env,
@@ -95,6 +96,7 @@ stop_snake_app_name_container = DockerComposeTask(
     cwd=RESOURCE_DIR,
     compose_cmd='stop',
     compose_env_prefix=compose_env_prefix,
+    env_files=[compose_env_file],
     envs=compose_envs + [
         image_env,
         all_compose_profile_env

zrb/builtin/generator/fastapp/template/_automate/snake_app_name/image.py

@@ -27,7 +27,7 @@ build_snake_app_name_image = DockerComposeTask(
     cwd=RESOURCE_DIR,
     compose_cmd='build',
     compose_args=[
-        'kebab-app-name-monolith'
+        'kebab-app-name'
     ],
     compose_env_prefix=compose_env_prefix,
 )

zrb/builtin/generator/fastapp/template/_automate/snake_app_name/local.py

@@ -9,7 +9,7 @@ from ._common import (
     kafka_plaintext_checker, pandaproxy_outside_checker,
     pandaproxy_plaintext_checker, app_local_checker,
     local_input, mode_input, host_input, https_input, image_input,
-    local_app_port_env, local_app_broker_type_env, compose_app_host_port_env,
+    local_app_port_env, local_app_broker_type_env,
     compose_rabbitmq_host_port_env, compose_rabbitmq_management_host_port_env,
     compose_redpanda_console_host_port_env,
     compose_kafka_outside_host_port_env,
@@ -27,7 +27,6 @@ support_compose_env_prefix = 'CONTAINER_ENV_PREFIX'
 support_compose_envs = [
     local_app_broker_type_env,
     local_app_port_env,
-    compose_app_host_port_env,
     compose_rabbitmq_host_port_env,
     compose_rabbitmq_management_host_port_env,
     compose_redpanda_console_host_port_env,

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

@@ -68,14 +68,15 @@ services:
       retries: 30
 
 
-  kebab-app-name-monolith:
+  kebab-app-name:
     build:
       dockerfile: Dockerfile
       context: ./src
     image: ${IMAGE:-kebab-app-name}
     container_name: snake_app_name
     hostname: snake_app_name
-    env_file: 'src/template.env'
+    env_file:
+      - 'src/template.env'
     environment:
       APP_NAME: ${APP_NAME:-kebab-app-name}
       APP_PORT: ${APP_PORT:-8080}
@@ -86,6 +87,11 @@ services:
     restart: on-failure
     profiles:
       - monolith
+    healthcheck:
+      test: ["CMD-SHELL", "curl --fail http://localhost:${APP_PORT:-8080}/ || exit 1"]
+      interval: 5s
+      timeout: 1s
+      retries: 30
 
 
   kebab-app-name-gateway:
@@ -97,16 +103,23 @@ services:
     hostname: snake_app_name_gateway
     env_file:
       - 'src/template.env'
-      - 'src/module_enabled.env'
+      - 'all-module-enabled.env'
     environment:
       APP_NAME: ${APP_NAME:-kebab-app-name}-gateway
-      APP_PORT: ${APP_PORT:-8080}
+      APP_PORT: ${APP_GATEWAY_PORT:-8080}
       APP_RMQ_CONNECTION: ${APP_CONTAINER_RMQ_CONNECTION:-amqp://guest:guest@rabbitmq/}
       APP_KAFKA_BOOTSTRAP_SERVERS: ${APP_CONTAINER_KAFKA_BOOTSTRAP_SERVERS:-redpanda:9092}
       APP_ENABLE_MESSAGE_CONSUMER: false
       APP_ENABLE_RPC_SERVER: false
+      APP_ENABLE_API: true
+      APP_ENABLE_FRONTEND: true
     ports:
-      - "${APP_HOST_PORT:-8080}:${APP_PORT:-8080}"
+      - "${APP_GATEWAY_HOST_PORT:-8080}:${APP_GATEWAY_PORT:-8080}"
     restart: on-failure
     profiles:
-      - microservices
+      - microservices
+    healthcheck:
+      test: ["CMD-SHELL", "curl --fail http://localhost:${APP_GATEWAY_PORT:-8080}/ || exit 1"]
+      interval: 5s
+      timeout: 1s
+      retries: 30

zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/template.env

@@ -1,7 +1,7 @@
 APP_NAME=fastapp
 APP_LOGGING_LEVEL=info
 APP_HOST=0.0.0.0
-APP_PORT=8080
+APP_PORT=httpPort
 APP_RELOAD=true
 
 APP_BROKER_TYPE=rabbitmq