interloper-api 0.19.0__tar.gz → 0.21.0__tar.gz

{interloper_api-0.19.0 → interloper_api-0.21.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: interloper-api
-Version: 0.19.0
+Version: 0.21.0
 Summary: Interloper FastAPI routes
 Author: Guillaume Onfroy
 Author-email: Guillaume Onfroy <guillaume@digitlcloud.com>

{interloper_api-0.19.0 → interloper_api-0.21.0}/pyproject.toml

@@ -3,7 +3,7 @@
 # ###############
 [project]
 name = "interloper-api"
-version = "0.19.0"
+version = "0.21.0"
 description = "Interloper FastAPI routes"
 readme = "README.md"
 authors = [{ name = "Guillaume Onfroy", email = "guillaume@digitlcloud.com" }]

{interloper_api-0.19.0 → interloper_api-0.21.0}/src/interloper_api/app.py

@@ -5,9 +5,11 @@ from __future__ import annotations
 import logging
 from typing import Any
 
-from fastapi import APIRouter, FastAPI
+from fastapi import APIRouter, FastAPI, Request
 from fastapi.middleware.cors import CORSMiddleware
+from fastapi.responses import JSONResponse
 from interloper.catalog.base import Catalog
+from interloper.errors import ComponentDriftError
 from interloper_db import Store
 
 from interloper_api.dependencies import set_auth_config, set_catalog, set_smtp_config, set_store
@@ -55,6 +57,15 @@ def create_app(
     """
     app = FastAPI(title="Interloper API", lifespan=ws.realtime_lifespan, **kwargs)
 
+    @app.exception_handler(ComponentDriftError)
+    async def _component_drift_handler(_request: Request, exc: ComponentDriftError) -> JSONResponse:
+        """A stored component whose catalog key has drifted is a conflict, not a 500.
+
+        Hydrating or running a drifted source/asset can't succeed until the
+        user resolves the drift, so surface it as a clean 409 the UI can act on.
+        """
+        return JSONResponse(status_code=409, content={"detail": str(exc)})
+
     if cors_origins:
         app.add_middleware(
             CORSMiddleware,

{interloper_api-0.19.0 → interloper_api-0.21.0}/src/interloper_api/routes/assets.py

@@ -7,7 +7,7 @@ from uuid import UUID
 
 from fastapi import APIRouter, Depends, HTTPException
 from interloper.errors import DataNotFoundError, NotFoundError
-from interloper_db import Profile, Store
+from interloper_db import ComponentStatus, Profile, Store
 from interloper_db.models import Asset, AssetResource, Destination, DestinationResource
 from pydantic import BaseModel
 from sqlmodel import Session, select
@@ -64,6 +64,7 @@ class AssetResponse(BaseModel):
     org_id: UUID
     key: str
     materializable: bool
+    status: ComponentStatus
     config: dict[str, Any] | None = None
     resources: dict[str, str] = {}
     destinations: list[DestinationResponse] = []
@@ -147,14 +148,21 @@ def _load_authorized_asset(asset_id: UUID, user: Profile, store: Store, *, minim
     return asset
 
 
-def _asset_to_response(asset: Asset) -> AssetResponse:
-    """Convert a DB Asset to an AssetResponse."""
+def _asset_to_response(asset: Asset, store: Store) -> AssetResponse:
+    """Convert a DB Asset to an AssetResponse.
+
+    Carries the asset's catalog-resolution ``status`` (derived from the same
+    resolver hydration uses) so the UI can flag drifted assets. Source-owned
+    assets resolve through their parent, so ``asset.source`` must be loaded.
+    """
+    source_key = asset.source.key if asset.source else None
     return AssetResponse(
         id=asset.id,
         source_id=asset.source_id,
         org_id=asset.org_id,
         key=asset.key,
         materializable=asset.materializable,
+        status=store.asset_status(asset.key, source_key=source_key),
         config=asset.config,
         resources=_resource_map(AssetResource, "asset_id", asset.id),
         destinations=[_dest_to_response(d) for d in asset.destinations],
@@ -173,7 +181,7 @@ def list_assets(
 ) -> list[AssetResponse]:
     """List all assets for the current organisation."""
     assets = store.list_assets(org_id)
-    return [_asset_to_response(a) for a in assets]
+    return [_asset_to_response(a, store) for a in assets]
 
 
 @router.post("/", status_code=201)
@@ -191,7 +199,7 @@ def create_asset(
         resources=body.resources,
         destination_ids=body.destination_ids,
     )
-    return _asset_to_response(asset)
+    return _asset_to_response(asset, store)
 
 
 @router.get("/dependencies")
@@ -219,7 +227,7 @@ def get_asset(
 ) -> AssetResponse:
     """Get a single asset by ID. Authorized by membership in the asset's org."""
     asset = _load_authorized_asset(asset_id, user, store)
-    return _asset_to_response(asset)
+    return _asset_to_response(asset, store)
 
 
 @router.put("/{asset_id}")
@@ -241,7 +249,7 @@ def update_asset(
         )
     except NotFoundError:
         raise HTTPException(status_code=404, detail=f"Asset {asset_id} not found")
-    return _asset_to_response(asset)
+    return _asset_to_response(asset, store)
 
 
 @router.delete("/{asset_id}")

{interloper_api-0.19.0 → interloper_api-0.21.0}/src/interloper_api/routes/sources.py

@@ -7,7 +7,7 @@ from uuid import UUID
 
 from fastapi import APIRouter, Depends, HTTPException
 from interloper.errors import NotFoundError
-from interloper_db import Profile, Store
+from interloper_db import ComponentStatus, Profile, Store
 from interloper_db.models import Destination, DestinationResource, Source, SourceResource
 from pydantic import BaseModel
 from sqlalchemy.orm import selectinload
@@ -43,6 +43,7 @@ class AssetResponse(BaseModel):
     id: UUID
     key: str
     materializable: bool
+    status: ComponentStatus
 
 
 class DestinationResponse(BaseModel):
@@ -64,6 +65,7 @@ class SourceResponse(BaseModel):
     key: str
     name: str
     config: dict[str, Any] | None = None
+    status: ComponentStatus
     resources: dict[str, str] = {}
     destinations: list[DestinationResponse] = []
     assets: list[AssetResponse] = []
@@ -77,14 +79,20 @@ def _resource_map(session: Session, junction_cls: type, fk_column: str, fk_value
     return {r.key: str(r.resource_id) for r in rows}  # ty: ignore[unresolved-attribute]
 
 
-def _build_source_response(session: Session, source: Source) -> SourceResponse:
-    """Convert a DB Source to a SourceResponse within a session."""
+def _build_source_response(session: Session, source: Source, store: Store) -> SourceResponse:
+    """Convert a DB Source to a SourceResponse within a session.
+
+    Each source and asset carries its catalog-resolution ``status`` so the
+    UI can flag drift. Status is derived from the same resolver hydration
+    uses — detection is just building the response, not a separate pass.
+    """
     return SourceResponse(
         id=source.id,
         org_id=source.org_id,
         key=source.key,
         name=source.name,
         config=source.config,
+        status=store.source_status(source.key),
         resources=_resource_map(session, SourceResource, "source_id", source.id),
         destinations=[
             DestinationResponse(
@@ -98,14 +106,19 @@ def _build_source_response(session: Session, source: Source) -> SourceResponse:
             for d in source.destinations
         ],
         assets=[
-            AssetResponse(id=a.id, key=a.key, materializable=a.materializable)
+            AssetResponse(
+                id=a.id,
+                key=a.key,
+                materializable=a.materializable,
+                status=store.asset_status(a.key, source_key=source.key),
+            )
             for a in source.assets
         ],
         created_at=str(source.created_at) if source.created_at else None,
     )
 
 
-def _load_source_for_response(source_id: UUID) -> SourceResponse:
+def _load_source_for_response(source_id: UUID, store: Store) -> SourceResponse:
     """Load a source with relations and build the response."""
     from interloper_db.engine import get_engine
 
@@ -121,7 +134,7 @@ def _load_source_for_response(source_id: UUID) -> SourceResponse:
         )
         if not source:
             raise NotFoundError(f"Source {source_id} not found")
-        return _build_source_response(session, source)
+        return _build_source_response(session, source, store)
 
 
 @router.get("/")
@@ -135,7 +148,7 @@ def list_sources(
 
     sources = store.list_sources(org_id)
     with Session(get_engine()) as session:
-        return [_build_source_response(session, s) for s in sources]
+        return [_build_source_response(session, s, store) for s in sources]
 
 
 @router.post("/")
@@ -156,7 +169,7 @@ def create_source(
         destination_ids=body.destination_ids,
         cross_deps=body.cross_deps,
     )
-    return _load_source_for_response(source.id)
+    return _load_source_for_response(source.id, store)
 
 
 def _authorize_source(source_id: UUID, user: Profile, store: Store, *, minimum: str = "viewer") -> None:
@@ -194,7 +207,7 @@ def update_source(
         )
     except NotFoundError:
         raise HTTPException(status_code=404, detail=f"Source {source_id} not found")
-    return _load_source_for_response(source_id)
+    return _load_source_for_response(source_id, store)
 
 
 @router.delete("/{source_id}")