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

zrb/builtin/__init__.py

@@ -1,6 +1,7 @@
 from zrb.builtin import (
     base64,
     devtool,
+    docker,
     env,
     eval,
     explain,
@@ -18,18 +19,19 @@ from zrb.builtin import (
 )
 
 assert base64
+assert devtool
+assert docker
 assert env
 assert eval
+assert explain
+assert generator
 assert git
 assert md5
-assert explain
+assert process
 assert project
 assert ubuntu
 assert update
-assert version
-assert devtool
-assert generator
-assert process
 assert say
-assert watch_changes
 assert schedule
+assert version
+assert watch_changes

zrb/builtin/docker.py

@@ -0,0 +1,20 @@
+from zrb.builtin.group import docker_group
+from zrb.runner import runner
+from zrb.task.cmd_task import CmdTask
+
+###############################################################################
+# Task Definitions
+###############################################################################
+
+prune = CmdTask(
+    name="prune",
+    group=docker_group,
+    description="Prune unused images and volumes",
+    cmd=[
+        "docker system prune -af",
+        "docker image prune -af",
+        "docker system prune -af --volumes",
+        "docker system df",
+    ],
+)
+runner.register(prune)

zrb/builtin/generator/fastapp/template/_automate/snake_zrb_app_name/_config.py

@@ -28,12 +28,10 @@ MODULES = jsons.loads(MODULE_JSON_STR)
 # Service Configs
 ###############################################################################
 
-_OTEL_EXPORTER_ENDPOINT_ENV_NAME = "APP_OTEL_EXPORTER_OTLP_ENDPOINT"
-_OTEL_EXPORTER_ENDPOINT = "http://otel-collector:4317"
 _OTEL_EXPORTER_ENDPOINT_ENV = Env(
-    name=_OTEL_EXPORTER_ENDPOINT_ENV_NAME,
+    name="APP_OTEL_EXPORTER_OTLP_ENDPOINT",
     os_name="",
-    default=_OTEL_EXPORTER_ENDPOINT,
+    default="http://otel-collector:4317",
 )
 
 _CONTAINER_ENV_PREFIX = "CONTAINER_ZRB_ENV_PREFIX"

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

@@ -122,7 +122,7 @@ For simple CRUD, you won't need to code at all. Please see [Zrb tutorial](https:
 
 Main prerequisites
 
-- Python 3.9 or higher
+- Python 3.10 or higher
 - Pip
 - Venv
 - Node version 18 or higher
@@ -148,8 +148,8 @@ You will also need `Pulumi` if you want to deploy PascalZrbAppName into your Kub
     - `main.py`: PascalZrbAppName's application entry point. This module exposes an `app` object that will be picked up by Uvicorn.
     - `config.py`: PascalZrbAppName's configuration loader.
     - `migrate.py`: A script to perform database migration.
-    - `component/`: Definition of components you want to use in your application. Typically containing scripts to instantiate `app` objects, DB connections, Message bus connections, etc. This is where you create and connect components.
-    - `core/`: Interface and component class definitions.
+    - `integration/`: Initialization of components you want to use in your application. Typically containing scripts to instantiate `app` objects, DB connections, Message bus connections, etc. This is where you create and connect components.
+    - `component/`: Interface and component class definitions.
     - `frontend/`: Frontend source code
         - `package.json`: NPM configuration for PascalZrbAppName frontend.
         - `svelte.config.json`: Svelte configuration.
@@ -161,7 +161,7 @@ You will also need `Pulumi` if you want to deploy PascalZrbAppName into your Kub
         - `build/`: Frontend build result.
         - `static/`: Static files like images, favicon, etc.
     - `helper/`: Common helper scripts. Typically stateless.
-    - `schema/`: Common Pydantic schemas. 
+    - `schema/`: Common Pydantic schemas.
     - `module/`: Module definition. Each module can be deployed as a microservice. Thus, modules should be isolated from each other.
         - `<module_name>/`: Module resources.
             - `api.py`: HTTP request handler for the current module.
@@ -169,10 +169,10 @@ You will also need `Pulumi` if you want to deploy PascalZrbAppName into your Kub
             - `rpc.py`: RPC handler for the current module.
             - `register_module.py`: A script to register the module to the main application.
             - `migrate.py`: A script to perform migration for the current module.
-            - `component/`: Component objects for the current module.
+            - `integration/`: Initialization of components for the current module.
                 - `model/`
                 - `repo/`
-            - `core/`: Interface and component class definition for the current module.
+            - `component/`: Interface and component class definition for the current module.
             - `entity/`: Entity related resources.
                 - `<entity_name>/`: Resources for current entity.
                     - `api.py`

zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/docker-compose.yml

@@ -150,7 +150,7 @@ services:
 
 
   clickhouse:
-    image: clickhouse/clickhouse-server:22.8.8-alpine
+    image: clickhouse/clickhouse-server:24.1.2-alpine
     logging: *default-logging
     container_name: ${CONTAINER_PREFIX:-my}-kebab-zrb-app-name-clickhouse
     hostname: clickhouse
@@ -187,7 +187,7 @@ services:
 
 
   alertmanager:
-    image: signoz/alertmanager:0.23.1
+    image: signoz/alertmanager:0.23.5
     logging: *default-logging
     container_name: ${CONTAINER_PREFIX:-my}-kebab-zrb-app-name-monitoring-alertmanager
     hostname: alertmanager
@@ -207,7 +207,7 @@ services:
 
 
   query-service:
-    image: signoz/query-service:0.23.0
+    image: signoz/query-service:0.39.0
     logging: *default-logging
     container_name: ${CONTAINER_PREFIX:-my}-kebab-zrb-app-name-monitoring-query-service
     hostname: query-service
@@ -244,7 +244,7 @@ services:
 
 
   frontend:
-    image: signoz/frontend:0.23.0
+    image: signoz/frontend:0.39.0
     logging: *default-logging
     container_name: ${CONTAINER_PREFIX:-my}-kebab-zrb-app-name-monitoring-frontend
     hostname: frontend
@@ -262,8 +262,20 @@ services:
     - zrb
 
 
+  otel-collector-migrator:
+    image: signoz/signoz-schema-migrator:0.88.12
+    container_name: ${CONTAINER_PREFIX:-my}-kebab-zrb-app-name-monitoring-otel-migrator
+    command:
+      - "--dsn=tcp://clickhouse:9000"
+    depends_on:
+      clickhouse:
+        condition: service_healthy
+    networks:
+    - zrb
+
+
   otel-collector:
-    image: signoz/signoz-otel-collector:0.79.2
+    image: signoz/signoz-otel-collector:0.88.12
     logging: *default-logging
     container_name: ${CONTAINER_PREFIX:-my}-kebab-zrb-app-name-monitoring-otel-collector
     hostname: otel-collector
@@ -294,12 +306,16 @@ services:
     depends_on:
       clickhouse:
         condition: service_healthy
+      otel-collector-migrator:
+        condition: service_completed_successfully
+      query-service:
+        condition: service_healthy
     networks:
     - zrb
 
 
   otel-collector-metrics:
-    image: signoz/signoz-otel-collector:0.79.2
+    image: signoz/signoz-otel-collector:0.88.12
     logging: *default-logging
     container_name: ${CONTAINER_PREFIX:-my}-kebab-zrb-app-name-monitoring-otel-collector-metrics
     hostname: otel_collector_metrics
@@ -338,6 +354,7 @@ services:
     environment:
       APP_NAME: ${APP_NAME:-kebab-zrb-app-name}
       APP_PORT: ${APP_PORT:-8080}
+      APP_ENABLE_OTEL: ${APP_ENABLE_OTEL:-0}
     ports:
     - "${APP_HOST_PORT:-8080}:${APP_PORT:-8080}"
     restart: unless-stopped
@@ -371,6 +388,7 @@ services:
     environment:
       APP_NAME: ${APP_NAME:-kebab-zrb-app-name}-gateway
       APP_PORT: ${APP_GATEWAY_PORT:-8080}
+      APP_ENABLE_OTEL: ${APP_ENABLE_OTEL:-0}
       APP_ENABLE_EVENT_HANDLER: false
       APP_ENABLE_RPC_SERVER: false
       APP_ENABLE_API: true
@@ -405,6 +423,7 @@ services:
     environment:
       APP_NAME: ${APP_NAME:-fastapp}-auth-service
       APP_PORT: ${APP_AUTH_MODULE_PORT:-8081}
+      APP_ENABLE_OTEL: ${APP_ENABLE_OTEL:-0}
       APP_ENABLE_EVENT_HANDLER: true
       APP_ENABLE_RPC_SERVER: true
       APP_ENABLE_API: false
@@ -439,6 +458,7 @@ services:
     environment:
       APP_NAME: ${APP_NAME:-fastapp}-log-service
       APP_PORT: ${APP_LOG_MODULE_PORT:-8082}
+      APP_ENABLE_OTEL: ${APP_ENABLE_OTEL:-0}
       APP_ENABLE_EVENT_HANDLER: 'true'
       APP_ENABLE_RPC_SERVER: 'true'
       APP_ENABLE_API: 'false'

zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/monitoring/frontend/nginx-config.conf

@@ -24,8 +24,16 @@ server {
         try_files $uri $uri/ /index.html;
     }
 
-    location /api/alertmanager {
-        proxy_pass http://alertmanager:9093/api/v2;
+    location ~ ^/api/(v1|v3)/logs/(tail|livetail){
+        proxy_pass http://query-service:8080;
+        proxy_http_version 1.1;
+
+        # connection will be closed if no data is read for 600s between successive read operations
+        proxy_read_timeout 600s;
+
+        # dont buffer the data send it directly to client.
+        proxy_buffering off;
+        proxy_cache off;
     }
 
     location /api {

zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/monitoring/otel-collector/otel-collector-config.yaml

@@ -1,35 +1,23 @@
 receivers:
-  filelog/dockercontainers:
-    include: [  "/var/lib/docker/containers/*/*.log" ]
-    start_at: end
-    include_file_path: true
-    include_file_name: false
+  tcplog/docker:
+    listen_address: "0.0.0.0:2255"
     operators:
-    - type: json_parser
-      id: parser-docker
-      output: extract_metadata_from_filepath
-      timestamp:
-        parse_from: attributes.time
-        layout: '%Y-%m-%dT%H:%M:%S.%LZ'
-    - type: regex_parser
-      id: extract_metadata_from_filepath
-      regex: '^.*containers/(?P<container_id>[^_]+)/.*log$'
-      parse_from: attributes["log.file.path"]
-      output: parse_body
-    - type: move
-      id: parse_body
-      from: attributes.log
-      to: body
-      output: time
-    - type: remove
-      id: time
-      field: attributes.time
+      - type: regex_parser
+        regex: '^<([0-9]+)>[0-9]+ (?P<timestamp>[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}(\.[0-9]+)?([zZ]|([\+-])([01]\d|2[0-3]):?([0-5]\d)?)?) (?P<container_id>\S+) (?P<container_name>\S+) [0-9]+ - -( (?P<body>.*))?'
+        timestamp:
+          parse_from: attributes.timestamp
+          layout: '%Y-%m-%dT%H:%M:%S.%LZ'
+      - type: move
+        from: attributes["body"]
+        to: body
+      - type: remove
+        field: attributes.timestamp
+        # please remove names from below if you want to collect logs from them
+      - type: filter
+        id: signoz_logs_filter
+        expr: 'attributes.container_name matches "^signoz-(logspout|frontend|alertmanager|query-service|otel-collector|clickhouse|zookeeper)"'
   opencensus:
     endpoint: 0.0.0.0:55678
-  otlp/spanmetrics:
-    protocols:
-      grpc:
-        endpoint: localhost:12345
   otlp:
     protocols:
       grpc:
@@ -70,46 +58,13 @@ receivers:
 
 
 processors:
-  logstransform/internal:
-    operators:
-      - type: trace_parser
-        if: '"trace_id" in attributes or "span_id" in attributes'
-        trace_id:
-          parse_from: attributes.trace_id
-        span_id:
-          parse_from: attributes.span_id
-        output: remove_trace_id
-      - type: trace_parser
-        if: '"traceId" in attributes or "spanId" in attributes'
-        trace_id:
-          parse_from: attributes.traceId
-        span_id:
-          parse_from: attributes.spanId
-        output: remove_traceId
-      - id: remove_traceId
-        type: remove
-        if: '"traceId" in attributes'
-        field: attributes.traceId
-        output: remove_spanId
-      - id: remove_spanId
-        type: remove
-        if: '"spanId" in attributes'
-        field: attributes.spanId
-      - id: remove_trace_id
-        type: remove
-        if: '"trace_id" in attributes'
-        field: attributes.trace_id
-        output: remove_span_id
-      - id: remove_span_id
-        type: remove
-        if: '"span_id" in attributes'
-        field: attributes.span_id
   batch:
     send_batch_size: 10000
     send_batch_max_size: 11000
     timeout: 10s
-  signozspanmetrics/prometheus:
-    metrics_exporter: prometheus
+  signozspanmetrics/cumulative:
+    metrics_exporter: clickhousemetricswrite
+    metrics_flush_interval: 60s
     latency_histogram_buckets: [100us, 1ms, 2ms, 6ms, 10ms, 50ms, 100ms, 250ms, 500ms, 1000ms, 1400ms, 2000ms, 5s, 10s, 20s, 40s, 60s ]
     dimensions_cache_size: 100000
     dimensions:
@@ -140,6 +95,22 @@ processors:
     # Using OTEL_RESOURCE_ATTRIBUTES envvar, env detector adds custom labels.
     detectors: [env, system] # include ec2 for AWS, gcp for GCP and azure for Azure.
     timeout: 2s
+  signozspanmetrics/delta:
+    metrics_exporter: clickhousemetricswrite
+    metrics_flush_interval: 60s
+    latency_histogram_buckets: [100us, 1ms, 2ms, 6ms, 10ms, 50ms, 100ms, 250ms, 500ms, 1000ms, 1400ms, 2000ms, 5s, 10s, 20s, 40s, 60s ]
+    dimensions_cache_size: 100000
+    aggregation_temporality: AGGREGATION_TEMPORALITY_DELTA
+    enable_exp_histogram: true
+    dimensions:
+      - name: service.namespace
+        default: default
+      - name: deployment.environment
+        default: default
+      # This is added to ensure the uniqueness of the timeseries
+      # Otherwise, identical timeseries produced by multiple replicas of
+      # collectors result in incorrect APM metrics
+      - name: signoz.collector.id
 
 extensions:
   health_check:
@@ -160,21 +131,12 @@ exporters:
       enabled: true
   clickhousemetricswrite/prometheus:
     endpoint: tcp://clickhouse:9000/?database=signoz_metrics
-  prometheus:
-    endpoint: 0.0.0.0:8889
   # logging: {}
 
   clickhouselogsexporter:
     dsn: tcp://clickhouse:9000/
     docker_multi_node_cluster: ${DOCKER_MULTI_NODE_CLUSTER}
-    timeout: 5s
-    sending_queue:
-      queue_size: 100
-    retry_on_failure:
-      enabled: true
-      initial_interval: 5s
-      max_interval: 30s
-      max_elapsed_time: 300s
+    timeout: 10s
 
 service:
   telemetry:
@@ -187,7 +149,7 @@ service:
   pipelines:
     traces:
       receivers: [jaeger, otlp]
-      processors: [signozspanmetrics/prometheus, batch]
+      processors: [signozspanmetrics/cumulative, signozspanmetrics/delta, batch]
       exporters: [clickhousetraces]
     metrics:
       receivers: [otlp]
@@ -201,10 +163,7 @@ service:
       receivers: [prometheus]
       processors: [batch]
       exporters: [clickhousemetricswrite/prometheus]
-    metrics/spanmetrics:
-      receivers: [otlp/spanmetrics]
-      exporters: [prometheus]
     logs:
-      receivers: [otlp, filelog/dockercontainers]
-      processors: [logstransform/internal, batch]
+      receivers: [otlp, tcplog/docker]
+      processors: [batch]
       exporters: [clickhouselogsexporter]

zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/component/messagebus/__init__.py

@@ -0,0 +1,27 @@
+from component.messagebus.kafka.admin import KafkaAdmin
+from component.messagebus.kafka.consumer import KafkaConsumer
+from component.messagebus.kafka.publisher import KafkaPublisher
+from component.messagebus.messagebus import (
+    Admin,
+    Consumer,
+    MessageSerializer,
+    Publisher,
+)
+from component.messagebus.mock import MockAdmin, MockConsumer, MockPublisher
+from component.messagebus.rabbitmq.admin import RMQAdmin
+from component.messagebus.rabbitmq.consumer import RMQConsumer
+from component.messagebus.rabbitmq.publisher import RMQPublisher
+
+assert Admin
+assert Consumer
+assert Publisher
+assert MessageSerializer
+assert MockAdmin
+assert MockConsumer
+assert MockPublisher
+assert KafkaAdmin
+assert KafkaConsumer
+assert KafkaPublisher
+assert RMQAdmin
+assert RMQConsumer
+assert RMQPublisher

zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/{core → component}/messagebus/kafka/admin.py

@@ -4,7 +4,7 @@ from typing import List, Mapping, Optional
 
 from aiokafka import __version__
 from aiokafka.admin import AIOKafkaAdminClient, NewTopic
-from core.messagebus.messagebus import Admin
+from component.messagebus.messagebus import Admin
 
 
 class KafkaEventConfig:

zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/{core → component}/messagebus/kafka/consumer.py

@@ -5,8 +5,8 @@ from typing import Any, Callable, Mapping, Optional
 
 from aiokafka import AIOKafkaConsumer, __version__
 from aiokafka.consumer.consumer import RoundRobinPartitionAssignor
-from core.messagebus.kafka.admin import KafkaAdmin, must_get_kafka_admin
-from core.messagebus.messagebus import (
+from component.messagebus.kafka.admin import KafkaAdmin, must_get_kafka_admin
+from component.messagebus.messagebus import (
     Consumer,
     MessageSerializer,
     TEventHandler,

zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/{core → component}/messagebus/kafka/publisher.py

@@ -4,8 +4,8 @@ from typing import Any, Optional
 
 from aiokafka import AIOKafkaProducer
 from aiokafka.producer.producer import DefaultPartitioner, _missing
-from core.messagebus.kafka.admin import KafkaAdmin, must_get_kafka_admin
-from core.messagebus.messagebus import (
+from component.messagebus.kafka.admin import KafkaAdmin, must_get_kafka_admin
+from component.messagebus.messagebus import (
     MessageSerializer,
     Publisher,
     must_get_message_serializer,

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

@@ -1,7 +1,7 @@
 from abc import ABC, abstractmethod
 from typing import Any, Callable, List, Mapping, Optional
 
-from core.serializer.serializer import JsonSerializer, Serializer
+from component.serializer.serializer import JsonSerializer, Serializer
 
 TEventHandler = Callable[[Any], Any]
 

zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/{core → component}/messagebus/mock.py

@@ -3,7 +3,7 @@ import inspect
 import logging
 from typing import Any, Callable, List, Mapping
 
-from core.messagebus.messagebus import (
+from component.messagebus.messagebus import (
     Admin,
     Consumer,
     MessageSerializer,

zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/{core → component}/messagebus/rabbitmq/admin.py

@@ -3,7 +3,7 @@ import logging
 from typing import Any, List, Mapping, Optional
 
 import aiormq
-from core.messagebus.messagebus import Admin
+from component.messagebus.messagebus import Admin
 
 
 class RMQEventConfig:

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

@@ -4,13 +4,13 @@ import logging
 from typing import Any, Callable, Mapping, Optional
 
 import aiormq
-from core.messagebus.messagebus import (
+from component.messagebus.messagebus import (
     Consumer,
     MessageSerializer,
     TEventHandler,
     must_get_message_serializer,
 )
-from core.messagebus.rabbitmq.admin import RMQAdmin, must_get_rmq_admin
+from component.messagebus.rabbitmq.admin import RMQAdmin, must_get_rmq_admin
 
 
 class RMQConsumer(Consumer):

zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/{core → component}/messagebus/rabbitmq/publisher.py

@@ -3,12 +3,12 @@ import logging
 from typing import Any, Optional
 
 import aiormq
-from core.messagebus.messagebus import (
+from component.messagebus.messagebus import (
     MessageSerializer,
     Publisher,
     must_get_message_serializer,
 )
-from core.messagebus.rabbitmq.admin import RMQAdmin, must_get_rmq_admin
+from component.messagebus.rabbitmq.admin import RMQAdmin, must_get_rmq_admin
 from pydantic import BaseModel
 
 

zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/component/model/__init__.py

@@ -0,0 +1,3 @@
+from component.model.repo_model import RepoModel
+
+assert RepoModel

zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/{core → component}/model/repo_model.py

@@ -1,7 +1,7 @@
 from typing import Generic, List, Optional, Type, TypeVar
 
-from core.repo.repo import Repo
-from core.repo.search_filter import SearchFilter
+from component.repo.repo import Repo
+from component.repo.search_filter import SearchFilter
 from pydantic import BaseModel
 
 Schema = TypeVar("Schema", bound=BaseModel)

zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/component/repo/__init__.py

@@ -0,0 +1,9 @@
+from component.repo.db_entity_mixin import DBEntityMixin
+from component.repo.db_repo import DBRepo
+from component.repo.repo import Repo
+from component.repo.search_filter import SearchFilter
+
+assert Repo
+assert DBRepo
+assert DBEntityMixin
+assert SearchFilter

zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/{core → component}/repo/db_repo.py

@@ -1,8 +1,8 @@
 import logging
 from typing import Any, List, Mapping, Optional, Type, TypeVar
 
-from core.repo.repo import Repo
-from core.repo.search_filter import SearchFilter
+from component.repo.repo import Repo
+from component.repo.search_filter import SearchFilter
 from helper.value import utcnow
 from pydantic import BaseModel
 from sqlalchemy import or_

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

@@ -1,7 +1,7 @@
 from abc import ABC, abstractmethod
 from typing import Generic, List, Optional, TypeVar
 
-from core.repo.search_filter import SearchFilter
+from component.repo.search_filter import SearchFilter
 from pydantic import BaseModel
 
 SchemaData = TypeVar("SchemaData", bound=BaseModel)

zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/component/rpc/__init__.py

@@ -0,0 +1,8 @@
+from component.rpc.messagebus.caller import MessagebusCaller
+from component.rpc.messagebus.server import MessagebusServer
+from component.rpc.rpc import Caller, Server
+
+assert Caller
+assert Server
+assert MessagebusCaller
+assert MessagebusServer

zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/{core → component}/rpc/messagebus/caller.py

@@ -2,8 +2,8 @@ import asyncio
 import logging
 from typing import Any, Callable
 
-from core.messagebus.messagebus import Admin, Consumer, Publisher
-from core.rpc.rpc import Caller, Message, Result
+from component.messagebus.messagebus import Admin, Consumer, Publisher
+from component.rpc.rpc import Caller, Message, Result
 from ulid import ULID
 
 

zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/{core → component}/rpc/messagebus/server.py

@@ -2,8 +2,8 @@ import inspect
 import logging
 from typing import Any, Mapping
 
-from core.messagebus.messagebus import Consumer, Publisher
-from core.rpc.rpc import Message, Result, Server, TRPCHandler
+from component.messagebus.messagebus import Consumer, Publisher
+from component.rpc.rpc import Message, Result, Server, TRPCHandler
 from pydantic import BaseModel
 
 

zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/component/schema/__init__.py

@@ -0,0 +1,4 @@
+from component.schema.base_schema import BaseCountSchema, BaseDateTimeSchema
+
+assert BaseDateTimeSchema
+assert BaseCountSchema

zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/src/component/serializer/__init__.py

@@ -0,0 +1,5 @@
+from component.serializer.serializer import CustomSerializer, JsonSerializer, Serializer
+
+assert Serializer
+assert CustomSerializer
+assert JsonSerializer

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

@@ -39,7 +39,7 @@
 	},
 	"type": "module",
 	"dependencies": {
-		"axios": "^1.4.0",
+		"axios": "^1.6.0",
 		"daisyui": "^3.1.1",
 		"js-cookie": "^3.0.5",
 		"jwt-decode": "^3.1.2",

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

@@ -1,5 +1,3 @@
-from component.app_lifespan import app_lifespan, app_state
-from component.frontend_index import frontend_index_response
 from config import (
     app_cors_allow_credentials,
     app_cors_allow_headers,
@@ -18,6 +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.frontend_index import frontend_index_response
 from schema.frontend_config import FrontendConfig
 
 app = FastAPI(title=zrb_app_name, lifespan=app_lifespan)