zrb 0.8.0__py3-none-any.whl → 0.9.0__py3-none-any.whl

zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/log/{core → component}/historical_repo_model.py

@@ -1,9 +1,9 @@
 from typing import Type, TypeVar
 
 import jsons
-from core.messagebus.messagebus import Publisher
-from core.model.repo_model import RepoModel
-from core.repo.repo import Repo
+from component.messagebus.messagebus import Publisher
+from component.model.repo_model import RepoModel
+from component.repo.repo import Repo
 from module.log.schema.activity import ActivityData
 from pydantic import BaseModel
 

zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/log/entity/activity/api.py

@@ -1,11 +1,11 @@
 from logging import Logger
 
-from core.error import HTTPAPIException
-from core.messagebus import Publisher
-from core.rpc import Caller
+from component.error import HTTPAPIException
+from component.messagebus import Publisher
+from component.rpc import Caller
 from fastapi import Depends, FastAPI
-from module.auth.component import access_token_scheme
-from module.auth.core import Authorizer
+from module.auth.component import Authorizer
+from module.auth.integration import access_token_scheme
 from module.auth.schema.token import AccessTokenData
 from module.log.schema.activity import Activity, ActivityResult
 

zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/log/entity/activity/event.py

@@ -1,9 +1,9 @@
 from logging import Logger
 from typing import Any, Mapping
 
-from core.messagebus import Consumer, Publisher
-from core.rpc import Caller
-from module.log.component.model.activity_model import activity_model
+from component.messagebus import Consumer, Publisher
+from component.rpc import Caller
+from module.log.integration.model.activity_model import activity_model
 from module.log.schema.activity import ActivityData
 
 

zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/log/entity/activity/model.py

@@ -1,4 +1,4 @@
-from core.model import RepoModel
+from component.model import RepoModel
 from module.log.schema.activity import Activity, ActivityData, ActivityResult
 
 

zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/log/entity/activity/repo.py

@@ -1,5 +1,5 @@
-from core.repo import DBEntityMixin, DBRepo, Repo
-from module.log.component import Base
+from component.repo import DBEntityMixin, DBRepo, Repo
+from module.log.integration import Base
 from module.log.schema.activity import Activity, ActivityData
 from sqlalchemy import Column, String, Text
 

zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/log/entity/activity/rpc.py

@@ -1,11 +1,11 @@
 from logging import Logger
 from typing import Any, Mapping
 
-from core.messagebus import Publisher
-from core.repo import SearchFilter
-from core.rpc import Caller, Server
+from component.messagebus import Publisher
+from component.repo import SearchFilter
+from component.rpc import Caller, Server
 from module.auth.schema.token import AccessTokenData
-from module.log.component.model.activity_model import activity_model
+from module.log.integration.model.activity_model import activity_model
 from module.log.schema.activity import ActivityData
 
 

zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/log/entity/table.py

