etlantic-sqlmodel 0.55.0__tar.gz → 0.56.0__tar.gz

{etlantic_sqlmodel-0.55.0 → etlantic_sqlmodel-0.56.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: etlantic-sqlmodel
-Version: 0.55.0
+Version: 0.56.0
 Summary: ContractModel ↔ SQLModel bridge for ETLantic.
 Project-URL: Homepage, https://github.com/eddiethedean/etlantic
 Project-URL: Documentation, https://github.com/eddiethedean/etlantic/tree/main/docs
@@ -18,7 +18,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Typing :: Typed
 Requires-Python: >=3.11
-Requires-Dist: etlantic<0.56,>=0.55.0
+Requires-Dist: etlantic<0.57,>=0.56.0
 Requires-Dist: sqlmodel<1,>=0.0.22
 Description-Content-Type: text/markdown
 
@@ -28,13 +28,13 @@ Optional bridge between ETLantic `Data` contracts and
 [SQLModel](https://sqlmodel.tiangolo.com/) table models, plus optional CP1
 control-plane reference stores. Install when you need `contract_to_sqlmodel`
 helpers or SQLModel-backed definition/submission stores for local CP1 demos.
-Package version is **0.55.0** — pin with core.
+Package version is **0.56.0** — pin with core.
 
 ## Install
 
 ```bash
-pip install 'etlantic-sqlmodel==0.55.0'
-# pip install 'etlantic==0.55.0'
+pip install 'etlantic-sqlmodel==0.56.0'
+# pip install 'etlantic==0.56.0'
 ```
 
 ## Schema bridge
@@ -96,6 +96,6 @@ for isolation queries. Use separate engines/schemas per tenant for
 
 ## Links
 
-[Optional packages](https://etlantic.readthedocs.io/en/v0.55.0/10_REFERENCE/OPTIONAL_PACKAGES/) ·
+[Optional packages](https://etlantic.readthedocs.io/en/v0.56.0/10_REFERENCE/OPTIONAL_PACKAGES/) ·
 [Source](https://github.com/eddiethedean/etlantic/tree/main/packages/etlantic-sqlmodel) ·
 [Issues](https://github.com/eddiethedean/etlantic/issues)

{etlantic_sqlmodel-0.55.0 → etlantic_sqlmodel-0.56.0}/README.md

@@ -4,13 +4,13 @@ Optional bridge between ETLantic `Data` contracts and
 [SQLModel](https://sqlmodel.tiangolo.com/) table models, plus optional CP1
 control-plane reference stores. Install when you need `contract_to_sqlmodel`
 helpers or SQLModel-backed definition/submission stores for local CP1 demos.
-Package version is **0.55.0** — pin with core.
+Package version is **0.56.0** — pin with core.
 
 ## Install
 
 ```bash
-pip install 'etlantic-sqlmodel==0.55.0'
-# pip install 'etlantic==0.55.0'
+pip install 'etlantic-sqlmodel==0.56.0'
+# pip install 'etlantic==0.56.0'
 ```
 
 ## Schema bridge
@@ -72,6 +72,6 @@ for isolation queries. Use separate engines/schemas per tenant for
 
 ## Links
 
-[Optional packages](https://etlantic.readthedocs.io/en/v0.55.0/10_REFERENCE/OPTIONAL_PACKAGES/) ·
+[Optional packages](https://etlantic.readthedocs.io/en/v0.56.0/10_REFERENCE/OPTIONAL_PACKAGES/) ·
 [Source](https://github.com/eddiethedean/etlantic/tree/main/packages/etlantic-sqlmodel) ·
 [Issues](https://github.com/eddiethedean/etlantic/issues)

{etlantic_sqlmodel-0.55.0 → etlantic_sqlmodel-0.56.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "etlantic-sqlmodel"
-version = "0.55.0"
+version = "0.56.0"
 description = "ContractModel ↔ SQLModel bridge for ETLantic."
 readme = "README.md"
 license = "MIT"
@@ -17,7 +17,7 @@ classifiers = [
     "Typing :: Typed",
 ]
 dependencies = [
-    "etlantic>=0.55.0,<0.56",
+    "etlantic>=0.56.0,<0.57",
     "sqlmodel>=0.0.22,<1",
 ]
 

{etlantic_sqlmodel-0.55.0 → etlantic_sqlmodel-0.56.0}/src/etlantic_sqlmodel/__init__.py

@@ -52,7 +52,7 @@ from etlantic_sqlmodel.migrations import (
 )
 from sqlmodel import Field, SQLModel
 
-__version__ = "0.55.0"
+__version__ = "0.56.0"
 
 __all__ = [
     "AliasRow",

{etlantic_sqlmodel-0.55.0 → etlantic_sqlmodel-0.56.0}/src/etlantic_sqlmodel/control_plane/__init__.py

@@ -25,6 +25,9 @@ from etlantic_sqlmodel.control_plane.durable_stores import (
     SQLModelDurableWorkStore,
     create_durable_tables,
 )
+from etlantic_sqlmodel.control_plane.input_resource_stores import (
+    SqlModelInputResourceStore,
+)
 from etlantic_sqlmodel.control_plane.models import (
     AliasRow,
     Cp4GovernanceSnapshotRow,
@@ -37,6 +40,7 @@ from etlantic_sqlmodel.control_plane.models import (
     LogicalIdentityRow,
     PromotionRow,
     RevisionRow,
+    RunReportRow,
     ScheduleSnapshotRow,
     SecurityDomainRow,
     SubmissionRow,
@@ -61,6 +65,11 @@ from etlantic_sqlmodel.control_plane.registry_stores import (
     SqlModelWorkspaceDirectory,
     create_registry_tables,
 )
+from etlantic_sqlmodel.control_plane.report_stores import (
+    SqlModelRunReportStore,
+    SqlModelRunReportStoreProvider,
+    create_run_report_tables,
+)
 from etlantic_sqlmodel.control_plane.schedule_stores import (
     SCHEDULE_TABLES,
     SQLModelScheduleStore,
@@ -97,6 +106,7 @@ __all__ = [
     "LogicalIdentityRow",
     "PromotionRow",
     "RevisionRow",
+    "RunReportRow",
     "SQLModelApprovalStore",
     "SQLModelAttestationStore",
     "SQLModelAuditEvidenceStore",
@@ -111,8 +121,11 @@ __all__ = [
     "ScheduleSnapshotRow",
     "SecurityDomainRow",
     "SqlModelEventStore",
+    "SqlModelInputResourceStore",
     "SqlModelRegistryProvider",
     "SqlModelRevisionRegistry",
+    "SqlModelRunReportStore",
+    "SqlModelRunReportStoreProvider",
     "SqlModelTenantDirectory",
     "SqlModelWorkspaceDirectory",
     "SubmissionRow",
@@ -124,6 +137,7 @@ __all__ = [
     "create_cp4_tables",
     "create_durable_tables",
     "create_registry_tables",
+    "create_run_report_tables",
     "create_schedule_tables",
     "create_sqlite_engine",
     "dump_registry_sqlite",

{etlantic_sqlmodel-0.55.0 → etlantic_sqlmodel-0.56.0}/src/etlantic_sqlmodel/control_plane/cp4_stores.py

@@ -5,9 +5,11 @@ from __future__ import annotations
 import json
 from collections.abc import Callable, Mapping, Sequence
 from datetime import UTC, datetime
-from typing import Any, TypeVar
+from typing import Any, TypeVar, cast
 
+from sqlalchemy import Table, update
 from sqlalchemy.engine import Engine
+from sqlalchemy.exc import IntegrityError
 
 from etlantic.control_plane.approval_memory import MemoryApprovalStore
 from etlantic.control_plane.approval_models import (
@@ -36,7 +38,12 @@ from etlantic.control_plane.objective_models import (
 )
 from etlantic.control_plane.policy_memory import MemoryPolicyProvider
 from etlantic.control_plane.quota_memory import MemoryQuotaProvider
-from etlantic.control_plane.quota_models import QuotaState
+from etlantic.control_plane.quota_models import (
+    QuotaDecision,
+    QuotaEffect,
+    QuotaResource,
+    QuotaState,
+)
 from etlantic_sqlmodel.control_plane.models import Cp4GovernanceSnapshotRow
 from etlantic_sqlmodel.control_plane.session import session_scope
 from sqlmodel import Session, SQLModel, select
@@ -112,6 +119,7 @@ class _SnapshotBackedStore:
 
     def _txn(self, fn: Callable[[Any], T]) -> T:
         with session_scope(self.engine) as session:
+            self._ensure_snapshot_row(session)
             mem, version = self._read(session, for_update=True)
             result = fn(mem)
             self._write(session, mem, expected_version=version)
@@ -137,33 +145,65 @@ class _SnapshotBackedStore:
             row.payload_version or 0
         )
 
-    def _write(self, session: Session, store: Any, *, expected_version: int) -> None:
-        payload = json.dumps(self._dump(store), sort_keys=True, default=str)
-        row = session.exec(
+    def _ensure_snapshot_row(self, session: Session) -> None:
+        """Create a version-zero lock row without racing on first use.
+
+        ``SELECT FOR UPDATE`` cannot lock a row that does not exist. When two
+        processes perform the first governance write at once, both would
+        otherwise observe absence and race to insert the unique
+        ``(store_id, kind)`` row. Insert under a savepoint so the loser can
+        recover from that uniqueness race and continue by locking the winner's
+        committed row.
+        """
+        statement = (
             select(Cp4GovernanceSnapshotRow)
             .where(Cp4GovernanceSnapshotRow.store_id == self.store_id)
             .where(Cp4GovernanceSnapshotRow.kind == self.kind)
-            .with_for_update()
-        ).first()
-        if row is None:
-            if expected_version != 0:
-                raise ControlPlaneError.conflict("CP4 snapshot conflict")
-            session.add(
-                Cp4GovernanceSnapshotRow(
-                    store_id=self.store_id,
-                    kind=self.kind,
-                    payload_json=payload,
-                    payload_version=1,
-                    updated_at=_utcnow_iso(),
+        )
+        if session.exec(statement).first() is not None:
+            return
+
+        try:
+            with session.begin_nested():
+                session.add(
+                    Cp4GovernanceSnapshotRow(
+                        store_id=self.store_id,
+                        kind=self.kind,
+                        payload_json=json.dumps(
+                            self._dump(self._empty()), sort_keys=True, default=str
+                        ),
+                        payload_version=0,
+                        updated_at=_utcnow_iso(),
+                    )
                 )
+                session.flush()
+        except IntegrityError:
+            # The conflict is recoverable only when another transaction created
+            # the exact scoped snapshot row. Other integrity errors still fail
+            # closed.
+            if session.exec(statement).first() is None:
+                raise
+
+    def _write(self, session: Session, store: Any, *, expected_version: int) -> None:
+        payload = json.dumps(self._dump(store), sort_keys=True, default=str)
+        # Compare the version in the UPDATE itself. SQLite ignores FOR UPDATE,
+        # so an ORM read followed by a plain write can overwrite another
+        # transaction's quota claims and release the wrong reservation.
+        # SQLModel adds this table attribute when the model class is mapped.
+        table = cast(Table, Cp4GovernanceSnapshotRow.__table__)  # pyright: ignore[reportUnknownMemberType, reportAttributeAccessIssue]
+        result = session.connection().execute(
+            update(table)
+            .where(table.c.store_id == self.store_id)
+            .where(table.c.kind == self.kind)
+            .where(table.c.payload_version == expected_version)
+            .values(
+                payload_json=payload,
+                payload_version=expected_version + 1,
+                updated_at=_utcnow_iso(),
             )
-            return
-        if int(row.payload_version or 0) != expected_version:
+        )
+        if result.rowcount != 1:
             raise ControlPlaneError.conflict("CP4 snapshot conflict")
-        row.payload_json = payload
-        row.payload_version = expected_version + 1
-        row.updated_at = _utcnow_iso()
-        session.add(row)
 
 
 class SQLModelAuditEvidenceStore(_SnapshotBackedStore):
@@ -321,6 +361,22 @@ class SQLModelQuotaProvider(_SnapshotBackedStore):
             "default_limits": dict(mem.default_limits),
             "weights": {f"{t}|{w}": wt for (t, w), wt in mem.weights.items()},
             "states": {f"{t}|{w}": s.to_dict() for (t, w), s in mem._states.items()},
+            "admissions": {
+                f"{t}|{w}|{key}": {
+                    "resource": resource,
+                    "units": units,
+                    "decision": decision.to_dict(),
+                }
+                for (t, w, key), (resource, units, decision) in mem._admissions.items()
+            },
+            "releases": {
+                f"{t}|{w}|{key}": {"resource": resource, "units": units}
+                for (t, w, key), (resource, units) in mem._releases.items()  # pyright: ignore[reportPrivateUsage]
+            },
+            "claims": {
+                f"{t}|{w}|{key}": sorted(claims)
+                for (t, w, key), claims in mem._claims.items()  # pyright: ignore[reportPrivateUsage]
+            },
             "rr_cursor": int(mem._rr_cursor),
             "shared_pressure": bool(getattr(mem, "shared_pressure", False)),
         }
@@ -348,7 +404,31 @@ class SQLModelQuotaProvider(_SnapshotBackedStore):
                 if raw.get("updated_at")
                 else datetime.now(UTC),
             )
+        for key, raw in dict(payload.get("admissions") or {}).items():
+            t, w, idem = str(key).split("|", 2)
+            decision = raw["decision"]
+            mem._admissions[(t, w, idem)] = (
+                cast(QuotaResource, str(raw["resource"])),
+                int(raw["units"]),
+                QuotaDecision(
+                    effect=cast(QuotaEffect, str(decision["effect"])),
+                    resource=cast(QuotaResource, str(decision["resource"])),
+                    limit=int(decision["limit"]),
+                    used=int(decision["used"]),
+                    reason=str(decision["reason"]),
+                    metadata=dict(decision.get("metadata") or {}),
+                ),
+            )
+        for key, raw in dict(payload.get("releases") or {}).items():
+            t, w, idem = str(key).split("|", 2)
+            mem._releases[(t, w, idem)] = (  # pyright: ignore[reportPrivateUsage]
+                cast(QuotaResource, str(raw["resource"])),
+                int(raw["units"]),
+            )
         mem._rr_cursor = int(payload.get("rr_cursor") or 0)
+        for key, claims in dict(payload.get("claims") or {}).items():
+            t, w, idem = str(key).split("|", 2)
+            mem._claims[(t, w, idem)] = set(claims)  # pyright: ignore[reportPrivateUsage]
         mem.shared_pressure = bool(payload.get("shared_pressure"))
         return mem