zrb 0.22.0__tar.gz → 0.23.4__tar.gz

{zrb-0.22.0 → zrb-0.23.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zrb
-Version: 0.22.0
+Version: 0.23.4
 Summary: A Framework to Enhance Your Workflow
 Home-page: https://github.com/state-alchemists/zrb
 License: AGPL-3.0-or-later
@@ -23,7 +23,7 @@ Requires-Dist: jsons (>=1.6.3,<1.7.0)
 Requires-Dist: libcst (>=0.4.9,<0.5.0)
 Requires-Dist: python-dotenv (>=1.0.1,<1.1.0)
 Requires-Dist: ruamel.yaml (>=0.18.6,<0.19.0)
-Requires-Dist: setuptools (>=69.1.1,<69.2.0)
+Requires-Dist: setuptools (>=70.0.0,<70.1.0)
 Requires-Dist: termcolor (>=2.4.0,<2.5.0)
 Requires-Dist: tomlkit (>=0.12.4,<0.13.0)
 Project-URL: Documentation, https://github.com/state-alchemists/zrb
@@ -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.

{zrb-0.22.0 → zrb-0.23.4}/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.

{zrb-0.22.0 → zrb-0.23.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "zrb"
-version = "0.22.0"
+version = "0.23.4"
 description = "A Framework to Enhance Your Workflow"
 authors = ["Go Frendi Gunawan <gofrendiasgard@gmail.com>"]
 license = "AGPL-3.0-or-later"
@@ -21,7 +21,7 @@ libcst = "~0.4.9"
 python-dotenv = "~1.0.1"
 jsons = "~1.6.3"
 "ruamel.yaml" = "~0.18.6"
-setuptools = "~69.1.1"
+setuptools = "~70.0.0"
 autopep8 = "~2.0.4"
 croniter = "~2.0.2"
 tomlkit = "^0.12.4"

{zrb-0.22.0 → zrb-0.23.4}/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.22.0 → zrb-0.23.4}/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.22.0 → zrb-0.23.4}/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.22.0/src/zrb/builtin/project/add/fastapp/app/template/src/kebab-zrb-app-name/src/integration → zrb-0.23.4/src/zrb/builtin/project/add/fastapp/app/template/src/kebab-zrb-app-name/src/integration/app}/app.py

