zrb 0.0.50__py3-none-any.whl → 0.0.52__py3-none-any.whl

zrb/action/runner.py

@@ -1,7 +1,8 @@
-from typing import List, Mapping, Union
+from typing import Any, Callable, List, Mapping, Union
 from ..action.base_action import BaseAction
 from ..task.base_task import BaseTask, Group as TaskGroup
 import click
+import sys
 
 CliSubcommand = Union[click.Group, click.Command]
 
@@ -70,9 +71,10 @@ class Runner(BaseAction):
         task_description = task.get_description()
         task_main_loop = task.create_main_loop(
             env_prefix=self.env_prefix, raise_error=True
-         )
+        )
+        callback = self._wrap_task_main_loop(task_main_loop)
         command = click.Command(
-            callback=task_main_loop, name=task_cmd_name, help=task_description
+            callback=callback, name=task_cmd_name, help=task_description
         )
         # by default, add an argument named _args
         command.params.append(click.Argument(['_args'], nargs=-1))
@@ -87,3 +89,13 @@ class Runner(BaseAction):
             options = task_input.get_options()
             command.params.append(click.Option(param_decl, **options))
         return command
+
+    def _wrap_task_main_loop(
+        self, main_loop: Callable[..., Any]
+    ) -> Callable[..., Any]:
+        def wrapped_main_loop(*args: Any, **kwargs: Any) -> Any:
+            try:
+                main_loop(*args, **kwargs)
+            except Exception:
+                sys.exit(1)
+        return wrapped_main_loop

zrb/builtin/generator/docker_compose_task/template/_automate/snake_task_name.py

@@ -40,7 +40,7 @@ snake_task_name = DockerComposeTask(
     ],
     checkers=[
         HTTPChecker(
-            name='check-kebab-app-name',
+            name='check-kebab-task-name',
             port='{{env.HOST_PORT}}'
         )
     ]

zrb/builtin/generator/fastapp/add.py

@@ -67,8 +67,9 @@ copy_resource = ResourceMaker(
     excludes=[
         '*/deployment/venv',
         '*/src/kebab-app-name/venv',
-        '*/src/kebab-app-name/frontend/node_modules',
-        '*/src/kebab-app-name/frontend/build',
+        '*/src/kebab-app-name/src/frontend/node_modules',
+        '*/src/kebab-app-name/src/frontend/build',
+        '*/src/kebab-app-name/src/frontend/.svelte-kit',
     ]
 )
 

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

@@ -1,6 +1,9 @@
-from zrb import CmdTask, Env, PathChecker, runner
+from zrb import CmdTask, Env, EnvFile, PathChecker, runner
 from zrb.builtin._group import project_group
-from ._common import APP_FRONTEND_DIR, APP_FRONTEND_BUILD_DIR, CURRENT_DIR
+from ._common import (
+    APP_FRONTEND_DIR, APP_FRONTEND_BUILD_DIR, CURRENT_DIR,
+    APP_TEMPLATE_ENV_FILE_NAME, local_app_port_env
+)
 import os
 
 ###############################################################################
@@ -20,7 +23,13 @@ build_snake_app_name_frontend = CmdTask(
             path=APP_FRONTEND_BUILD_DIR
         )
     ],
+    env_files=[
+        EnvFile(
+            env_file=APP_TEMPLATE_ENV_FILE_NAME, prefix='ENV_PREFIX'
+        ),
+    ],
     envs=[
+        local_app_port_env,
         Env(name='WATCH', os_name='', default='1')
     ]
 )
@@ -39,7 +48,13 @@ build_snake_app_name_frontend_once = CmdTask(
             path=APP_FRONTEND_BUILD_DIR
         )
     ],
+    env_files=[
+        EnvFile(
+            env_file=APP_TEMPLATE_ENV_FILE_NAME, prefix='ENV_PREFIX'
+        ),
+    ],
     envs=[
+        local_app_port_env,
         Env(name='WATCH', os_name='', default='0')
     ]
 )

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

@@ -1,4 +1,5 @@
-.env
+/.env
+frontend/build
 frontend/build
 __pycache__
 venv

zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/Dockerfile

@@ -2,7 +2,7 @@
 FROM node:18-alpine AS frontend-builder
 WORKDIR /frontend
 COPY frontend .
-RUN npm install && npm run build
+RUN npm install --save-dev && npm run build
 
 # Second stage: build the API and copy the frontend build
 FROM python:3.10-slim

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

@@ -13,6 +13,9 @@ 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_auth_token_cookie_key = os.getenv(
+    'PUBLIC_AUTH_TOKEN_COOKIE_KEY', 'auth_token'
+)
 app_auth_token_expire_seconds = int(os.getenv(
     'APP_AUTH_TOKEN_EXPIRE_SECONDS', '300'
 ))

zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/core/messagebus/rabbitmq/consumer.py

@@ -77,7 +77,10 @@ class RMQConsumer(Consumer):
             retry = self.retry
             while not self._is_stop_triggered:
                 await asyncio.sleep(0.01)
-                if self.connection is None or self.connection.is_closed:
+                if (
+                    not self._is_stop_triggered and
+                    (self.connection is None or self.connection.is_closed)
+                ):
                     raise Exception('Rabbitmq connection is closed')
         except (asyncio.CancelledError, GeneratorExit, Exception) as e:
             if retry > 0:

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

@@ -3,8 +3,8 @@ node_modules
 /build
 /.svelte-kit
 /package
-.env
-.env.*
+# .env
+# .env.*
 !.env.example
 vite.config.js.timestamp-*
 vite.config.ts.timestamp-*