tigrbl 0.3.16.dev4__tar.gz → 0.3.16.dev5__tar.gz

{tigrbl-0.3.16.dev4 → tigrbl-0.3.16.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tigrbl
-Version: 0.3.16.dev4
+Version: 0.3.16.dev5
 Summary: A modern pure ASGI/WSGI Python framework for building schema-first REST and JSON-RPC APIs with SQLAlchemy models, typed validation, lifecycle hooks, and engine extension support.
 License-Expression: Apache-2.0
 License-File: LICENSE
@@ -63,7 +63,7 @@ A high-leverage ASGI meta-framework that turns plain SQLAlchemy models into a fu
 
 - **Tenant** 🏢 – a namespace used to group related resources.
 - **Principal** 👤 – an owner of resources, such as an individual user or an organization.
-- **Resource** 📦 – a logical collection of data or functionality exposed by the API.
+- **Resource** 📦 – a logical collection of data or functionality exposed by the router.
 - **Engine** ⚙️ – the database connection and transaction manager backing a resource.
 - **Model / Table** 🧱 – the ORM or database representation of a resource's records.
 - **Column** 📏 – a field on a model that maps to a table column.
@@ -310,7 +310,7 @@ increasing order of precedence:
 
 1. defaults
 2. app config
-3. API config
+3. router config
 4. table config
 5. column config
 6. operation spec
@@ -318,7 +318,7 @@ increasing order of precedence:
 
 Later entries override earlier ones, so request overrides win over all other
 sources. This can be summarized as
-`overrides > opspec > colspecs > tabspec > apispec > appspec > defaults`.
+`overrides > opspec > colspecs > tabspec > routerspec > appspec > defaults`.
 
 ### Schema Config Precedence 🧬
 
@@ -327,7 +327,7 @@ Later layers override earlier ones, with the precedence order:
 
 1. defaults (lowest)
 2. app configuration
-3. API configuration
+3. router configuration
 4. table configuration
 5. column-level `cfg` values
 6. op-specific `cfg`
@@ -367,7 +367,7 @@ This hierarchy ensures that the most specific settings always win. 🥇
 When assembling values for persistence, defaults are resolved in this order:
 
 1. Client-supplied value
-2. API `default_factory`
+2. router `default_factory`
 3. ORM default
 4. Database `server_default`
 5. HTTP 422 if the field is required and still missing
@@ -408,15 +408,15 @@ approved usage. These are not optional—adhering to them keeps the runtime
 predictable, preserves hook lifecycle guarantees, and ensures schema
 consistency across REST and RPC surfaces.
 
-### 1) Never import SQLAlchemy directly or bypass Tigrbl APIs
+### 1) Never import SQLAlchemy directly or bypass Tigrbl routers
 
 **Why:** Direct imports bypass Tigrbl's compatibility layer and make it
 harder to evolve internal dependencies. Use the Tigrbl exports so your
-code stays aligned with the framework’s versioned ASGI API.
+code stays aligned with the framework’s versioned ASGI router.
 
 ✅ **Preferred:**
 ```python
-from tigrbl import Base, TigrblApp, TigrblApi
+from tigrbl import Base, TigrblApp, TigrblRouter
 from tigrbl.types import Integer, String, Mapped
 from tigrbl.types import Depends, HTTPException, Request
 ```
@@ -452,7 +452,7 @@ item_id = UUID(str(payload["id"]))
 ### 3) Use engine specs for persistence, not ad-hoc engines
 
 **Why:** Engine specs make persistence declarative, testable, and
-compatible with engine resolution across app, API, table, and op scopes.
+compatible with engine resolution across app, router, table, and op scopes.
 
 ✅ **Preferred:**
 ```python
@@ -588,9 +588,9 @@ async def rotate_keys(payload, *, ctx):
 
 🚫 **Avoid:**
 ```python
-from some_framework import APIRouter
+from some_framework import routerRouter
 
-router = APIRouter()
+router = routerRouter()
 
 @router.post("/keys/rotate")
 async def rotate_keys(payload):
@@ -664,8 +664,8 @@ When engine contexts are declared at multiple scopes, Tigrbl resolves them
 with strict precedence:
 
 1. **Op level** – bindings attached directly to an operation take highest priority.
-2. **Table/Model level** – definitions on a model or table override API and app defaults.
-3. **API level** – bindings on the API class apply when no model-specific context exists.
+2. **Table/Model level** – definitions on a model or table override router and app defaults.
+3. **router level** – bindings on the router class apply when no model-specific context exists.
 4. **App level** – the default engine supplied to the application is used last.
 
 This ordering ensures that the most specific engine context always wins.
@@ -679,7 +679,7 @@ from tigrbl.engine.shortcuts import prov, engine
 app = SimpleNamespace(db=prov(kind="sqlite", mode="memory"))
 alt = SimpleNamespace(db=engine(kind="sqlite", mode="memory"))
 
-class API:
+class router:
     db = {"kind": "sqlite", "memory": True}
 
 class Item:
@@ -708,7 +708,7 @@ class App:
     pass
 
 @engine_ctx(engine(kind="sqlite", mode="memory"))
-class DecoratedAPI:
+class Decoratedrouter:
     pass
 
 @engine_ctx(kind="sqlite", mode="memory")
@@ -735,7 +735,7 @@ The bridge examples cover two integration styles:
   * A Swarmauri `Factory` invocation during `PRE_HANDLER` via `hook_ctx`.
   * Tigrbl default verbs (`create`, `get`, `list`, `update`, `delete`) plus a custom op.
   * `engine_ctx` at model and operation scope.
-  * Generated OpenAPI and OpenRPC documents mounted from the same model bindings.
+  * Generated Openrouter and OpenRPC documents mounted from the same model bindings.
 
 * **Smoother direct-model flow** (`swarmauri_tigrbl_bridge_smooth.py`)
   * Uses hooks + default `create` persistence to normalize Swarmauri payloads.

{tigrbl-0.3.16.dev4 → tigrbl-0.3.16.dev5}/README.md

@@ -30,7 +30,7 @@ A high-leverage ASGI meta-framework that turns plain SQLAlchemy models into a fu
 
 - **Tenant** 🏢 – a namespace used to group related resources.
 - **Principal** 👤 – an owner of resources, such as an individual user or an organization.
-- **Resource** 📦 – a logical collection of data or functionality exposed by the API.
+- **Resource** 📦 – a logical collection of data or functionality exposed by the router.
 - **Engine** ⚙️ – the database connection and transaction manager backing a resource.
 - **Model / Table** 🧱 – the ORM or database representation of a resource's records.
 - **Column** 📏 – a field on a model that maps to a table column.
@@ -277,7 +277,7 @@ increasing order of precedence:
 
 1. defaults
 2. app config
-3. API config
+3. router config
 4. table config
 5. column config
 6. operation spec
@@ -285,7 +285,7 @@ increasing order of precedence:
 
 Later entries override earlier ones, so request overrides win over all other
 sources. This can be summarized as
-`overrides > opspec > colspecs > tabspec > apispec > appspec > defaults`.
+`overrides > opspec > colspecs > tabspec > routerspec > appspec > defaults`.
 
 ### Schema Config Precedence 🧬
 
@@ -294,7 +294,7 @@ Later layers override earlier ones, with the precedence order:
 
 1. defaults (lowest)
 2. app configuration
-3. API configuration
+3. router configuration
 4. table configuration
 5. column-level `cfg` values
 6. op-specific `cfg`
@@ -334,7 +334,7 @@ This hierarchy ensures that the most specific settings always win. 🥇
 When assembling values for persistence, defaults are resolved in this order:
 
 1. Client-supplied value
-2. API `default_factory`
+2. router `default_factory`
 3. ORM default
 4. Database `server_default`
 5. HTTP 422 if the field is required and still missing
@@ -375,15 +375,15 @@ approved usage. These are not optional—adhering to them keeps the runtime
 predictable, preserves hook lifecycle guarantees, and ensures schema
 consistency across REST and RPC surfaces.
 
-### 1) Never import SQLAlchemy directly or bypass Tigrbl APIs
+### 1) Never import SQLAlchemy directly or bypass Tigrbl routers
 
 **Why:** Direct imports bypass Tigrbl's compatibility layer and make it
 harder to evolve internal dependencies. Use the Tigrbl exports so your
-code stays aligned with the framework’s versioned ASGI API.
+code stays aligned with the framework’s versioned ASGI router.
 
 ✅ **Preferred:**
 ```python
-from tigrbl import Base, TigrblApp, TigrblApi
+from tigrbl import Base, TigrblApp, TigrblRouter
 from tigrbl.types import Integer, String, Mapped
 from tigrbl.types import Depends, HTTPException, Request
 ```
@@ -419,7 +419,7 @@ item_id = UUID(str(payload["id"]))
 ### 3) Use engine specs for persistence, not ad-hoc engines
 
 **Why:** Engine specs make persistence declarative, testable, and
-compatible with engine resolution across app, API, table, and op scopes.
+compatible with engine resolution across app, router, table, and op scopes.
 
 ✅ **Preferred:**
 ```python
@@ -555,9 +555,9 @@ async def rotate_keys(payload, *, ctx):
 
 🚫 **Avoid:**
 ```python
-from some_framework import APIRouter
+from some_framework import routerRouter
 
-router = APIRouter()
+router = routerRouter()
 
 @router.post("/keys/rotate")
 async def rotate_keys(payload):
@@ -631,8 +631,8 @@ When engine contexts are declared at multiple scopes, Tigrbl resolves them
 with strict precedence:
 
 1. **Op level** – bindings attached directly to an operation take highest priority.
-2. **Table/Model level** – definitions on a model or table override API and app defaults.
-3. **API level** – bindings on the API class apply when no model-specific context exists.
+2. **Table/Model level** – definitions on a model or table override router and app defaults.
+3. **router level** – bindings on the router class apply when no model-specific context exists.
 4. **App level** – the default engine supplied to the application is used last.
 
 This ordering ensures that the most specific engine context always wins.
@@ -646,7 +646,7 @@ from tigrbl.engine.shortcuts import prov, engine
 app = SimpleNamespace(db=prov(kind="sqlite", mode="memory"))
 alt = SimpleNamespace(db=engine(kind="sqlite", mode="memory"))
 
-class API:
+class router:
     db = {"kind": "sqlite", "memory": True}
 
 class Item:
@@ -675,7 +675,7 @@ class App:
     pass
 
 @engine_ctx(engine(kind="sqlite", mode="memory"))
-class DecoratedAPI:
+class Decoratedrouter:
     pass
 
 @engine_ctx(kind="sqlite", mode="memory")
@@ -702,7 +702,7 @@ The bridge examples cover two integration styles:
   * A Swarmauri `Factory` invocation during `PRE_HANDLER` via `hook_ctx`.
   * Tigrbl default verbs (`create`, `get`, `list`, `update`, `delete`) plus a custom op.
   * `engine_ctx` at model and operation scope.
-  * Generated OpenAPI and OpenRPC documents mounted from the same model bindings.
+  * Generated Openrouter and OpenRPC documents mounted from the same model bindings.
 
 * **Smoother direct-model flow** (`swarmauri_tigrbl_bridge_smooth.py`)
   * Uses hooks + default `create` persistence to normalize Swarmauri payloads.

{tigrbl-0.3.16.dev4 → tigrbl-0.3.16.dev5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "tigrbl"
-version = "0.3.16.dev4"
+version = "0.3.16.dev5"
 description = "A modern pure ASGI/WSGI Python framework for building schema-first REST and JSON-RPC APIs with SQLAlchemy models, typed validation, lifecycle hooks, and engine extension support."
 license = "Apache-2.0"
 readme = "README.md"

{tigrbl-0.3.16.dev4 → tigrbl-0.3.16.dev5}/tigrbl/README.md

@@ -86,7 +86,7 @@ Some objects also expose optional helpers:
 | Column | `column_spec.py` | `_column.py` | — | `shortcuts.py` | `collect.py` | — | — |
 | Engine | `engine_spec.py` | `_engine.py` | `decorators.py` | `shortcuts.py` | `collect.py` | `resolver.py` | `builders.py` |
 | Op | `types.py` | `_op.py` | `decorators.py` | — | `collect.py` | — | — |
-| API | `api_spec.py` | `_api.py` | — | `shortcuts.py` | — | — | — |
+| Router | `router_spec.py` | `_router.py` | — | `shortcuts.py` | — | — | — |
 | App | `app_spec.py` | `_app.py` | — | `shortcuts.py` | — | — | — |
 | Table | `table_spec.py` | `_table.py` | — | `shortcuts.py` | — | — | — |
 

{tigrbl-0.3.16.dev4 → tigrbl-0.3.16.dev5}/tigrbl/__init__.py

@@ -5,20 +5,6 @@ Tigrbl – public API
 OpSpec-centric building blocks to bind models, wire schemas/handlers/hooks,
 register RPC & REST, and (optionally) mount JSON-RPC and diagnostics.
 
-Quick start:
-    from tigrbl import include_model, build_jsonrpc_router, mount_diagnostics
-    from tigrbl import OpSpec, hook_ctx, op_ctx, alias_ctx, schema_ctx, SchemaRef
-
-    include_model(api, User, app=asgi_app)
-    app.include_router(build_jsonrpc_router(api), prefix="/rpc")
-    app.include_router(mount_diagnostics(api), prefix="/system")
-
-    # Example: custom op using an existing schema
-    @op_ctx(alias="search", target="custom", arity="collection",
-            request_schema=SchemaRef("Search", "in"),
-            response_schema=SchemaRef("Search", "out"))
-    def search(cls, ctx):
-        ...
 """
 
 from __future__ import annotations
@@ -46,7 +32,7 @@ from .schema.decorators import schema_ctx
 from .responses.decorators import response_ctx
 from .responses.types import ResponseSpec
 
-# ── Bindings (model + API orchestration) ───────────────────────────────────────
+# ── Bindings (model + Router orchestration) ───────────────────────────────────────
 from .bindings import (
     bind,
     rebind,
@@ -55,8 +41,8 @@ from .bindings import (
     build_handlers,
     register_rpc,
     build_rest,
-    include_model,
-    include_models,
+    include_table,
+    include_tables,
     rpc_call,
 )
 
@@ -76,19 +62,19 @@ from .ddl import ensure_schemas, register_sqlite_attach, bootstrap_dbschema
 # ── Config constants (defaults used by REST) ───────────────────────────────────
 from .config.constants import DEFAULT_HTTP_METHODS
 from .app.tigrbl_app import TigrblApp
-from .api import Api, TigrblApi
+from .router import Router, TigrblRouter, route_ctx
+
 
 from .table import Base
 from .op import Op
 from .security import APIKey, HTTPBearer, MutualTLS, OAuth2, OpenIdConnect
 
-
 __all__: list[str] = []
 
 __all__ += [
     "TigrblApp",
-    "TigrblApi",
-    "Api",
+    "TigrblRouter",
+    "Router",
     "Base",
     "Op",
     "HTTPBearer",
@@ -114,6 +100,7 @@ __all__ += [
     # Ctx-only decorators
     "alias_ctx",
     "op_ctx",
+    "route_ctx",
     "hook_ctx",
     "schema_ctx",
     "response_ctx",
@@ -129,8 +116,8 @@ __all__ += [
     "build_handlers",
     "register_rpc",
     "build_rest",
-    "include_model",
-    "include_models",
+    "include_table",
+    "include_tables",
     "rpc_call",
     # Runtime
     "_invoke",

{tigrbl-0.3.16.dev4 → tigrbl-0.3.16.dev5}/tigrbl/app/_app.py

@@ -1,23 +1,25 @@
-# tigrbl/tigrbl/v3/app/_app.py
+# tigrbl/tigrbl/app/_app.py
 from __future__ import annotations
 from typing import Any
 
-from ..api._api import APIRouter
+from ..router._routing import include_router
+from ..router._router import Router
 from ..engine.engine_spec import EngineCfg
 from ..engine import resolver as _resolver
 from ..engine import install_from_objects
 from ..ddl import initialize as _ddl_initialize
-from ._model_registry import initialize_model_registry
+from ._model_registry import initialize_table_registry
 from .app_spec import AppSpec
 
 
-class App(AppSpec, APIRouter):
+class App(AppSpec):
     TITLE = "Tigrbl"
+    DESCRIPTION = None
     VERSION = "0.1.0"
     LIFESPAN = None
-    APIS = ()
+    ROUTERS = ()
     OPS = ()
-    MODELS = ()
+    TABLES = ()
     SCHEMAS = ()
     HOOKS = ()
     SECURITY_DEPS = ()
@@ -33,6 +35,9 @@ class App(AppSpec, APIRouter):
         title = asgi_kwargs.pop("title", None)
         if title is not None:
             self.TITLE = title
+        description = asgi_kwargs.pop("description", None)
+        if description is not None:
+            self.DESCRIPTION = description
         version = asgi_kwargs.pop("version", None)
         if version is not None:
             self.VERSION = version
@@ -43,13 +48,15 @@ class App(AppSpec, APIRouter):
         if get_db is not None:
             self.get_db = get_db
         self.title = self.TITLE
+        self.description = getattr(self, "DESCRIPTION", None)
         self.version = self.VERSION
         self.engine = engine if engine is not None else getattr(self, "ENGINE", None)
-        self.apis = tuple(getattr(self, "APIS", ()))
+        self.routers = tuple(getattr(self, "ROUTERS", ()))
         self.ops = tuple(getattr(self, "OPS", ()))
         # Runtime registries use mutable containers (dict/namespace), but the
         # dataclass fields expect sequences. Storing a dict here satisfies both.
-        self.models = initialize_model_registry(getattr(self, "MODELS", ()))
+        self.tables = initialize_table_registry(getattr(self, "TABLES", ()))
+        self.models = self.tables
         self.schemas = tuple(getattr(self, "SCHEMAS", ()))
         self.hooks = tuple(getattr(self, "HOOKS", ()))
         self.security_deps = tuple(getattr(self, "SECURITY_DEPS", ()))
@@ -59,34 +66,47 @@ class App(AppSpec, APIRouter):
         self.system_prefix = getattr(self, "SYSTEM_PREFIX", "/system")
         self.lifespan = self.LIFESPAN
 
-        APIRouter.__init__(
-            self,
+        self.router = Router(
             title=self.title,
             version=self.version,
+            description=self.description,
             include_docs=True,
             **asgi_kwargs,
         )
+        self.openapi_url = self.router.openapi_url
+        self.docs_url = self.router.docs_url
+        self.swagger_ui_version = self.router.swagger_ui_version
         _engine_ctx = self.engine
         if _engine_ctx is not None:
             _resolver.set_default(_engine_ctx)
             _resolver.resolve_provider()
 
+    def include_router(self, other: Any, **kwargs: Any) -> None:
+        return include_router(self.router, other, **kwargs)
+
+    def add_route(self, path: str, endpoint: Any, **kwargs: Any) -> None:
+        self.router.add_route(path, endpoint, **kwargs)
+
+    def route(self, path: str, *, methods: Any, **kwargs: Any):
+        return self.router.route(path, methods=methods, **kwargs)
+
     def install_engines(
-        self, *, api: Any = None, models: tuple[Any, ...] | None = None
+        self, *, router: Any = None, tables: tuple[Any, ...] | None = None
     ) -> None:
-        # If class declared APIS/MODELS, use them unless explicit args are passed.
-        apis = (api,) if api is not None else self.APIS
-        models = models if models is not None else self.MODELS
-        if apis:
-            for a in apis:
-                install_from_objects(app=self, api=a, models=models)
+        # If class declared ROUTERS/TABLES, use them unless explicit args are passed.
+        routers = (router,) if router is not None else self.ROUTERS
+        tables = tables if tables is not None else self.TABLES
+        app_target = self.__class__
+        if routers:
+            for entry in routers:
+                install_from_objects(app=app_target, router=entry, tables=tables)
         else:
-            install_from_objects(app=self, api=None, models=models)
+            install_from_objects(app=app_target, router=None, tables=tables)
 
     def _collect_tables(self) -> list[Any]:
         seen = set()
         tables = []
-        for model in self.models.values():
+        for model in self.router.models.values():
             if not hasattr(model, "__table__"):
                 try:  # pragma: no cover - defensive remap
                     from ..table import Base
@@ -104,16 +124,10 @@ class App(AppSpec, APIRouter):
                 tables.append(table)
         return tables
 
-    def _wsgi_app(self, environ: dict[str, Any], start_response: Any) -> list[bytes]:
-        return super()._wsgi_app(environ, start_response)
-
-    async def _asgi_app(self, scope: dict[str, Any], receive: Any, send: Any) -> None:
-        await super()._asgi_app(scope, receive, send)
-
     async def _dispatch(self, req: Any):
-        return await super()._dispatch(req)
+        return await self.router._dispatch(req)
 
     async def _call_handler(self, route: Any, req: Any):
-        return await super()._call_handler(route, req)
+        return await self.router._call_handler(route, req)
 
     initialize = _ddl_initialize

{tigrbl-0.3.16.dev4 → tigrbl-0.3.16.dev5}/tigrbl/app/_model_registry.py

@@ -1,14 +1,28 @@
-"""Utilities for initializing model registries on App and API facades."""
+"""Utilities for initializing model registries on App and Router facades."""
 
 from __future__ import annotations
 
+import warnings
 from typing import Any, Iterable
 
 
-def initialize_model_registry(models: Iterable[Any]) -> dict[str, Any]:
-    """Build the default ``models`` mapping for an App or Api instance.
+class RegistryDict(dict[str, Any]):
+    """Dict with attribute-style access used by registry containers."""
+
+    def __getattr__(self, name: str) -> Any:
+        try:
+            return self[name]
+        except KeyError as exc:
+            raise AttributeError(name) from exc
+
+    def __setattr__(self, name: str, value: Any) -> None:
+        self[name] = value
+
+
+def initialize_table_registry(tables: Iterable[Any]) -> dict[str, Any]:
+    """Build the default ``tables`` mapping for an App or Router instance.
 
-    ``defineAppSpec``/``defineApiSpec`` allow authors to declare default models
+    ``defineAppSpec``/``defineRouterSpec`` allow authors to declare default models
     using bare model classes or ``("alias", Model)`` tuples.  Runtime facades,
     however, expect ``self.models`` to be a dictionary keyed by model name so
     that lookups like ``app.models["Widget"]`` Just Work.
@@ -18,9 +32,9 @@ def initialize_model_registry(models: Iterable[Any]) -> dict[str, Any]:
     alias and the model's ``__name__`` so either lookup style succeeds.
     """
 
-    registry: dict[str, Any] = {}
+    registry: RegistryDict = RegistryDict()
 
-    for entry in models or ():
+    for entry in tables or ():
         # Support ``("Alias", Model)`` declarations in addition to bare models.
         if isinstance(entry, tuple) and len(entry) == 2 and isinstance(entry[0], str):
             alias, model = entry
@@ -38,4 +52,16 @@ def initialize_model_registry(models: Iterable[Any]) -> dict[str, Any]:
     return registry
 
 
-__all__ = ["initialize_model_registry"]
+def initialize_model_registry(models: Iterable[Any]) -> dict[str, Any]:
+    """Deprecated alias for :func:`initialize_table_registry`."""
+
+    warnings.warn(
+        "initialize_model_registry() is deprecated and will be removed in a "
+        "future release; use initialize_table_registry() instead.",
+        DeprecationWarning,
+        stacklevel=2,
+    )
+    return initialize_table_registry(models)
+
+
+__all__ = ["initialize_table_registry", "initialize_model_registry"]

{tigrbl-0.3.16.dev4 → tigrbl-0.3.16.dev5}/tigrbl/app/app_spec.py

@@ -14,15 +14,17 @@ class AppSpec:
     """
 
     title: str = "Tigrbl"
+    description: str | None = None
     version: str = "0.1.0"
     engine: Optional[EngineCfg] = None
 
-    # NEW: multi-API composition (store API classes or instances)
-    apis: Sequence[Any] = field(default_factory=tuple)
+    # NEW: multi-Router composition (store Router classes or instances)
+    routers: Sequence[Any] = field(default_factory=tuple)
 
     # NEW: orchestration/topology knobs
     ops: Sequence[Any] = field(default_factory=tuple)  # op descriptors or specs
     models: Sequence[Any] = field(default_factory=tuple)  # ORM classes
+    tables: Sequence[Any] = field(default_factory=tuple)  # table refs owned by app
     schemas: Sequence[Any] = field(default_factory=tuple)  # schema classes/defs
     hooks: Sequence[Callable[..., Any]] = field(default_factory=tuple)
 

{tigrbl-0.3.16.dev4 → tigrbl-0.3.16.dev5}/tigrbl/app/mro_collect.py

@@ -77,19 +77,19 @@ def mro_collect_app_spec(app: type) -> AppSpec:
     if lifespan is sentinel:
         lifespan = None
 
-    include_inherited_apis = "APIS" not in app.__dict__
+    include_inherited_routers = "ROUTERS" not in app.__dict__
     spec = AppSpec(
         title=title,
         version=version,
         engine=engine,
-        apis=_merge_seq_attr(
+        routers=_merge_seq_attr(
             app,
-            "APIS",
-            include_inherited=include_inherited_apis,
-            reverse=include_inherited_apis,
+            "ROUTERS",
+            include_inherited=include_inherited_routers,
+            reverse=include_inherited_routers,
         ),
         ops=_merge_seq_attr(app, "OPS"),
-        models=_merge_seq_attr(app, "MODELS"),
+        models=_merge_seq_attr(app, "TABLES"),
         schemas=_merge_seq_attr(app, "SCHEMAS"),
         hooks=_merge_seq_attr(app, "HOOKS"),
         security_deps=_merge_seq_attr(app, "SECURITY_DEPS"),

{tigrbl-0.3.16.dev4 → tigrbl-0.3.16.dev5}/tigrbl/app/shortcuts.py

@@ -13,7 +13,7 @@ def defineAppSpec(
     version: str = "0.1.0",
     engine: Any = None,
     # composition
-    apis: Sequence[Any] = (),
+    routers: Sequence[Any] = (),
     ops: Sequence[Any] = (),
     models: Sequence[Any] = (),
     schemas: Sequence[Any] = (),
@@ -41,9 +41,9 @@ def defineAppSpec(
         TITLE=title,
         VERSION=version,
         ENGINE=engine,
-        APIS=tuple(apis or ()),
+        ROUTERS=tuple(routers or ()),
         OPS=tuple(ops or ()),
-        MODELS=tuple(models or ()),
+        TABLES=tuple(models or ()),
         SCHEMAS=tuple(schemas or ()),
         HOOKS=tuple(hooks or ()),
         SECURITY_DEPS=tuple(security_deps or ()),