@@ -16,7 +16,8 @@ from config import (
 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
 

{zrb-0.22.0/src/zrb/builtin/project/add/fastapp/app/template/src/kebab-zrb-app-name/src/integration → zrb-0.23.4/src/zrb/builtin/project/add/fastapp/app/template/src/kebab-zrb-app-name/src/integration/app}/app_lifespan.py

@@ -12,7 +12,7 @@ from config import (
 from fastapi import FastAPI
 from fastapi.staticfiles import StaticFiles
 from helper.async_task import create_task
-from integration.app_state import app_state, set_not_ready_on_error
+from integration.app.app_state import app_state, set_not_ready_on_error
 from integration.log import logger
 from integration.messagebus import consumer
 from integration.rpc import rpc_server

{zrb-0.22.0 → zrb-0.23.4}/src/zrb/builtin/project/add/fastapp/app/template/src/kebab-zrb-app-name/src/main.py

@@ -1,9 +1,7 @@
-from integration.app import app
+from integration.app.app import app
 from module.auth.register_module import register_auth
 from module.log.register_module import register_log
 
-# Make sure app is loaded.
-# Uvicorn or adny ASGII server you use will pick it up and run the app.
 assert app
 register_auth()
 register_log()

{zrb-0.22.0 → zrb-0.23.4}/src/zrb/builtin/project/add/fastapp/app/template/src/kebab-zrb-app-name/src/module/auth/register_module.py

@@ -4,7 +4,7 @@ from config import (
     app_enable_event_handler,
     app_enable_rpc_server,
 )
-from integration.app import app
+from integration.app.app import app
 from integration.log import logger
 from integration.messagebus import consumer, publisher
 from integration.rpc import rpc_caller, rpc_server

{zrb-0.22.0 → zrb-0.23.4}/src/zrb/builtin/project/add/fastapp/app/template/src/kebab-zrb-app-name/src/module/log/register_module.py

@@ -4,7 +4,7 @@ from config import (
     app_enable_log_module,
     app_enable_rpc_server,
 )
-from integration.app import app
+from integration.app.app import app
 from integration.log import logger
 from integration.messagebus import consumer, publisher
 from integration.rpc import rpc_caller, rpc_server

{zrb-0.22.0 → zrb-0.23.4}/src/zrb/builtin/project/add/fastapp/crud/crud.py

@@ -113,17 +113,29 @@ async def register_crud(*args: Any, **kwargs: Any):
     await asyncio.gather(
         asyncio.create_task(
             register_api(
-                task, project_dir, kebab_app_name, snake_module_name, snake_entity_name
+                task=task,
+                project_dir=project_dir,
+                kebab_app_name=kebab_app_name,
+                snake_module_name=snake_module_name,
+                snake_entity_name=snake_entity_name,
             )
         ),
         asyncio.create_task(
             register_rpc(
-                task, project_dir, kebab_app_name, snake_module_name, snake_entity_name
+                task=task,
+                project_dir=project_dir,
+                kebab_app_name=kebab_app_name,
+                snake_module_name=snake_module_name,
+                snake_entity_name=snake_entity_name,
             )
         ),
         asyncio.create_task(
             register_permission(
-                task, project_dir, kebab_app_name, snake_module_name, snake_entity_name
+                task=task,
+                project_dir=project_dir,
+                kebab_app_name=kebab_app_name,
+                snake_module_name=snake_module_name,
+                snake_entity_name=snake_entity_name,
             )
         ),
     )

{zrb-0.22.0 → zrb-0.23.4}/src/zrb/builtin/project/add/fastapp/field/_helper.py

@@ -17,7 +17,7 @@ async def add_column_to_insert_page(
     kebab_entity_name: str,
     kebab_column_name: str,
     snake_column_name: str,
-    capitalized_human_readable_column_name: str,
+    column_caption: str,
 ):
     list_page_file_path = os.path.join(
         project_dir,
@@ -45,11 +45,8 @@ async def add_column_to_insert_page(
     field_subst = "\\n".join(
         [
             '\\1<div class="mb-4">',
-            f'\\1    <label class="block text-gray-700 font-bold mb-2" for="{kebab_column_name}">{capitalized_human_readable_column_name}</label>',  # noqa
-            f'\\1    <input type="text" class="input w-full" id="{kebab_column_name}" placeholder="{capitalized_human_readable_column_name}" bind:value='
-            + "{row."
-            + snake_column_name
-            + "} />",  # noqa
+            f'\\1    <label class="block text-gray-700 font-bold mb-2" for="{kebab_column_name}">{column_caption}</label>',  # noqa
+            f'\\1    <input type="text" class="input w-full" id="{kebab_column_name}" placeholder="{column_caption}" bind:value="{{row.{snake_column_name}}}" />',  # noqa
             "\\1</div>",
             "\\1\\2",
         ]
@@ -68,7 +65,7 @@ async def add_column_to_update_page(
     kebab_entity_name: str,
     kebab_column_name: str,
     snake_column_name: str,
-    capitalized_human_readable_column_name: str,
+    column_caption: str,
 ):
     list_page_file_path = os.path.join(
         project_dir,
@@ -91,11 +88,8 @@ async def add_column_to_update_page(
     subst = "\\n".join(
         [
             '\\1<div class="mb-4">',
-            f'\\1    <label class="block text-gray-700 font-bold mb-2" for="{kebab_column_name}">{capitalized_human_readable_column_name}</label>',  # noqa
-            f'\\1    <input type="text" class="input w-full" id="{kebab_column_name}" placeholder="{capitalized_human_readable_column_name}" bind:value='
-            + "{row."
-            + snake_column_name
-            + "} />",  # noqa
+            f'\\1    <label class="block text-gray-700 font-bold mb-2" for="{kebab_column_name}">{column_caption}</label>',  # noqa
+            f'\\1    <input type="text" class="input w-full" id="{kebab_column_name}" placeholder="{column_caption}" bind:value="{{row.{snake_column_name}}}" />',  # noqa
             "\\1</div>",
             "\\1\\2",
         ]
@@ -114,7 +108,7 @@ async def add_column_to_delete_page(
     kebab_entity_name: str,
     kebab_column_name: str,
     snake_column_name: str,
-    capitalized_human_readable_column_name: str,
+    column_caption: str,
 ):
     list_page_file_path = os.path.join(
         project_dir,
@@ -137,11 +131,8 @@ async def add_column_to_delete_page(
     subst = "\\n".join(
         [
             '\\1<div class="mb-4">',
-            f'\\1    <label class="block text-gray-700 font-bold mb-2" for="{kebab_column_name}">{capitalized_human_readable_column_name}</label>',  # noqa
-            f'\\1    <span id="{kebab_column_name}">'
-            + "{row."
-            + snake_column_name
-            + "}</span>",  # noqa
+            f'\\1    <label class="block text-gray-700 font-bold mb-2" for="{kebab_column_name}">{column_caption}</label>',  # noqa
+            f'\\1    <span id="{kebab_column_name}">{{row.{snake_column_name}}}</span>',
             "\\1</div>",
             "\\1\\2",
         ]
@@ -160,7 +151,7 @@ async def add_column_to_detail_page(
     kebab_entity_name: str,
     kebab_column_name: str,
     snake_column_name: str,
-    capitalized_human_readable_column_name: str,
+    column_caption: str,
 ):
     list_page_file_path = os.path.join(
         project_dir,
@@ -183,11 +174,8 @@ async def add_column_to_detail_page(
     subst = "\\n".join(
         [
             '\\1<div class="mb-4">',
-            f'\\1    <label class="block text-gray-700 font-bold mb-2" for="{kebab_column_name}">{capitalized_human_readable_column_name}</label>',  # noqa
-            f'\\1    <span id="{kebab_column_name}">'
-            + "{row."
-            + snake_column_name
-            + "}</span>",  # noqa
+            f'\\1    <label class="block text-gray-700 font-bold mb-2" for="{kebab_column_name}">{column_caption}</label>',  # noqa
+            f'\\1    <span id="{kebab_column_name}">{{row.{snake_column_name}}}</span>',
             "\\1</div>",
             "\\1\\2",
         ]
@@ -205,7 +193,7 @@ async def add_column_to_list_page(
     kebab_module_name: str,
     kebab_entity_name: str,
     snake_column_name: str,
-    capitalized_human_readable_column_name: str,
+    column_caption: str,
 ):
     list_page_file_path = os.path.join(
         project_dir,
@@ -224,14 +212,12 @@ async def add_column_to_list_page(
     # process header
     task.print_out("Add column header to table")
     header_regex = r"(.*)(<!-- DON'T DELETE: insert new column header here-->)"
-    header_subst = "\\n".join(
-        [f"\\1<th>{capitalized_human_readable_column_name}</th>", "\\1\\2"]
-    )
+    header_subst = "\\n".join([f"\\1<th>{column_caption}</th>", "\\1\\2"])
     html_content = re.sub(header_regex, header_subst, html_content, 0, re.MULTILINE)
     # process column
     task.print_out("Add column to table")
     column_regex = r"(.*)(<!-- DON'T DELETE: insert new column here-->)"
-    column_subst = "\\n".join(["\\1<td>{row." + snake_column_name + "}</td>", "\\1\\2"])
+    column_subst = "\\n".join([f"\\1<td>{{row.{snake_column_name}}}</td>", "\\1\\2"])
     html_content = re.sub(column_regex, column_subst, html_content, 0, re.MULTILINE)
     task.print_out(f"Write modified HTML to: {list_page_file_path}")
     await write_text_file_async(list_page_file_path, html_content)

{zrb-0.22.0 → zrb-0.23.4}/src/zrb/builtin/project/add/fastapp/field/field.py

@@ -89,102 +89,100 @@ async def add_fastapp_field(*args: Any, **kwargs: Any):
     pascal_entity_name = util.to_pascal_case(entity_name)
     snake_column_name = util.to_snake_case(column_name)
     kebab_column_name = util.to_kebab_case(column_name)
-    capitalized_human_readable_column_name = util.to_capitalized_human_readable(  # noqa
-        column_name
-    )
+    column_caption = util.to_capitalized_human_readable(column_name)
     await asyncio.gather(
         asyncio.create_task(
             add_column_to_test(
-                task,
-                project_dir,
-                kebab_app_name,
-                snake_module_name,
-                snake_entity_name,
-                snake_column_name,
-                column_type,
+                task=task,
+                project_dir=project_dir,
+                kebab_app_name=kebab_app_name,
+                snake_module_name=snake_module_name,
+                snake_entity_name=snake_entity_name,
+                snake_column_name=snake_column_name,
+                column_type=column_type,
             )
         ),
         asyncio.create_task(
             add_column_to_schema(
-                task,
-                project_dir,
-                kebab_app_name,
-                snake_module_name,
-                snake_entity_name,
-                pascal_entity_name,
-                snake_column_name,
-                column_type,
+                task=task,
+                project_dir=project_dir,
+                kebab_app_name=kebab_app_name,
+                snake_module_name=snake_module_name,
+                snake_entity_name=snake_entity_name,
+                pascal_entity_name=pascal_entity_name,
+                snake_column_name=snake_column_name,
+                column_type=column_type,
             )
         ),
         asyncio.create_task(
             add_column_to_repo(
-                task,
-                project_dir,
-                kebab_app_name,
-                snake_module_name,
-                snake_entity_name,
-                pascal_entity_name,
-                snake_column_name,
-                column_type,
+                task=task,
+                project_dir=project_dir,
+                kebab_app_name=kebab_app_name,
+                snake_module_name=snake_module_name,
+                snake_entity_name=snake_entity_name,
+                pascal_entity_name=pascal_entity_name,
+                snake_column_name=snake_column_name,
+                column_type=column_type,
             )
         ),
         asyncio.create_task(
             add_column_to_list_page(
-                task,
-                project_dir,
-                kebab_app_name,
-                kebab_module_name,
-                kebab_entity_name,
-                snake_column_name,
-                capitalized_human_readable_column_name,
+                task=task,
+                project_dir=project_dir,
+                kebab_app_name=kebab_app_name,
+                kebab_module_name=kebab_module_name,
+                kebab_entity_name=kebab_entity_name,
+                snake_column_name=snake_column_name,
+                column_caption=column_caption,
             )
         ),
         asyncio.create_task(
             add_column_to_detail_page(
-                task,
-                project_dir,
-                kebab_app_name,
-                kebab_module_name,
-                kebab_entity_name,
-                kebab_column_name,
-                snake_column_name,
-                capitalized_human_readable_column_name,
+                task=task,
+                project_dir=project_dir,
+                kebab_app_name=kebab_app_name,
+                kebab_module_name=kebab_module_name,
+                kebab_entity_name=kebab_entity_name,
+                kebab_column_name=kebab_column_name,
+                snake_column_name=snake_column_name,
+                column_caption=column_caption,
             )
         ),
         asyncio.create_task(
             add_column_to_delete_page(
-                task,
-                project_dir,
-                kebab_app_name,
-                kebab_module_name,
-                kebab_entity_name,
-                kebab_column_name,
-                snake_column_name,
-                capitalized_human_readable_column_name,
+                task=task,
+                project_dir=project_dir,
+                kebab_app_name=kebab_app_name,
+                kebab_module_name=kebab_module_name,
+                kebab_entity_name=kebab_entity_name,
+                kebab_column_name=kebab_column_name,
+                snake_column_name=snake_column_name,
+                column_caption=column_caption,
             )
         ),
         asyncio.create_task(
             add_column_to_update_page(
-                task,
-                project_dir,
-                kebab_app_name,
-                kebab_module_name,
-                kebab_entity_name,
-                kebab_column_name,
-                snake_column_name,
-                capitalized_human_readable_column_name,
+                task=task,
+                project_dir=project_dir,
+                kebab_app_name=kebab_app_name,
+                kebab_module_name=kebab_module_name,
+                kebab_entity_name=kebab_entity_name,
+                kebab_column_name=kebab_column_name,
+                snake_column_name=snake_column_name,
+                column_caption=column_caption,
             )
         ),
         asyncio.create_task(
             add_column_to_insert_page(
-                task,
-                project_dir,
-                kebab_app_name,
-                kebab_module_name,
-                kebab_entity_name,
-                kebab_column_name,
-                snake_column_name,
-                capitalized_human_readable_column_name,
+                task=task,
+                project_dir=project_dir,
+                kebab_app_name=kebab_app_name,
+                kebab_module_name=kebab_module_name,
+                kebab_entity_name=kebab_entity_name,
+                kebab_column_name=kebab_column_name,
+                snake_column_name=snake_column_name,
+                column_caption=column_caption,
             )
         ),
     )

{zrb-0.22.0 → zrb-0.23.4}/src/zrb/builtin/project/add/fastapp/module/template/src/kebab-zrb-app-name/src/module/snake_zrb_module_name/register_module.py

@@ -4,7 +4,7 @@ from config import (
     app_enable_rpc_server,
     app_enable_snake_zrb_module_name_module,
 )
-from integration.app import app
+from integration.app.app import app
 from integration.log import logger
 from integration.messagebus import consumer, publisher
 from integration.rpc import rpc_caller, rpc_server

{zrb-0.22.0 → zrb-0.23.4}/src/zrb/helper/file/copy_tree.py

@@ -26,6 +26,9 @@ async def copy_tree(
         excludes = []
     if skip_parsing is None:
         skip_parsing = []
+    if os.path.isfile(src):
+        await _copy_file(src, dst, replacements, excludes, skip_parsing)
+        return
     names = os.listdir(src)
     new_dst = parse_replacement(dst, replacements)
     if not os.path.exists(new_dst):
@@ -38,13 +41,26 @@ async def copy_tree(
         if os.path.isdir(src_name):
             await copy_tree(src_name, dst_name, replacements, excludes, skip_parsing)
             continue
-        new_dst_name = parse_replacement(dst_name, replacements)
-        shutil.copy2(src_name, new_dst_name)
-        try:
-            if any(fnmatch.fnmatch(new_dst_name, pattern) for pattern in skip_parsing):
-                continue
-            file_content = await read_text_file_async(new_dst_name)
-            new_file_content = parse_replacement(file_content, replacements)
-            await write_text_file_async(new_dst_name, new_file_content)
-        except Exception:
-            logger.error(f"Cannot parse file: {new_dst_name}")
+        await _copy_file(src_name, dst_name, replacements, excludes, skip_parsing)
+
+
+async def _copy_file(
+    src: str,
+    dst: str,
+    replacements: Optional[Mapping[str, str]] = None,
+    excludes: Optional[Iterable[str]] = None,
+    skip_parsing: Optional[Iterable[str]] = None,
+):
+    if any(fnmatch.fnmatch(src, pattern) for pattern in excludes):
+        return
+    new_dst_name = parse_replacement(dst, replacements)
+    if new_dst_name != src:
+        shutil.copy2(src, new_dst_name)
+    if any(fnmatch.fnmatch(new_dst_name, pattern) for pattern in skip_parsing):
+        return
+    try:
+        file_content = await read_text_file_async(new_dst_name)
+        new_file_content = parse_replacement(file_content, replacements)
+        await write_text_file_async(new_dst_name, new_file_content)
+    except Exception:
+        logger.error(f"Cannot parse file: {new_dst_name}")