interloper-api 0.77.0__tar.gz → 0.78.0__tar.gz

{interloper_api-0.77.0 → interloper_api-0.78.0}/PKG-INFO

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

{interloper_api-0.77.0 → interloper_api-0.78.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "interloper-api"
-version = "0.77.0"
+version = "0.78.0"
 description = "Interloper FastAPI routes"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -27,7 +27,7 @@ otel = [
 ]
 
 [build-system]
-requires = ["uv_build>=0.11.5,<0.12"]
+requires = ["uv_build>=0.12.9,<0.13"]
 build-backend = "uv_build"
 
 [tool.uv.sources.interloper-core]
@@ -84,4 +84,6 @@ extend-immutable-calls = [
     "D103",
     "D104",
     "D107",
+    "RUF069",
+    "PLW0108",
 ]

{interloper_api-0.77.0 → interloper_api-0.78.0}/pyproject.toml.orig

@@ -3,7 +3,7 @@
 # ###############
 [project]
 name = "interloper-api"
-version = "0.77.0"
+version = "0.78.0"
 description = "Interloper FastAPI routes"
 readme = "README.md"
 authors = [{ name = "Guillaume Onfroy", email = "guillaume@digitlcloud.com" }]
@@ -27,7 +27,7 @@ otel = [
 ]
 
 [build-system]
-requires = ["uv_build>=0.11.5,<0.12"]
+requires = ["uv_build>=0.12.9,<0.13"]
 build-backend = "uv_build"
 
 [tool.uv.sources]
@@ -65,4 +65,4 @@ extend-immutable-calls = [
 
 [tool.ruff.lint.per-file-ignores]
 "__init__.py" = ["F401", "F403"]
-"tests/**" = ["ANN", "F811", "D101", "D102", "D103", "D104", "D107"]
+"tests/**" = ["ANN", "F811", "D101", "D102", "D103", "D104", "D107", "RUF069", "PLW0108"]

{interloper_api-0.77.0 → interloper_api-0.78.0}/src/interloper_api/dependencies/__init__.py

@@ -6,12 +6,18 @@ organisation per request; ``rbac`` gates handlers on the caller's role.
 """
 
 from interloper_api.dependencies.auth import (
+    CurrentUserDep,
+    OrgIdDep,
     get_current_org,
     get_current_user,
     get_org_id,
     get_session_context,
 )
 from interloper_api.dependencies.rbac import (
+    AdminDep,
+    EditorDep,
+    SuperAdminDep,
+    ViewerDep,
     authorize_org_member,
     load_authorized,
     require_admin,
@@ -20,6 +26,11 @@ from interloper_api.dependencies.rbac import (
     require_viewer,
 )
 from interloper_api.dependencies.state import (
+    AdminConfigDep,
+    AuthConfigDep,
+    CatalogDep,
+    QuotaDefaultsDep,
+    StoreDep,
     get_admin_config,
     get_auth_config,
     get_catalog,
@@ -37,6 +48,17 @@ from interloper_api.dependencies.state import (
 )
 
 __all__ = [
+    "AdminConfigDep",
+    "AdminDep",
+    "AuthConfigDep",
+    "CatalogDep",
+    "CurrentUserDep",
+    "EditorDep",
+    "OrgIdDep",
+    "QuotaDefaultsDep",
+    "StoreDep",
+    "SuperAdminDep",
+    "ViewerDep",
     "authorize_org_member",
     "get_admin_config",
     "get_auth_config",

{interloper_api-0.77.0 → interloper_api-0.78.0}/src/interloper_api/dependencies/auth.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+from typing import Annotated
 from uuid import UUID
 
 from fastapi import Cookie, Depends, HTTPException
@@ -106,3 +107,9 @@ def get_org_id(
         The organisation UUID.
     """
     return org.id
+
+
+# -- Dependency aliases --------------------------------------------------------
+
+CurrentUserDep = Annotated[Profile, Depends(get_current_user)]
+OrgIdDep = Annotated[UUID, Depends(get_org_id)]

{interloper_api-0.77.0 → interloper_api-0.78.0}/src/interloper_api/dependencies/rbac.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from collections.abc import Callable
-from typing import Any
+from typing import Annotated, Any
 from uuid import UUID
 
 from fastapi import Depends, HTTPException
@@ -191,3 +191,11 @@ def require_super_admin(
     if not user.is_super_admin:
         raise HTTPException(status_code=403, detail="Requires super-admin privileges")
     return user
+
+
+# -- Dependency aliases --------------------------------------------------------
+
+ViewerDep = Annotated[Profile, Depends(require_viewer)]
+EditorDep = Annotated[Profile, Depends(require_editor)]
+AdminDep = Annotated[Profile, Depends(require_admin)]
+SuperAdminDep = Annotated[Profile, Depends(require_super_admin)]

{interloper_api-0.77.0 → interloper_api-0.78.0}/src/interloper_api/dependencies/state.py

@@ -7,8 +7,9 @@ route reaches for an ambient global of its own.
 
 from __future__ import annotations
 
-from typing import Any
+from typing import Annotated, Any
 
+from fastapi import Depends
 from interloper.catalog.base import Catalog
 from interloper_db import Store
 
@@ -169,3 +170,12 @@ def get_quota_defaults() -> Any:
         The QuotaSettings instance, or None if not configured.
     """
     return _quota_defaults
+
+
+# -- Dependency aliases --------------------------------------------------------
+
+StoreDep = Annotated[Store, Depends(get_store)]
+CatalogDep = Annotated[Catalog, Depends(get_catalog)]
+AuthConfigDep = Annotated[Any, Depends(get_auth_config)]
+AdminConfigDep = Annotated[Any, Depends(get_admin_config)]
+QuotaDefaultsDep = Annotated[Any, Depends(get_quota_defaults)]

{interloper_api-0.77.0 → interloper_api-0.78.0}/src/interloper_api/routes/admin.py

@@ -16,12 +16,16 @@ from importlib import metadata
 from typing import Any
 from uuid import UUID
 
-from fastapi import APIRouter, Depends, HTTPException, Request
-from interloper_db import Profile, Store
+from fastapi import APIRouter, HTTPException, Request
 from interloper_db.store.quotas import METRIC_SUCCESSFUL_RUNS, QUOTAS
 from pydantic import BaseModel, RootModel, field_validator
 
-from interloper_api.dependencies import get_admin_config, get_quota_defaults, get_store, require_super_admin
+from interloper_api.dependencies import (
+    AdminConfigDep,
+    QuotaDefaultsDep,
+    StoreDep,
+    SuperAdminDep,
+)
 from interloper_api.notifications import InvitationEmail
 
 logger = logging.getLogger(__name__)
@@ -647,8 +651,8 @@ def _send_invitation_email(
 
 @router.get("/config")
 def get_instance_config(
-    user: Profile = Depends(require_super_admin),
-    config: Any = Depends(get_admin_config),
+    user: SuperAdminDep,
+    config: AdminConfigDep,
 ) -> AdminConfigResponse:
     """Read-only snapshot of the instance configuration (secrets redacted).
 
@@ -673,9 +677,9 @@ def get_instance_config(
 
 @router.get("/quotas")
 def get_quotas(
-    user: Profile = Depends(require_super_admin),
-    store: Store = Depends(get_store),
-    quota_defaults: Any = Depends(get_quota_defaults),
+    user: SuperAdminDep,
+    store: StoreDep,
+    quota_defaults: QuotaDefaultsDep,
 ) -> AdminQuotasResponse:
     """Quota limits and current-period usage for every organisation.
 
@@ -730,8 +734,8 @@ def get_quotas(
 def update_org_quota(
     org_id: UUID,
     body: AdminQuotaUpdateRequest,
-    user: Profile = Depends(require_super_admin),
-    store: Store = Depends(get_store),
+    user: SuperAdminDep,
+    store: StoreDep,
 ) -> AdminQuotaLimits:
     """Set an organisation's quota overrides; omitted keys keep their value, null clears one.
 
@@ -784,8 +788,8 @@ def _activity_title(entry: dict[str, Any]) -> tuple[str, str | None]:
 @router.get("/organisations/{org_id}/activity")
 def get_organisation_activity(
     org_id: UUID,
-    user: Profile = Depends(require_super_admin),
-    store: Store = Depends(get_store),
+    user: SuperAdminDep,
+    store: StoreDep,
 ) -> list[AdminActivityEntry]:
     """Derived activity feed for one organisation, newest first.
 
@@ -813,8 +817,8 @@ def get_organisation_activity(
 
 @router.get("/users")
 def list_all_users(
-    user: Profile = Depends(require_super_admin),
-    store: Store = Depends(get_store),
+    user: SuperAdminDep,
+    store: StoreDep,
 ) -> list[AdminUserResponse]:
     """List every user profile with the organisations it belongs to.
 
@@ -842,8 +846,8 @@ def list_all_users(
 @router.delete("/users/{user_id}")
 def delete_user(
     user_id: UUID,
-    user: Profile = Depends(require_super_admin),
-    store: Store = Depends(get_store),
+    user: SuperAdminDep,
+    store: StoreDep,
 ) -> dict[str, str]:
     """Delete a user entirely: profile, sessions, tokens, memberships, sent invitations.
 
@@ -869,8 +873,8 @@ def delete_user(
 
 @router.get("/organisations")
 def list_all_organisations(
-    user: Profile = Depends(require_super_admin),
-    store: Store = Depends(get_store),
+    user: SuperAdminDep,
+    store: StoreDep,
 ) -> list[AdminOrganisationResponse]:
     """List every organisation with its member count, soft-deleted ones included.
 
@@ -896,8 +900,8 @@ def list_all_organisations(
 @router.post("/organisations", status_code=201)
 def create_organisation(
     body: CreateOrganisationRequest,
-    user: Profile = Depends(require_super_admin),
-    store: Store = Depends(get_store),
+    user: SuperAdminDep,
+    store: StoreDep,
 ) -> AdminOrganisationResponse:
     """Create an organisation. The super-admin is not added as a member.
 
@@ -922,8 +926,8 @@ def create_organisation(
 def update_organisation(
     org_id: UUID,
     body: UpdateOrganisationRequest,
-    user: Profile = Depends(require_super_admin),
-    store: Store = Depends(get_store),
+    user: SuperAdminDep,
+    store: StoreDep,
 ) -> AdminOrganisationResponse:
     """Rename an organisation.
 
@@ -950,8 +954,8 @@ def update_organisation(
 def delete_organisation(
     org_id: UUID,
     body: DeleteOrganisationRequest,
-    user: Profile = Depends(require_super_admin),
-    store: Store = Depends(get_store),
+    user: SuperAdminDep,
+    store: StoreDep,
 ) -> dict[str, str]:
     """Soft-delete an organisation: purges its data, keeps execution history and the usage ledger.
 
@@ -983,8 +987,8 @@ def delete_organisation(
 @router.get("/organisations/{org_id}/members")
 def list_members(
     org_id: UUID,
-    user: Profile = Depends(require_super_admin),
-    store: Store = Depends(get_store),
+    user: SuperAdminDep,
+    store: StoreDep,
 ) -> list[MemberResponse]:
     """List all members of any organisation.
 
@@ -1014,8 +1018,8 @@ def list_members(
 def join_organisation(
     org_id: UUID,
     body: JoinOrganisationRequest,
-    user: Profile = Depends(require_super_admin),
-    store: Store = Depends(get_store),
+    user: SuperAdminDep,
+    store: StoreDep,
 ) -> MemberResponse:
     """Add the calling super-admin to any organisation — no invitation needed.
 
@@ -1049,8 +1053,8 @@ def update_member_role(
     org_id: UUID,
     user_id: UUID,
     body: UpdateRoleRequest,
-    user: Profile = Depends(require_super_admin),
-    store: Store = Depends(get_store),
+    user: SuperAdminDep,
+    store: StoreDep,
 ) -> dict[str, str]:
     """Change a member's role in any organisation.
 
@@ -1073,8 +1077,8 @@ def update_member_role(
 def remove_member(
     org_id: UUID,
     user_id: UUID,
-    user: Profile = Depends(require_super_admin),
-    store: Store = Depends(get_store),
+    user: SuperAdminDep,
+    store: StoreDep,
 ) -> dict[str, str]:
     """Remove a member from any organisation.
 
@@ -1097,8 +1101,8 @@ def remove_member(
 @router.get("/organisations/{org_id}/invitations")
 def list_invitations(
     org_id: UUID,
-    user: Profile = Depends(require_super_admin),
-    store: Store = Depends(get_store),
+    user: SuperAdminDep,
+    store: StoreDep,
 ) -> list[InvitationResponse]:
     """List pending invitations for any organisation.
 
@@ -1128,8 +1132,8 @@ def invite_member(
     org_id: UUID,
     body: InviteRequest,
     request: Request,
-    user: Profile = Depends(require_super_admin),
-    store: Store = Depends(get_store),
+    user: SuperAdminDep,
+    store: StoreDep,
 ) -> InvitationResponse:
     """Invite a user to any organisation by email.
 
@@ -1171,8 +1175,8 @@ def invite_member(
 def cancel_invitation(
     org_id: UUID,
     invitation_id: UUID,
-    user: Profile = Depends(require_super_admin),
-    store: Store = Depends(get_store),
+    user: SuperAdminDep,
+    store: StoreDep,
 ) -> dict[str, str]:
     """Cancel a pending invitation in any organisation.
 

{interloper_api-0.77.0 → interloper_api-0.78.0}/src/interloper_api/routes/agent.py

@@ -12,9 +12,8 @@ from __future__ import annotations
 import logging
 from collections.abc import AsyncIterator
 from typing import Any
-from uuid import UUID
 
-from fastapi import APIRouter, Depends, HTTPException, Response
+from fastapi import APIRouter, HTTPException, Response
 from fastapi.responses import StreamingResponse
 from google.adk.apps import App
 from google.adk.artifacts.in_memory_artifact_service import InMemoryArtifactService
@@ -22,10 +21,16 @@ from google.adk.runners import Runner
 from google.adk.sessions.in_memory_session_service import InMemorySessionService
 from google.genai import types
 from interloper.catalog.base import Catalog
-from interloper_db import Profile, Store
+from interloper_db import Store
 from pydantic import BaseModel
 
-from interloper_api.dependencies import get_catalog, get_org_id, get_store, require_editor, require_viewer
+from interloper_api.dependencies import (
+    CatalogDep,
+    EditorDep,
+    OrgIdDep,
+    StoreDep,
+    ViewerDep,
+)
 
 logger = logging.getLogger(__name__)
 
@@ -128,10 +133,10 @@ class SessionResponse(BaseModel):
 
 @router.post("/sessions")
 async def create_session(
-    user: Profile = Depends(require_editor),
-    org_id: UUID = Depends(get_org_id),
-    store: Store = Depends(get_store),
-    catalog: Catalog = Depends(get_catalog),
+    user: EditorDep,
+    org_id: OrgIdDep,
+    store: StoreDep,
+    catalog: CatalogDep,
 ) -> SessionResponse:
     """Create a new agent chat session.
 
@@ -159,7 +164,7 @@ async def create_session(
 
 @router.get("/sessions")
 async def list_sessions(
-    user: Profile = Depends(require_viewer),
+    user: ViewerDep,
 ) -> list[SessionResponse]:
     """List all agent sessions for the current user.
 
@@ -181,7 +186,7 @@ async def list_sessions(
 @router.get("/sessions/{session_id}")
 async def get_session(
     session_id: str,
-    user: Profile = Depends(require_viewer),
+    user: ViewerDep,
 ) -> Response:
     """Get a session with its full event history.
 
@@ -214,7 +219,7 @@ async def get_session(
 @router.delete("/sessions/{session_id}")
 async def delete_session(
     session_id: str,
-    user: Profile = Depends(require_editor),
+    user: EditorDep,
 ) -> dict[str, str]:
     """Delete an agent session.
 
@@ -248,9 +253,9 @@ async def delete_session(
 async def chat(
     session_id: str,
     body: ChatRequest,
-    user: Profile = Depends(require_editor),
-    store: Store = Depends(get_store),
-    catalog: Catalog = Depends(get_catalog),
+    user: EditorDep,
+    store: StoreDep,
+    catalog: CatalogDep,
 ) -> StreamingResponse:
     """Send a message and stream the agent's response as SSE.
 

{interloper_api-0.77.0 → interloper_api-0.78.0}/src/interloper_api/routes/auth.py

@@ -4,19 +4,24 @@ from __future__ import annotations
 
 from contextlib import suppress
 from datetime import datetime
-from typing import Any
+from typing import Annotated, Any
 from urllib.parse import urlencode
 from uuid import UUID
 from zoneinfo import ZoneInfo
 
 import httpx
-from fastapi import APIRouter, Cookie, Depends, HTTPException, Response
+from fastapi import APIRouter, Cookie, HTTPException, Response
 from fastapi.responses import RedirectResponse
 from interloper.errors import NotFoundError
-from interloper_db import Organisation, Profile, Store
+from interloper_db import Organisation, Store
 from pydantic import BaseModel, Field
 
-from interloper_api.dependencies import get_auth_config, get_current_user, get_features, get_store
+from interloper_api.dependencies import (
+    AuthConfigDep,
+    CurrentUserDep,
+    StoreDep,
+    get_features,
+)
 
 GOOGLE_AUTH_URL = "https://accounts.google.com/o/oauth2/v2/auth"
 GOOGLE_TOKEN_URL = "https://oauth2.googleapis.com/token"
@@ -83,8 +88,8 @@ class AuthUserResponse(BaseModel):
 
 @router.get("/google")
 def google_login(
+    auth_config: AuthConfigDep,
     redirect: str | None = None,
-    auth_config: Any = Depends(get_auth_config),
 ) -> RedirectResponse:
     """Redirect user to Google's OAuth consent screen.
 
@@ -123,9 +128,9 @@ def google_login(
 @router.get("/google/callback")
 def google_callback(
     code: str,
+    store: StoreDep,
+    auth_config: AuthConfigDep,
     state: str | None = None,
-    store: Store = Depends(get_store),
-    auth_config: Any = Depends(get_auth_config),
 ) -> RedirectResponse:
     """Exchange Google authorization code for tokens, upsert profile, create session.
 
@@ -224,8 +229,8 @@ def google_callback(
 @router.post("/logout")
 def logout(
     response: Response,
-    user: Profile = Depends(get_current_user),
-    store: Store = Depends(get_store),
+    user: CurrentUserDep,
+    store: StoreDep,
 ) -> dict[str, str]:
     """Delete all sessions for the current user and clear the cookie.
 
@@ -247,8 +252,8 @@ def logout(
 
 @router.get("/me")
 def get_me(
-    store: Store = Depends(get_store),
-    session_token: str | None = Cookie(default=None),
+    store: StoreDep,
+    session_token: Annotated[str | None, Cookie()] = None,
 ) -> AuthUserResponse:
     """Return the current user and their active organisation (if any).
 
@@ -328,8 +333,8 @@ class ProfileResponse(BaseModel):
 @router.patch("/me")
 def update_me(
     body: UpdateMeRequest,
-    user: Profile = Depends(get_current_user),
-    store: Store = Depends(get_store),
+    user: CurrentUserDep,
+    store: StoreDep,
 ) -> ProfileResponse:
     """Update the current user's profile (display name, timezone).
 
@@ -366,9 +371,9 @@ class SwitchOrgRequest(BaseModel):
 @router.post("/switch-org")
 def switch_org(
     body: SwitchOrgRequest,
-    user: Profile = Depends(get_current_user),
-    store: Store = Depends(get_store),
-    session_token: str | None = Cookie(default=None),
+    user: CurrentUserDep,
+    store: StoreDep,
+    session_token: Annotated[str | None, Cookie()] = None,
 ) -> dict[str, str]:
     """Switch the session's active organisation. User must be a member.
 
@@ -403,9 +408,9 @@ class AcceptInviteRequest(BaseModel):
 @router.post("/accept-invite")
 def accept_invite(
     body: AcceptInviteRequest,
-    user: Profile = Depends(get_current_user),
-    store: Store = Depends(get_store),
-    session_token: str | None = Cookie(default=None),
+    user: CurrentUserDep,
+    store: StoreDep,
+    session_token: Annotated[str | None, Cookie()] = None,
 ) -> dict[str, str]:
     """Accept an organisation invitation using its token.
 

{interloper_api-0.77.0 → interloper_api-0.78.0}/src/interloper_api/routes/backfills.py

@@ -4,19 +4,18 @@ from __future__ import annotations
 
 from uuid import UUID
 
-from fastapi import APIRouter, Depends, HTTPException
+from fastapi import APIRouter, HTTPException
 from interloper.errors import NotFoundError
-from interloper_db import Profile, Store
 from interloper_db.models import Backfill
 from pydantic import BaseModel
 
 from interloper_api.dependencies import (
+    CurrentUserDep,
+    OrgIdDep,
+    StoreDep,
+    ViewerDep,
     authorize_org_member,
-    get_current_user,
-    get_org_id,
-    get_store,
     load_authorized,
-    require_viewer,
 )
 
 router = APIRouter(prefix="/backfills", tags=["backfills"])
@@ -96,10 +95,10 @@ class BackfillResponse(BaseModel):
 
 @router.get("/")
 def list_backfills(
+    user: ViewerDep,
+    org_id: OrgIdDep,
+    store: StoreDep,
     active_only: bool = False,
-    user: Profile = Depends(require_viewer),
-    org_id: UUID = Depends(get_org_id),
-    store: Store = Depends(get_store),
 ) -> list[BackfillResponse]:
     """List backfills for the current organisation.
 
@@ -123,8 +122,8 @@ def list_backfills(
 @router.post("/", status_code=201)
 def create_backfill(
     body: BackfillCreateRequest,
-    user: Profile = Depends(get_current_user),
-    store: Store = Depends(get_store),
+    user: CurrentUserDep,
+    store: StoreDep,
 ) -> BackfillResponse:
     """Queue a backfill for a job over a partition-key range.
 
@@ -160,8 +159,8 @@ def create_backfill(
 @router.get("/{backfill_id}")
 def get_backfill(
     backfill_id: UUID,
-    user: Profile = Depends(get_current_user),
-    store: Store = Depends(get_store),
+    user: CurrentUserDep,
+    store: StoreDep,
 ) -> BackfillResponse:
     """Get a single backfill by ID. Authorized by membership in the backfill's org.
 
@@ -187,8 +186,8 @@ def get_backfill(
 @router.post("/{backfill_id}/cancel")
 def cancel_backfill(
     backfill_id: UUID,
-    user: Profile = Depends(get_current_user),
-    store: Store = Depends(get_store),
+    user: CurrentUserDep,
+    store: StoreDep,
 ) -> BackfillResponse:
     """Cancel a backfill: pending and queued runs are canceled, in-flight runs drain.