@@ -1,4 +1,4 @@
-from module.log.component.base import Base
+from module.log.integration.base import Base
 from sqlalchemy import Column, ForeignKey, Integer, Table
 
 """

zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/log/event.py

@@ -1,7 +1,7 @@
 from logging import Logger
 
-from core.messagebus import Consumer, Publisher
-from core.rpc import Caller
+from component.messagebus import Consumer, Publisher
+from component.rpc import Caller
 from module.log.entity.activity.event import register_event as register_activity_event
 
 

zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/log/integration/__init__.py

@@ -0,0 +1,3 @@
+from module.log.integration.base import Base
+
+assert Base

zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/log/{component → integration}/model/activity_model.py

@@ -1,4 +1,4 @@
-from module.log.component.repo.activity_repo import activity_repo
 from module.log.entity.activity.model import ActivityModel
+from module.log.integration.repo.activity_repo import activity_repo
 
 activity_model: ActivityModel = ActivityModel(activity_repo)

zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/log/{component → integration}/repo/activity_repo.py

@@ -1,5 +1,5 @@
-from component.db_connection import engine
-from component.log import logger
+from integration.db_connection import engine
+from integration.log import logger
 from module.log.entity.activity.repo import ActivityDBRepo, ActivityRepo
 
 activity_repo: ActivityRepo = ActivityDBRepo(logger=logger, engine=engine)

zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/log/migrate.py

@@ -1,8 +1,8 @@
-from component.db_connection import engine
-from component.log import logger
 from config import app_enable_log_module
 from helper.migration import migrate
-from module.log.component import Base
+from integration.db_connection import engine
+from integration.log import logger
+from module.log.integration import Base
 
 
 async def migrate_log():

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

@@ -1,14 +1,14 @@
-from component.app import app
-from component.log import logger
-from component.messagebus import consumer, publisher
-from component.rpc import rpc_caller, rpc_server
 from config import (
     app_enable_api,
     app_enable_event_handler,
     app_enable_log_module,
     app_enable_rpc_server,
 )
-from module.auth.component import authorizer
+from integration.app import app
+from integration.log import logger
+from integration.messagebus import consumer, publisher
+from integration.rpc import rpc_caller, rpc_server
+from module.auth.integration import authorizer
 from module.log.api import register_api
 from module.log.event import register_event
 from module.log.rpc import register_rpc

zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/log/rpc.py

@@ -1,8 +1,8 @@
 from logging import Logger
 from typing import Any
 
-from core.messagebus import Publisher
-from core.rpc import Caller, Server
+from component.messagebus import Publisher
+from component.rpc import Caller, Server
 from module.log.entity.activity.rpc import register_rpc as register_activity_rpc
 
 

zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/module/log/schema/activity.py

@@ -1,6 +1,6 @@
 from typing import List
 
-from core.schema import BaseCountSchema, BaseDateTimeSchema
+from component.schema import BaseCountSchema, BaseDateTimeSchema
 
 
 class ActivityData(BaseDateTimeSchema):

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

@@ -14,7 +14,7 @@ aiormq= "==6.8.0"
 aiokafka= "==0.10.0"
 alembic= "==1.13.1"
 bcrypt= "==4.1.2"
-fastapi= "==0.109.0"
+fastapi= "==0.109.1"
 jsons= "==1.6.3"
 pydantic= "==2.5.3"
 psycopg2-binary= "==2.9.9"
@@ -23,9 +23,9 @@ uvicorn= "==0.27.0"
 watchfiles= "==0.21.0"
 python-multipart= "==0.0.6"
 python-ulid= "==2.2.0"
-opentelemetry-distro= "==0.40b0"
-opentelemetry-exporter-otlp= "==1.19.0"
-opentelemetry-instrumentation-fastapi= "==0.40b0"
+opentelemetry-distro= "==0.44b0"
+opentelemetry-exporter-otlp= "==1.23.0"
+opentelemetry-instrumentation-fastapi= "==0.44b0"
 
 
 [tool.poetry.dev-dependencies]

zrb/builtin/generator/fastapp_crud/template/src/kebab-zrb-app-name/src/module/snake_zrb_module_name/entity/snake_zrb_entity_name/api.py

@@ -1,11 +1,11 @@
 from logging import Logger
 
-from core.error import HTTPAPIException
-from core.messagebus import Publisher
-from core.rpc import Caller
+from component.error import HTTPAPIException
+from component.messagebus import Publisher
+from component.rpc import Caller
 from fastapi import Depends, FastAPI
-from module.auth.component import access_token_scheme
-from module.auth.core import Authorizer
+from module.auth.component import Authorizer
+from module.auth.integration import access_token_scheme
 from module.auth.schema.token import AccessTokenData
 from module.snake_zrb_module_name.schema.snake_zrb_entity_name import (
     PascalZrbEntityName,

zrb/builtin/generator/fastapp_crud/template/src/kebab-zrb-app-name/src/module/snake_zrb_module_name/entity/snake_zrb_entity_name/model.py

@@ -1,4 +1,4 @@
-from module.log.core.historical_repo_model import HistoricalRepoModel
+from module.log.component.historical_repo_model import HistoricalRepoModel
 from module.snake_zrb_module_name.schema.snake_zrb_entity_name import (
     PascalZrbEntityName,
     PascalZrbEntityNameData,

zrb/builtin/generator/fastapp_crud/template/src/kebab-zrb-app-name/src/module/snake_zrb_module_name/entity/snake_zrb_entity_name/repo.py

@@ -1,5 +1,5 @@
-from core.repo import DBEntityMixin, DBRepo, Repo
-from module.snake_zrb_module_name.component import Base
+from component.repo import DBEntityMixin, DBRepo, Repo
+from module.snake_zrb_module_name.integration import Base
 from module.snake_zrb_module_name.schema.snake_zrb_entity_name import (
     PascalZrbEntityName,
     PascalZrbEntityNameData,

zrb/builtin/generator/fastapp_crud/template/src/kebab-zrb-app-name/src/module/snake_zrb_module_name/entity/snake_zrb_entity_name/rpc.py

@@ -1,11 +1,11 @@
 from logging import Logger
 from typing import Any, Mapping
 
-from core.messagebus import Publisher
-from core.repo import SearchFilter
-from core.rpc import Caller, Server
+from component.messagebus import Publisher
+from component.repo import SearchFilter
+from component.rpc import Caller, Server
 from module.auth.schema.token import AccessTokenData
-from module.snake_zrb_module_name.component.model.snake_zrb_entity_name_model import (
+from module.snake_zrb_module_name.integration.model.snake_zrb_entity_name_model import (
     snake_zrb_entity_name_model,
 )
 from module.snake_zrb_module_name.schema.snake_zrb_entity_name import (

zrb/builtin/generator/fastapp_crud/template/src/kebab-zrb-app-name/src/module/snake_zrb_module_name/{component → integration}/model/snake_zrb_entity_name_model.py

@@ -1,10 +1,10 @@
-from component.messagebus import publisher
-from module.snake_zrb_module_name.component.repo.snake_zrb_entity_name_repo import (
-    snake_zrb_entity_name_repo,
-)
+from integration.messagebus import publisher
 from module.snake_zrb_module_name.entity.snake_zrb_entity_name.model import (
     PascalZrbEntityNameModel,
 )
+from module.snake_zrb_module_name.integration.repo.snake_zrb_entity_name_repo import (
+    snake_zrb_entity_name_repo,
+)
 
 snake_zrb_entity_name_model: PascalZrbEntityNameModel = PascalZrbEntityNameModel(
     snake_zrb_entity_name_repo, publisher

zrb/builtin/generator/fastapp_crud/template/src/kebab-zrb-app-name/src/module/snake_zrb_module_name/{component → integration}/repo/snake_zrb_entity_name_repo.py

@@ -1,5 +1,5 @@
-from component.db_connection import engine
-from component.log import logger
+from integration.db_connection import engine
+from integration.log import logger
 from module.snake_zrb_module_name.entity.snake_zrb_entity_name.repo import (
     PascalZrbEntityNameDBRepo,
     PascalZrbEntityNameRepo,

zrb/builtin/generator/fastapp_crud/template/src/kebab-zrb-app-name/src/module/snake_zrb_module_name/schema/snake_zrb_entity_name.py

@@ -1,6 +1,6 @@
 from typing import List
 
-from core.schema import BaseCountSchema, BaseDateTimeSchema
+from component.schema import BaseCountSchema, BaseDateTimeSchema
 
 
 class PascalZrbEntityNameData(BaseDateTimeSchema):

zrb/builtin/generator/fastapp_module/helper.py

@@ -115,6 +115,7 @@ def _get_new_docker_compose_service_definition(
                 + kebab_app_name
                 + "}-"
                 + f"{kebab_module_name}-service",  # noqa
+                "APP_ENABLE_OTEL": "${APP_ENABLE_OTEL:-0}",
                 "APP_PORT": app_container_port_env,
                 "APP_ENABLE_EVENT_HANDLER": "true",
                 "APP_ENABLE_RPC_SERVER": "true",

zrb/builtin/generator/fastapp_module/template/src/kebab-zrb-app-name/src/module/snake_zrb_module_name/api.py

@@ -1,9 +1,9 @@
 from logging import Logger
 
-from core.messagebus import Publisher
-from core.rpc import Caller
+from component.messagebus import Publisher
+from component.rpc import Caller
 from fastapi import FastAPI
-from module.auth.core import Authorizer
+from module.auth.component import Authorizer
 
 
 def register_api(

zrb/builtin/generator/fastapp_module/template/src/kebab-zrb-app-name/src/module/snake_zrb_module_name/component/__init__.py

@@ -1,3 +0,0 @@
-from module.snake_zrb_module_name.component.base import Base
-
-assert Base

zrb/builtin/generator/fastapp_module/template/src/kebab-zrb-app-name/src/module/snake_zrb_module_name/entity/table.py

@@ -1,4 +1,4 @@
-from module.snake_zrb_module_name.component.base import Base
+from module.snake_zrb_module_name.integration.base import Base
 from sqlalchemy import Column, ForeignKey, Integer, Table
 
 """

