zrb 0.23.0__py3-none-any.whl → 0.24.0__py3-none-any.whl

zrb/builtin/project/add/fastapp/app/template/src/kebab-zrb-app-name/src/module/log/register_module.py

@@ -1,10 +1,10 @@
 from config import (
-    app_enable_api,
-    app_enable_event_handler,
-    app_enable_log_module,
-    app_enable_rpc_server,
+    APP_ENABLE_API,
+    APP_ENABLE_EVENT_HANDLER,
+    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
@@ -15,10 +15,10 @@ from module.log.rpc import register_rpc
 
 
 def register_log():
-    if not app_enable_log_module:
+    if not APP_ENABLE_LOG_MODULE:
         logger.info('🥪 Skip registering "log"')
         return
-    if app_enable_api:
+    if APP_ENABLE_API:
         register_api(
             logger=logger,
             app=app,
@@ -26,11 +26,11 @@ def register_log():
             rpc_caller=rpc_caller,
             publisher=publisher,
         )
-    if app_enable_event_handler:
+    if APP_ENABLE_EVENT_HANDLER:
         register_event(
             logger=logger, consumer=consumer, rpc_caller=rpc_caller, publisher=publisher
         )
-    if app_enable_rpc_server:
+    if APP_ENABLE_RPC_SERVER:
         register_rpc(
             logger=logger,
             rpc_server=rpc_server,

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

@@ -10,8 +10,8 @@ APP_OTEL_EXPORTER_OTLP_ENDPOINT=http://localhost:4317
 
 PUBLIC_BRAND=PascalZrbAppName
 PUBLIC_TITLE=PascalZrbAppName
-PUBLIC_AUTH_ACCESS_TOKEN_COOKIE_KEY=access_token
-PUBLIC_AUTH_REFRESH_TOKEN_COOKIE_KEY=refresh_token
+APP_AUTH_ACCESS_TOKEN_COOKIE_KEY=access_token
+APP_AUTH_REFRESH_TOKEN_COOKIE_KEY=refresh_token
 
 APP_AUTH_ACCESS_TOKEN_EXPIRE_SECONDS=300
 APP_AUTH_ACCESS_TOKEN_TYPE=jwt
@@ -36,6 +36,9 @@ APP_AUTH_GUEST_PHONE=
 APP_DB_CONNECTION=postgresql+psycopg2://postgres:admin@localhost:5432/snake_zrb_app_name
 APP_DB_ENGINE_SHOW_LOG=false
 APP_DB_AUTO_MIGRATE=true
+APP_DB_POOL_PRE_PING=true
+APP_DB_POOL_SIZE=20
+APP_DB_POOL_MAX_OVERFLOW=0
 
 APP_BROKER_TYPE=rabbitmq
 

zrb/builtin/project/add/fastapp/app/template/src/kebab-zrb-app-name/test/auth/test_group_crud.py

@@ -2,7 +2,7 @@ from typing import AsyncIterator
 
 import pytest
 from httpx import AsyncClient
-from src.config import app_auth_admin_password, app_auth_admin_username
+from src.config import APP_AUTH_ADMIN_PASSWORD, APP_AUTH_ADMIN_USERNAME
 
 inserted_success_data = {
     "name": "test-create-group-success",
@@ -35,8 +35,8 @@ async def test_insert_group_and_get_success(
         login_admin_response = await client.post(
             "/api/v1/auth/login",
             json={
-                "identity": app_auth_admin_username,
-                "password": app_auth_admin_password,
+                "identity": APP_AUTH_ADMIN_USERNAME,
+                "password": APP_AUTH_ADMIN_PASSWORD,
             },
         )
         assert login_admin_response.status_code == 200
@@ -88,8 +88,8 @@ async def test_update_group_and_get_success(
         login_admin_response = await client.post(
             "/api/v1/auth/login",
             json={
-                "identity": app_auth_admin_username,
-                "password": app_auth_admin_password,
+                "identity": APP_AUTH_ADMIN_USERNAME,
+                "password": APP_AUTH_ADMIN_PASSWORD,
             },
         )
         assert login_admin_response.status_code == 200
@@ -155,8 +155,8 @@ async def test_delete_group_and_get_success(
         login_admin_response = await client.post(
             "/api/v1/auth/login",
             json={
-                "identity": app_auth_admin_username,
-                "password": app_auth_admin_password,
+                "identity": APP_AUTH_ADMIN_USERNAME,
+                "password": APP_AUTH_ADMIN_PASSWORD,
             },
         )
         assert login_admin_response.status_code == 200

zrb/builtin/project/add/fastapp/app/template/src/kebab-zrb-app-name/test/auth/test_permission_crud.py

@@ -2,7 +2,7 @@ from typing import AsyncIterator
 
 import pytest
 from httpx import AsyncClient
-from src.config import app_auth_admin_password, app_auth_admin_username
+from src.config import APP_AUTH_ADMIN_PASSWORD, APP_AUTH_ADMIN_USERNAME
 
 inserted_success_data = {
     "name": "test-create-permission-success",
@@ -31,8 +31,8 @@ async def test_insert_permission_and_get_success(
         login_admin_response = await client.post(
             "/api/v1/auth/login",
             json={
-                "identity": app_auth_admin_username,
-                "password": app_auth_admin_password,
+                "identity": APP_AUTH_ADMIN_USERNAME,
+                "password": APP_AUTH_ADMIN_PASSWORD,
             },
         )
         assert login_admin_response.status_code == 200
@@ -84,8 +84,8 @@ async def test_update_permission_and_get_success(
         login_admin_response = await client.post(
             "/api/v1/auth/login",
             json={
-                "identity": app_auth_admin_username,
-                "password": app_auth_admin_password,
+                "identity": APP_AUTH_ADMIN_USERNAME,
+                "password": APP_AUTH_ADMIN_PASSWORD,
                 "permissions": [],
             },
         )
@@ -152,8 +152,8 @@ async def test_delete_permission_and_get_success(
         login_admin_response = await client.post(
             "/api/v1/auth/login",
             json={
-                "identity": app_auth_admin_username,
-                "password": app_auth_admin_password,
+                "identity": APP_AUTH_ADMIN_USERNAME,
+                "password": APP_AUTH_ADMIN_PASSWORD,
             },
         )
         assert login_admin_response.status_code == 200

zrb/builtin/project/add/fastapp/app/template/src/kebab-zrb-app-name/test/auth/test_user_crud.py

@@ -2,7 +2,7 @@ from typing import AsyncIterator
 
 import pytest
 from httpx import AsyncClient
-from src.config import app_auth_admin_password, app_auth_admin_username
+from src.config import APP_AUTH_ADMIN_PASSWORD, APP_AUTH_ADMIN_USERNAME
 
 inserted_success_data = {
     "username": "test-create-user-success",
@@ -51,8 +51,8 @@ async def test_insert_user_and_get_success(
         login_admin_response = await client.post(
             "/api/v1/auth/login",
             json={
-                "identity": app_auth_admin_username,
-                "password": app_auth_admin_password,
+                "identity": APP_AUTH_ADMIN_USERNAME,
+                "password": APP_AUTH_ADMIN_PASSWORD,
             },
         )
         assert login_admin_response.status_code == 200
@@ -104,8 +104,8 @@ async def test_update_user_and_get_success(
         login_admin_response = await client.post(
             "/api/v1/auth/login",
             json={
-                "identity": app_auth_admin_username,
-                "password": app_auth_admin_password,
+                "identity": APP_AUTH_ADMIN_USERNAME,
+                "password": APP_AUTH_ADMIN_PASSWORD,
             },
         )
         assert login_admin_response.status_code == 200
@@ -171,8 +171,8 @@ async def test_delete_user_and_get_success(
         login_admin_response = await client.post(
             "/api/v1/auth/login",
             json={
-                "identity": app_auth_admin_username,
-                "password": app_auth_admin_password,
+                "identity": APP_AUTH_ADMIN_USERNAME,
+                "password": APP_AUTH_ADMIN_PASSWORD,
             },
         )
         assert login_admin_response.status_code == 200

zrb/builtin/project/add/fastapp/app/template/src/kebab-zrb-app-name/test/auth/test_user_login.py

@@ -2,7 +2,7 @@ from typing import AsyncIterator
 
 import pytest
 from httpx import AsyncClient
-from src.config import app_auth_admin_password, app_auth_admin_username
+from src.config import APP_AUTH_ADMIN_PASSWORD, APP_AUTH_ADMIN_USERNAME
 
 
 @pytest.mark.asyncio
@@ -13,8 +13,8 @@ async def test_admin_user_login_success(
         login_response = await client.post(
             "/api/v1/auth/login",
             json={
-                "identity": app_auth_admin_username,
-                "password": app_auth_admin_password,
+                "identity": APP_AUTH_ADMIN_USERNAME,
+                "password": APP_AUTH_ADMIN_PASSWORD,
             },
         )
         assert login_response.status_code == 200
@@ -30,7 +30,7 @@ async def test_admin_user_login_empty_identity_failed(
     async for client in test_client_generator:
         login_response = await client.post(
             "/api/v1/auth/login",
-            json={"identity": "", "password": app_auth_admin_password},
+            json={"identity": "", "password": APP_AUTH_ADMIN_PASSWORD},
         )
         assert login_response.status_code == 422
 
@@ -42,7 +42,7 @@ async def test_admin_user_login_invalid_identity_failed(
     async for client in test_client_generator:
         login_response = await client.post(
             "/api/v1/auth/login",
-            json={"identity": "invalid-identity", "password": app_auth_admin_password},
+            json={"identity": "invalid-identity", "password": APP_AUTH_ADMIN_PASSWORD},
         )
         assert login_response.status_code == 404
 
@@ -54,7 +54,7 @@ async def test_admin_user_failed_invalid_password(
     async for client in test_client_generator:
         login_response = await client.post(
             "/api/v1/auth/login",
-            json={"identity": app_auth_admin_username, "password": "invalid-password"},
+            json={"identity": APP_AUTH_ADMIN_USERNAME, "password": "invalid-password"},
         )
         assert login_response.status_code == 404
 
@@ -68,8 +68,8 @@ async def test_create_normal_user_and_login_with_username_success(
         login_admin_response = await client.post(
             "/api/v1/auth/login",
             json={
-                "identity": app_auth_admin_username,
-                "password": app_auth_admin_password,
+                "identity": APP_AUTH_ADMIN_USERNAME,
+                "password": APP_AUTH_ADMIN_PASSWORD,
             },
         )
         assert login_admin_response.status_code == 200
@@ -113,8 +113,8 @@ async def test_create_normal_user_and_login_with_phone_success(
         login_admin_response = await client.post(
             "/api/v1/auth/login",
             json={
-                "identity": app_auth_admin_username,
-                "password": app_auth_admin_password,
+                "identity": APP_AUTH_ADMIN_USERNAME,
+                "password": APP_AUTH_ADMIN_PASSWORD,
             },
         )
         assert login_admin_response.status_code == 200
@@ -155,8 +155,8 @@ async def test_create_normal_user_and_login_with_email_success(
         login_admin_response = await client.post(
             "/api/v1/auth/login",
             json={
-                "identity": app_auth_admin_username,
-                "password": app_auth_admin_password,
+                "identity": APP_AUTH_ADMIN_USERNAME,
+                "password": APP_AUTH_ADMIN_PASSWORD,
             },
         )
         assert login_admin_response.status_code == 200
@@ -200,8 +200,8 @@ async def test_create_normal_user_and_login_failed(
         login_admin_response = await client.post(
             "/api/v1/auth/login",
             json={
-                "identity": app_auth_admin_username,
-                "password": app_auth_admin_password,
+                "identity": APP_AUTH_ADMIN_USERNAME,
+                "password": APP_AUTH_ADMIN_PASSWORD,
             },
         )
         assert login_admin_response.status_code == 200

zrb/builtin/project/add/fastapp/app/template/src/kebab-zrb-app-name/test/test_liveness_and_readiness.py

@@ -2,7 +2,7 @@ from typing import AsyncIterator
 
 import pytest
 from httpx import AsyncClient
-from src.config import zrb_app_name
+from src.config import APP_NAME
 
 
 @pytest.mark.asyncio
@@ -10,7 +10,7 @@ async def test_get_liveness(test_client_generator: AsyncIterator[AsyncClient]):
     async for client in test_client_generator:
         response = await client.get("/liveness")
         assert response.status_code == 200
-        assert response.json() == {"app": zrb_app_name, "alive": True}
+        assert response.json() == {"app": APP_NAME, "alive": True}
 
 
 @pytest.mark.asyncio
@@ -25,7 +25,7 @@ async def test_get_readiness(test_client_generator: AsyncIterator[AsyncClient]):
     async for client in test_client_generator:
         response = await client.get("/readiness")
         assert response.status_code == 200
-        assert response.json() == {"app": zrb_app_name, "ready": True}
+        assert response.json() == {"app": APP_NAME, "ready": True}
 
 
 @pytest.mark.asyncio

zrb/builtin/project/add/fastapp/crud/_helper/__init__.py

@@ -0,0 +1,7 @@
+from .register_api import register_api
+from .register_permission import register_permission
+from .register_rpc import register_rpc
+
+assert register_api
+assert register_permission
+assert register_rpc

zrb/builtin/project/add/fastapp/crud/_helper/_common.py

@@ -0,0 +1,8 @@
+import os
+
+from zrb.helper.util import to_kebab_case
+
+
+def get_app_module_dir(project_dir: str, app_name: str) -> str:
+    kebab_app_name = to_kebab_case(app_name)
+    return os.path.join(project_dir, "src", kebab_app_name, "src", "module")

zrb/builtin/project/add/fastapp/crud/_helper/register_api.py

@@ -0,0 +1,45 @@
+import os
+
+from zrb.helper.codemod.add_import_module import add_import_module
+from zrb.helper.codemod.append_code_to_function import append_code_to_function
+from zrb.helper.file.text import read_text_file_async, write_text_file_async
+from zrb.helper.typecheck import typechecked
+from zrb.helper.util import to_snake_case
+from zrb.task.task import Task
+
+from ._common import get_app_module_dir
+
+
+@typechecked
+async def register_api(
+    task: Task, project_dir: str, app_name: str, module_name: str, entity_name: str
+):
+    snake_module_name = to_snake_case(module_name)
+    snake_entity_name = to_snake_case(entity_name)
+    module_api_file_path = os.path.join(
+        get_app_module_dir(project_dir, app_name), snake_module_name, "api.py"
+    )
+    register_function_path = ".".join(
+        ["module", snake_module_name, "entity", snake_entity_name, "api"]
+    )
+    register_function = f"register_{snake_entity_name}_api"
+    task.print_out(f"Read code from: {module_api_file_path}")
+    code = await read_text_file_async(module_api_file_path)
+    task.print_out(
+        f'Add import "register_api" as "{register_function}" '
+        + f'from "{register_function_path}" to the code'
+    )
+    code = add_import_module(
+        code=code,
+        module_path=register_function_path,
+        resource="register_api",
+        alias=register_function,
+    )
+    task.print_out(f'Add "{register_function}" call to the code')
+    code = append_code_to_function(
+        code=code,
+        function_name="register_api",
+        new_code=f"{register_function}(logger, app, authorizer, rpc_caller, publisher)",  # noqa
+    )
+    task.print_out(f"Write modified code to: {module_api_file_path}")
+    await write_text_file_async(module_api_file_path, code)

zrb/builtin/project/add/fastapp/crud/_helper/register_permission.py

@@ -0,0 +1,40 @@
+import os
+
+from zrb.helper.codemod.append_code_to_function import append_code_to_function
+from zrb.helper.file.text import read_text_file_async, write_text_file_async
+from zrb.helper.typecheck import typechecked
+from zrb.helper.util import to_snake_case
+from zrb.task.task import Task
+
+from ._common import get_app_module_dir
+
+
+@typechecked
+async def register_permission(
+    task: Task, project_dir: str, app_name: str, module_name: str, entity_name: str
+):
+    snake_module_name = to_snake_case(module_name)
+    snake_entity_name = to_snake_case(entity_name)
+    module_register_permission_file_path = os.path.join(
+        get_app_module_dir(project_dir, app_name),
+        "auth",
+        "register_permission.py",
+    )
+    task.print_out(f"Read code from: {module_register_permission_file_path}")
+    code = await read_text_file_async(module_register_permission_file_path)
+    code = append_code_to_function(
+        code=code,
+        function_name="register_permission",
+        new_code="\n".join(
+            [
+                "await ensure_entity_permission(",
+                f"    module_name='{snake_module_name}', entity_name='{snake_entity_name}'",  # noqa
+                ")",
+            ]
+        ),
+    )
+    task.print_out(
+        f'Add "ensure_entity_permission" call for {snake_entity_name} ' + "to the code"
+    )
+    task.print_out(f"Write modified code to: {module_register_permission_file_path}")
+    await write_text_file_async(module_register_permission_file_path, code)

zrb/builtin/project/add/fastapp/crud/_helper/register_rpc.py

@@ -0,0 +1,45 @@
+import os
+
+from zrb.helper.codemod.add_import_module import add_import_module
+from zrb.helper.codemod.append_code_to_function import append_code_to_function
+from zrb.helper.file.text import read_text_file_async, write_text_file_async
+from zrb.helper.typecheck import typechecked
+from zrb.helper.util import to_snake_case
+from zrb.task.task import Task
+
+from ._common import get_app_module_dir
+
+
+@typechecked
+async def register_rpc(
+    task: Task, project_dir: str, app_name: str, module_name: str, entity_name: str
+):
+    snake_module_name = to_snake_case(module_name)
+    snake_entity_name = to_snake_case(entity_name)
+    module_rpc_file_path = os.path.join(
+        get_app_module_dir(project_dir, app_name), snake_module_name, "rpc.py"
+    )
+    register_function_path = ".".join(
+        ["module", snake_module_name, "entity", snake_entity_name, "rpc"]
+    )
+    register_function = f"register_{snake_entity_name}_rpc"
+    task.print_out(f"Read code from: {module_rpc_file_path}")
+    code = await read_text_file_async(module_rpc_file_path)
+    task.print_out(
+        f'Add import "register_rpc" as "{register_function}" '
+        + f'from "{register_function_path}" to the code'
+    )
+    code = add_import_module(
+        code=code,
+        module_path=register_function_path,
+        resource="register_rpc",
+        alias=register_function,
+    )
+    task.print_out(f'Add "{register_function}" call to the code')
+    code = append_code_to_function(
+        code=code,
+        function_name="register_rpc",
+        new_code=f"{register_function}(logger, rpc_server, rpc_caller, publisher)",  # noqa
+    )
+    task.print_out(f"Write modified code to: {module_rpc_file_path}")
+    await write_text_file_async(module_rpc_file_path, code)

zrb/builtin/project/add/fastapp/crud/crud.py

@@ -107,24 +107,15 @@ async def register_crud(*args: Any, **kwargs: Any):
     app_name = kwargs.get("app_name")
     module_name = kwargs.get("module_name")
     entity_name = kwargs.get("entity_name")
-    kebab_app_name = util.to_kebab_case(app_name)
-    snake_module_name = util.to_snake_case(module_name)
-    snake_entity_name = util.to_snake_case(entity_name)
     await asyncio.gather(
         asyncio.create_task(
-            register_api(
-                task, project_dir, kebab_app_name, snake_module_name, snake_entity_name
-            )
+            register_api(task, project_dir, app_name, module_name, entity_name)
         ),
         asyncio.create_task(
-            register_rpc(
-                task, project_dir, kebab_app_name, snake_module_name, snake_entity_name
-            )
+            register_rpc(task, project_dir, app_name, module_name, entity_name)
         ),
         asyncio.create_task(
-            register_permission(
-                task, project_dir, kebab_app_name, snake_module_name, snake_entity_name
-            )
+            register_permission(task, project_dir, app_name, module_name, entity_name)
         ),
     )
 

zrb/builtin/project/add/fastapp/crud/template/src/kebab-zrb-app-name/src/module/snake_zrb_module_name/entity/snake_zrb_entity_name/repo.py

@@ -4,7 +4,18 @@ from module.snake_zrb_module_name.schema.snake_zrb_entity_name import (
     PascalZrbEntityName,
     PascalZrbEntityNameData,
 )
-from sqlalchemy import Column, String
+from sqlalchemy import (
+    Boolean,
+    Column,
+    Date,
+    DateTime,
+    Double,
+    Float,
+    Integer,
+    String,
+    Text,
+    Time,
+)
 
 
 class DBEntityPascalZrbEntityName(Base, DBEntityMixin):

zrb/builtin/project/add/fastapp/crud/template/src/kebab-zrb-app-name/src/module/snake_zrb_module_name/schema/snake_zrb_entity_name.py

@@ -1,3 +1,4 @@
+from datetime import date, datetime, time
 from typing import List, Optional
 
 from component.schema import BaseCountSchema, BaseDateTimeSchema

zrb/builtin/project/add/fastapp/crud/template/src/kebab-zrb-app-name/test/snake_zrb_module_name/test_snake_zrb_entity_name.py

@@ -1,8 +1,9 @@
+from datetime import date, datetime, time
 from typing import AsyncIterator
 
 import pytest
+from config import APP_AUTH_ADMIN_PASSWORD, APP_AUTH_ADMIN_USERNAME
 from httpx import AsyncClient
-from src.config import app_auth_admin_password, app_auth_admin_username
 
 inserted_success_data = {
     "snake_zrb_column_name": "test-kebab-create-entity-name-success"
@@ -27,8 +28,8 @@ async def test_insert_snake_zrb_entity_name_and_get_success(
         login_admin_response = await client.post(
             "/api/v1/auth/login",
             json={
-                "identity": app_auth_admin_username,
-                "password": app_auth_admin_password,
+                "identity": APP_AUTH_ADMIN_USERNAME,
+                "password": APP_AUTH_ADMIN_PASSWORD,
             },
         )
         assert login_admin_response.status_code == 200
@@ -80,8 +81,8 @@ async def test_update_snake_zrb_entity_name_and_get_success(
         login_admin_response = await client.post(
             "/api/v1/auth/login",
             json={
-                "identity": app_auth_admin_username,
-                "password": app_auth_admin_password,
+                "identity": APP_AUTH_ADMIN_USERNAME,
+                "password": APP_AUTH_ADMIN_PASSWORD,
             },
         )
         assert login_admin_response.status_code == 200
@@ -147,8 +148,8 @@ async def test_delete_snake_zrb_entity_name_and_get_success(
         login_admin_response = await client.post(
             "/api/v1/auth/login",
             json={
-                "identity": app_auth_admin_username,
-                "password": app_auth_admin_password,
+                "identity": APP_AUTH_ADMIN_USERNAME,
+                "password": APP_AUTH_ADMIN_PASSWORD,
             },
         )
         assert login_admin_response.status_code == 200

zrb/builtin/project/add/fastapp/field/_helper/__init__.py

@@ -0,0 +1,17 @@
+from .inject_delete_page import inject_delete_page
+from .inject_detail_page import inject_detail_page
+from .inject_insert_page import inject_insert_page
+from .inject_list_page import inject_list_page
+from .inject_repo import inject_repo
+from .inject_schema import inject_schema
+from .inject_test import inject_test
+from .inject_update_page import inject_update_page
+
+assert inject_list_page
+assert inject_detail_page
+assert inject_insert_page
+assert inject_update_page
+assert inject_delete_page
+assert inject_repo
+assert inject_schema
+assert inject_test