zrb 0.0.41__tar.gz → 0.0.43__tar.gz

{zrb-0.0.41 → zrb-0.0.43}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zrb
-Version: 0.0.41
+Version: 0.0.43
 Summary: Your faithful companion
 Author-email: Go Frendi Gunawan <gofrendiasgard@gmail.com>
 Requires-Python: >=3.8

{zrb-0.0.41 → zrb-0.0.43}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "zrb"
-version = "0.0.41"
+version = "0.0.43"
 authors = [
   { name="Go Frendi Gunawan", email="gofrendiasgard@gmail.com" },
 ]

{zrb-0.0.41 → zrb-0.0.43}/src/zrb/builtin/generator/fastapp/template/_automate/snake_app_name/_common.py

@@ -13,6 +13,7 @@ RESOURCE_DIR = os.path.join(PROJECT_DIR, 'src', 'kebab-app-name')
 DEPLOYMENT_DIR = os.path.join(RESOURCE_DIR, 'deployment')
 APP_DIR = os.path.join(RESOURCE_DIR, 'src')
 APP_FRONTEND_DIR = os.path.join(APP_DIR, 'frontend')
+APP_FRONTEND_BUILD_DIR = os.path.join(APP_FRONTEND_DIR, 'build')
 TEMPLATE_ENV_FILE_NAME = os.path.join(APP_DIR, 'template.env')
 SKIP_CONTAINER_EXECUTION = '{{not input.local_snake_app_name}}'
 SKIP_SUPPORT_CONTAINER_EXECUTION = ' '.join([
@@ -113,7 +114,7 @@ local_input = BoolInput(
 mode_input = ChoiceInput(
     name='kebab-app-name-mode',
     description='"kebab-app-name" mode',
-    prompt='"kebab-app-name" mode',
+    prompt='Do you want to run "kebab-app-name" as monolith or microservices?',
     choices=['monolith', 'microservices'],
     default='monolith'
 )

{zrb-0.0.41 → zrb-0.0.43}/src/zrb/builtin/generator/fastapp/template/_automate/snake_app_name/cmd/build-frontend.sh

@@ -1,2 +1,2 @@
 npm install --save
-npm run build
+npm run build:watch

{zrb-0.0.41 → zrb-0.0.43}/src/zrb/builtin/generator/fastapp/template/_automate/snake_app_name/frontend.py

@@ -1,12 +1,26 @@
-from zrb import CmdTask, runner
+from typing import Any
+from zrb import CmdTask, Task, python_task, runner
 from zrb.builtin._group import project_group
-from ._common import APP_FRONTEND_DIR, CURRENT_DIR
+from ._common import APP_FRONTEND_DIR, APP_FRONTEND_BUILD_DIR, CURRENT_DIR
+import asyncio
 import os
 
 ###############################################################################
 # Task Definitions
 ###############################################################################
 
+
+@python_task(
+    name='check-kebab-app-name-frontend-build',
+    retry=0,
+)
+async def check_frontend_build(*args: str, **kwargs: Any):
+    while not os.path.isdir(APP_FRONTEND_BUILD_DIR):
+        await asyncio.sleep(0.1)
+    task: Task = kwargs.get('_task')
+    task.print_out(f'Frontend built: {APP_FRONTEND_BUILD_DIR}')
+
+
 build_snake_app_name_frontend = CmdTask(
     icon='🚤',
     name='build-kebab-app-name-frontend',
@@ -14,5 +28,6 @@ build_snake_app_name_frontend = CmdTask(
     group=project_group,
     cwd=APP_FRONTEND_DIR,
     cmd_path=os.path.join(CURRENT_DIR, 'cmd', 'build-frontend.sh'),
+    checkers=[check_frontend_build]
 )
 runner.register(build_snake_app_name_frontend)

{zrb-0.0.41 → zrb-0.0.43}/src/zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/component/app.py

@@ -6,28 +6,18 @@ from config import (
     cors_allow_methods, cors_allow_origin_regex, cors_allow_origins,
     cors_expose_headers, cors_max_age
 )
-from component.app_state import app_state
-from starlette.requests import Request
-from starlette.responses import FileResponse
-import os
+from component.app_lifespan import app_state
+from component.app_lifespan import app_lifespan
+from component.frontend_index import frontend_index_response
 
-app = FastAPI()
+app = FastAPI(lifespan=app_lifespan)
 
 if app_enable_frontend:
     @app.middleware("http")
-    async def static_file_middleware(request: Request, call_next):
-        build_path = os.path.join('frontend', 'build')
-        request_url = request.url.path.strip('/')
-        file_path = os.path.join(build_path, request_url)
-        # File exists, serve it
-        if os.path.isfile(file_path):
-            return FileResponse(file_path)
-        # File doesn't exists, try to look for index.html
-        file_path = os.path.join(file_path, 'index.html')
-        if os.path.isfile(file_path):
-            return FileResponse(file_path)
-        # Nothing exists, this must be served programmatically
+    async def catch_all(request, call_next):
         response = await call_next(request)
+        if response.status_code == 404:
+            return frontend_index_response
         return response
 
 

zrb-0.0.43/src/zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/component/app_lifespan.py

@@ -0,0 +1,29 @@
+from fastapi import FastAPI
+from fastapi.staticfiles import StaticFiles
+from config import (
+    app_name, app_enable_message_consumer, app_enable_frontend,
+)
+from component.app_state import app_state, set_not_ready_on_error
+from component.messagebus import consumer
+from component.log import logger
+from helper.async_task import create_task
+from contextlib import asynccontextmanager
+import os
+
+
+@asynccontextmanager
+async def app_lifespan(app: FastAPI):
+    logger.info(f'{app_name} started')
+    app_state.set_liveness(True)
+    if app_enable_message_consumer:
+        create_task(consumer.run(), on_error=set_not_ready_on_error)
+    if app_enable_frontend:
+        build_path = os.path.join('frontend', 'build')
+        app.mount(
+            path='',
+            app=StaticFiles(directory=build_path, html=True),
+            name='frontend'
+        )
+    app_state.set_readiness(True)
+    yield
+    logger.info(f'{app_name} closed')

{zrb-0.0.41 → zrb-0.0.43}/src/zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/component/app_state.py

@@ -1,3 +1,6 @@
+from component.log import logger
+
+
 class AppState():
     __instance = None
 
@@ -24,3 +27,8 @@ class AppState():
 
 
 app_state = AppState()
+
+
+def set_not_ready_on_error(exception: Exception):
+    logger.critical(exception)
+    app_state.set_readiness(False)

zrb-0.0.43/src/zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/component/frontend_index.py

@@ -0,0 +1,9 @@
+from fastapi.responses import HTMLResponse
+import os
+
+frontend_index_path = os.path.join('frontend', 'build', 'index.html')
+with open(frontend_index_path, "r") as f:
+    frontend_index_content = f.read()
+frontend_index_response = HTMLResponse(
+    content=frontend_index_content, status_code=200
+)

{zrb-0.0.41 → zrb-0.0.43}/src/zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/frontend/package.json

@@ -5,6 +5,7 @@
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build",
+		"build:watch": "vite build --watch",
 		"preview": "vite preview",
 		"test": "playwright test",
 		"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",

zrb-0.0.43/src/zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/frontend/src/routes/+layout.js

@@ -0,0 +1,2 @@
+export const ssr = false;
+export const trailingSlash = 'always';

zrb-0.0.43/src/zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/frontend/src/routes/+layout.svelte

@@ -0,0 +1,6 @@
+<nav>
+	<a href="/">home</a>
+	<a href="/about">about</a>
+	<a href="/about?name=hi">about</a>
+</nav>
+<slot></slot>

zrb-0.0.43/src/zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/frontend/src/routes/about/+page.svelte

@@ -0,0 +1,2 @@
+<h1>About</h1>
+<p>Visit <a href="https://kit.svelte.dev">kit.svelte.dev</a> to read the documentation</p>

zrb-0.0.43/src/zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/frontend/src/routes/greetings/[slug]/+page.js

@@ -0,0 +1,6 @@
+export function load({ params }) {
+	return {
+        title: 'hello ' + params.slug,
+        content: 'hello ' + params.slug
+	};
+}

zrb-0.0.43/src/zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/frontend/src/routes/greetings/[slug]/+page.svelte

@@ -0,0 +1,9 @@
+<h1>Greetings</h1>
+
+<h1>{data.title}</h1>
+<div>{@html data.content}</div>
+
+
+<script>
+	export let data;
+</script>

zrb-0.0.43/src/zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/frontend/svelte.config.js

@@ -0,0 +1,13 @@
+import adapter from '@sveltejs/adapter-static';
+ 
+export default {
+  kit: {
+    adapter: adapter({
+      pages: 'build',
+      assets: 'build',
+      fallback: 'index.html',
+      precompress: false,
+      strict: true
+    })
+  }
+};

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

@@ -0,0 +1,22 @@
+from component.app import app
+from component.app_state import app_state
+from component.messagebus import consumer, publisher
+
+app_state.set_liveness(True)
+messages = []
+
+
+@consumer.register('coba')
+async def handle_event(message):
+    messages.append(message)
+    print(messages)
+
+
+@app.get('/api/get')
+def handle_get():
+    return messages
+
+
+@app.get('/api/send')
+async def handle_send():
+    return await publisher.publish('coba', 'sesuatu')

{zrb-0.0.41 → zrb-0.0.43}/src/zrb/task/base_task.py

@@ -71,8 +71,9 @@ class BaseTask(TaskModel):
         self.checkers = checkers
         self.checking_interval = checking_interval
         self.skip_execution = skip_execution
-        self._is_checked: bool = False
-        self._is_executed: bool = False
+        self._is_check_triggered: bool = False
+        self._is_execution_triggered: bool = False
+        self._is_execution_started: bool = False
         self._run_function: Optional[Callable[..., Any]] = run
         self._args: List[Any] = []
         self._kwargs: Mapping[str, Any] = {}
@@ -214,12 +215,12 @@ class BaseTask(TaskModel):
         print(colored(f'{colored_label}{colored_run_cmd}'), file=sys.stderr)
 
     async def _cached_check(self) -> bool:
-        if self._is_checked:
+        if self._is_check_triggered:
             self.log_debug('Skip checking, because checking flag has been set')
             return True
         check_result = await self._check()
         if check_result:
-            self._is_checked = True
+            self._is_check_triggered = True
             self.log_debug('Set checking flag to True')
         return check_result
 
@@ -232,6 +233,8 @@ class BaseTask(TaskModel):
         '''
         if len(self.checkers) == 0:
             return await self.check()
+        while not self._is_execution_started:
+            await asyncio.sleep(0.1)
         check_coroutines: Iterable[asyncio.Task] = []
         for checker_task in self.checkers:
             check_coroutines.append(
@@ -256,11 +259,11 @@ class BaseTask(TaskModel):
         return results[-1]
 
     async def _cached_run(self, *args: Any, **kwargs: Any) -> Any:
-        if self._is_executed:
+        if self._is_execution_triggered:
             self.log_debug('Skip execution because execution flag is True')
             return
         self.log_debug('Set execution flag to True')
-        self._is_executed = True
+        self._is_execution_triggered = True
         self.log_debug('Start running')
         # get upstream checker
         upstream_check_processes: Iterable[asyncio.Task] = []
@@ -270,6 +273,8 @@ class BaseTask(TaskModel):
             ))
         # wait all upstream checkers to complete
         await asyncio.gather(*upstream_check_processes)
+        # mark execution as started, so that checkers can start checking
+        self._is_execution_started = True
         if self.render_bool(self.skip_execution):
             self.log_info(
                 f'Skip execution because config: {self.skip_execution}'

zrb-0.0.41/src/zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/frontend/src/routes/+layout.js

@@ -1 +0,0 @@
-export const prerender = true;

zrb-0.0.41/src/zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/frontend/svelte.config.js

@@ -1,16 +0,0 @@
-import adapter from '@sveltejs/adapter-static';
-
-/** @type {import('@sveltejs/kit').Config} */
-const config = {
-	kit: {
-		adapter: adapter({
-			pages: 'build',
-			assets: 'build',
-			fallback: null,
-			precompress: false,
-			strict: true
-		})
-	}
-};
-
-export default config;

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

@@ -1,38 +0,0 @@
-from component.app import app
-from component.app_state import app_state
-from component.log import logger
-from component.messagebus import consumer, publisher
-from config import app_name, app_enable_message_consumer
-from helper.async_task import create_task
-
-app_state.set_liveness(True)
-messages = []
-
-
-async def on_error(exception: Exception):
-    logger.critical(exception)
-    app_state.set_readiness(False)
-
-
-@app.on_event('startup')
-async def startup_event():
-    logger.info(f'{app_name} started')
-    if app_enable_message_consumer:
-        create_task(consumer.run(), on_error=on_error)
-    app_state.set_readiness(True)
-
-
-@consumer.register('coba')
-async def handle_event(message):
-    messages.append(message)
-    print(messages)
-
-
-@app.get('/api/get')
-def handle_get():
-    return messages
-
-
-@app.get('/api/send')
-async def handle_send():
-    return await publisher.publish('coba', 'sesuatu')