zrb/builtin/generator/fastapp_module/template/src/kebab-zrb-app-name/src/module/snake_zrb_module_name/event.py

@@ -1,7 +1,7 @@
 from logging import Logger
 
-from core.messagebus import Consumer, Publisher
-from core.rpc import Caller
+from component.messagebus import Consumer, Publisher
+from component.rpc import Caller
 
 
 def register_event(

zrb/builtin/generator/fastapp_module/template/src/kebab-zrb-app-name/src/module/snake_zrb_module_name/integration/__init__.py

@@ -0,0 +1,3 @@
+from module.snake_zrb_module_name.integration.base import Base
+
+assert Base

zrb/builtin/generator/fastapp_module/template/src/kebab-zrb-app-name/src/module/snake_zrb_module_name/migrate.py

@@ -1,8 +1,8 @@
-from component.db_connection import engine
-from component.log import logger
 from config import app_enable_snake_zrb_module_name_module
 from helper.migration import migrate
-from module.snake_zrb_module_name.component import Base
+from integration.db_connection import engine
+from integration.log import logger
+from module.snake_zrb_module_name.integration import Base
 
 
 async def migrate_snake_zrb_module_name():

zrb/builtin/generator/fastapp_module/template/src/kebab-zrb-app-name/src/module/snake_zrb_module_name/register_module.py

@@ -1,14 +1,14 @@
-from component.app import app
-from component.log import logger
-from component.messagebus import consumer, publisher
-from component.rpc import rpc_caller, rpc_server
 from config import (
     app_enable_api,
     app_enable_event_handler,
     app_enable_rpc_server,
     app_enable_snake_zrb_module_name_module,
 )
-from module.auth.component import authorizer
+from integration.app import app
+from integration.log import logger
+from integration.messagebus import consumer, publisher
+from integration.rpc import rpc_caller, rpc_server
+from module.auth.integration import authorizer
 from module.snake_zrb_module_name.api import register_api
 from module.snake_zrb_module_name.event import register_event
 from module.snake_zrb_module_name.rpc import register_rpc

zrb/builtin/generator/fastapp_module/template/src/kebab-zrb-app-name/src/module/snake_zrb_module_name/rpc.py

@@ -1,8 +1,8 @@
 from logging import Logger
 from typing import Any
 
-from core.messagebus import Publisher
-from core.rpc import Caller, Server
+from component.messagebus import Publisher
+from component.rpc import Caller, Server
 
 
 def register_rpc(

{zrb-0.8.0.dist-info → zrb-0.9.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zrb
-Version: 0.8.0
+Version: 0.9.0
 Summary: A Framework to Enhance Your Workflow
 Home-page: https://github.com/state-alchemists/zrb
 License: AGPL-3.0-or-later