tigrbl_kms 0.3.2.dev7__tar.gz → 0.3.2.dev8__tar.gz

{tigrbl_kms-0.3.2.dev7 → tigrbl_kms-0.3.2.dev8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tigrbl_kms
-Version: 0.3.2.dev7
+Version: 0.3.2.dev8
 Summary: A Tigrbl key management service for Swarmauri.
 License-Expression: Apache-2.0
 License-File: LICENSE

{tigrbl_kms-0.3.2.dev7 → tigrbl_kms-0.3.2.dev8}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "tigrbl_kms"
-version = "0.3.2.dev7"
+version = "0.3.2.dev8"
 description = "A Tigrbl key management service for Swarmauri."
 license = "Apache-2.0"
 readme = "README.md"

{tigrbl_kms-0.3.2.dev7 → tigrbl_kms-0.3.2.dev8}/tigrbl_kms/app.py

@@ -41,6 +41,11 @@ app = TigrblApp(
 # Custom ops return raw dicts so no finalize hook needed
 app.include_tables([Key, KeyVersion], base_prefix="/kms")
 app.attach_diagnostics(prefix="/system")
+
+# Keep package-level contract focused on domain models only.
+for _system_model in ("__tigrbl_system_docs__", "__tigrbl_system_routes__"):
+    app.tables.pop(_system_model, None)
+
 # Backward-compatible alias used by tests and older integrations.
 app.routes = app.router.routes
 

{tigrbl_kms-0.3.2.dev7 → tigrbl_kms-0.3.2.dev8}/tigrbl_kms/orm/key.py

@@ -1,6 +1,7 @@
 # tigrbl_kms/orm/key.py
 from __future__ import annotations
 import base64
+import inspect
 from enum import Enum
 from uuid import UUID, uuid4
 from typing import List, Optional, TYPE_CHECKING
@@ -11,10 +12,10 @@ from tigrbl.orm.mixins import BulkCapable, Replaceable
 
 from tigrbl.orm.tables import Base
 from tigrbl.specs import acol, vcol, S, F, IO
-from tigrbl.hook import hook_ctx
-from tigrbl.op import op_ctx
+from tigrbl.decorators.hook import hook_ctx
+from tigrbl.decorators import op_ctx
 from tigrbl.runtime.status.exceptions import HTTPException
-from tigrbl.responses import Response
+from tigrbl import Response
 
 if TYPE_CHECKING:
     from .key_version import KeyVersion
@@ -253,7 +254,22 @@ class Key(Base, BulkCapable, Replaceable):
     )
     async def _ensure_key_enabled(cls, ctx):
         pp = ctx.get("path_params") or {}
-        ident = pp.get("id") or pp.get("item_id")
+        temp = ctx.get("temp") or {}
+        route = temp.get("route") if isinstance(temp, dict) else {}
+        route_pp = route.get("path_params") if isinstance(route, dict) else {}
+        if not isinstance(route_pp, dict):
+            route_pp = {}
+
+        # Runtime route metadata may stage member identifiers in temp.route.
+        # Support both current and legacy parameter names.
+        ident = (
+            pp.get("id")
+            or pp.get("item_id")
+            or pp.get("key_id")
+            or route_pp.get("id")
+            or route_pp.get("item_id")
+            or route_pp.get("key_id")
+        )
         if not ident:
             raise HTTPException(status_code=400, detail="Missing key identifier")
         try:
@@ -263,16 +279,26 @@ class Key(Base, BulkCapable, Replaceable):
 
         db = ctx.get("db")
         if db is None:
-            raise HTTPException(status_code=500, detail="DB session missing")
-        # works with sync or async session
+            try:
+                db, _release_db = cls.acquire(op_alias="read")
+                # Keep acquired session available for downstream ops in this request.
+                ctx["db"] = db
+                temp = ctx.get("temp")
+                if not isinstance(temp, dict):
+                    temp = {}
+                    ctx["temp"] = temp
+                temp.setdefault("__sys_db_release__", _release_db)
+            except Exception as exc:
+                raise HTTPException(
+                    status_code=500, detail="DB session missing"
+                ) from exc
+
         getter = getattr(db, "get", None)
-        obj = (
-            await getter(cls, ident)
-            if callable(getter)
-            and getattr(getter, "__code__", None)
-            and getter.__code__.co_flags & 0x80
-            else db.get(cls, ident)
-        )
+        if not callable(getter):
+            raise HTTPException(status_code=500, detail="DB session missing get()")
+        obj = getter(cls, ident)
+        if inspect.isawaitable(obj):
+            obj = await obj
         if obj is None:
             raise HTTPException(status_code=404, detail="Key not found")
         if obj.status == KeyStatus.disabled:

{tigrbl_kms-0.3.2.dev7 → tigrbl_kms-0.3.2.dev8}/tigrbl_kms/orm/key_version.py

@@ -4,11 +4,9 @@ from uuid import UUID, uuid4
 
 from tigrbl.runtime.status.exceptions import HTTPException
 
-from tigrbl.hook import hook_ctx
-from tigrbl.specs import IO, F, S, acol
+from tigrbl.decorators.hook import hook_ctx
+from tigrbl.specs import IO, F, S, Pair, ForeignKeySpec, acol
 from tigrbl.orm.mixins import BulkCapable, Replaceable
-from tigrbl.column.io_spec import Pair
-from tigrbl.column.storage_spec import ForeignKeySpec
 from tigrbl.orm.tables import Base
 from tigrbl.types import (
     Integer,
@@ -98,6 +96,35 @@ class KeyVersion(Base, BulkCapable, Replaceable):
 
     key = relationship("Key", back_populates="versions", lazy="joined")
 
+    @hook_ctx(ops=("create", "bulk_create"), phase="PRE_HANDLER")
+    async def _coerce_key_id_uuid(cls, ctx):
+        payload = ctx.get("payload")
+        if payload is None:
+            return
+
+        def _coerce_item(item):
+            if not isinstance(item, dict):
+                return
+            key_id = item.get("key_id")
+            if key_id is None or isinstance(key_id, UUID):
+                return
+            try:
+                item["key_id"] = UUID(str(key_id))
+            except Exception as exc:
+                raise HTTPException(status_code=400, detail="Invalid key_id") from exc
+
+        if isinstance(payload, list):
+            for item in payload:
+                _coerce_item(item)
+            return
+
+        if isinstance(payload, dict):
+            _coerce_item(payload)
+            items = payload.get("items")
+            if isinstance(items, list):
+                for item in items:
+                    _coerce_item(item)
+
     @hook_ctx(ops="create", phase="POST_HANDLER")
     async def _generate_material(cls, ctx):
         obj = ctx.get("result")

{tigrbl_kms-0.3.2.dev7 → tigrbl_kms-0.3.2.dev8}/tigrbl_kms/utils.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import base64
 from typing import Any, Mapping, Optional
 
-from tigrbl.requests import Request
+from tigrbl import Request
 
 from swarmauri_core.crypto.types import ExportPolicy, KeyType, KeyUse