interloper-api 0.58.0__tar.gz → 0.60.0__tar.gz

{interloper_api-0.58.0 → interloper_api-0.60.0}/PKG-INFO

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

{interloper_api-0.58.0 → interloper_api-0.60.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "interloper-api"
-version = "0.58.0"
+version = "0.60.0"
 description = "Interloper FastAPI routes"
 readme = "README.md"
 requires-python = ">=3.10"

{interloper_api-0.58.0 → interloper_api-0.60.0}/pyproject.toml.orig

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

{interloper_api-0.58.0 → interloper_api-0.60.0}/src/interloper_api/routes/admin.py

@@ -18,8 +18,8 @@ from uuid import UUID
 
 from fastapi import APIRouter, Depends, HTTPException, Request
 from interloper_db import Organisation, Profile, Store
-from interloper_db.store.quotas import METRIC_SUCCESSFUL_RUNS
-from pydantic import BaseModel
+from interloper_db.store.quotas import METRIC_SUCCESSFUL_RUNS, QUOTAS
+from pydantic import BaseModel, Field
 
 from interloper_api.dependencies import get_admin_config, get_quota_defaults, get_store, require_super_admin
 from interloper_api.email import send_invite_email
@@ -41,6 +41,9 @@ class AdminOrganisationResponse(BaseModel):
     name: str
     member_count: int
     created_at: datetime | None = None
+    #: Soft-deleted orgs stay listed (their retained history and ledger are
+    #: still attributable) but are no longer manageable.
+    deleted_at: datetime | None = None
 
 
 class AdminUserOrganisation(BaseModel):
@@ -231,6 +234,7 @@ class AdminQuotaLimits(BaseModel):
     max_sources: int | None = None
     max_assets_per_source: int | None = None
     max_successful_runs_per_month: int | None = None
+    max_backfill_days: int | None = None
 
 
 class AdminOrgQuotaStatus(BaseModel):
@@ -238,6 +242,8 @@ class AdminOrgQuotaStatus(BaseModel):
 
     id: UUID
     name: str
+    #: Soft-deleted orgs keep their ledger visible but are read-only.
+    deleted_at: datetime | None = None
     limits: AdminQuotaLimits
     effective: AdminQuotaLimits
     sources: int
@@ -249,14 +255,41 @@ class AdminOrgQuotaStatus(BaseModel):
     recomputed_successful_runs: int
 
 
+class AdminQuotaField(BaseModel):
+    """One quota's display descriptor: key, registry label, instance default."""
+
+    key: str
+    label: str
+    default: int | None = None
+
+
 class AdminQuotasResponse(BaseModel):
     """Quota overview: global defaults plus per-organisation status."""
 
     period_start: dt.date
     defaults: AdminQuotaLimits
+    fields: list[AdminQuotaField]
     organisations: list[AdminOrgQuotaStatus]
 
 
+class AdminQuotaUpdateRequest(BaseModel):
+    """Per-org quota overrides. Omitted fields keep their value; null clears one."""
+
+    max_sources: int | None = Field(default=None, ge=0)
+    max_assets_per_source: int | None = Field(default=None, ge=0)
+    max_successful_runs_per_month: int | None = Field(default=None, ge=0)
+    max_backfill_days: int | None = Field(default=None, ge=0)
+
+
+class AdminActivityEntry(BaseModel):
+    """One event in an organisation's derived activity feed."""
+
+    kind: str
+    when: datetime
+    title: str
+    detail: str | None = None
+
+
 class AdminConfigResponse(BaseModel):
     """Read-only, secrets-redacted snapshot of the instance configuration."""
 
@@ -443,31 +476,34 @@ def build_config_snapshot(settings: Any, features: dict[str, bool], catalog: Any
 
 
 def _quota_limits(limits: Any) -> AdminQuotaLimits:
-    """Map any limits-shaped object (settings, Quota row, None) to the model."""
-    return AdminQuotaLimits(
-        max_sources=getattr(limits, "max_sources", None),
-        max_assets_per_source=getattr(limits, "max_assets_per_source", None),
-        max_successful_runs_per_month=getattr(limits, "max_successful_runs_per_month", None),
-    )
+    """Map limits from a ``{key: limit}`` dict (store) or attributes (settings)."""
+    if isinstance(limits, dict):
+        return AdminQuotaLimits(**{key: limits.get(key) for key in AdminQuotaLimits.model_fields})
+    return AdminQuotaLimits(**{key: getattr(limits, key, None) for key in AdminQuotaLimits.model_fields})
 
 
 def _effective_limits(overrides: AdminQuotaLimits, defaults: AdminQuotaLimits) -> AdminQuotaLimits:
     """Per-org overrides win field-by-field over the global defaults."""
     return AdminQuotaLimits(
-        max_sources=overrides.max_sources if overrides.max_sources is not None else defaults.max_sources,
-        max_assets_per_source=(
-            overrides.max_assets_per_source
-            if overrides.max_assets_per_source is not None
-            else defaults.max_assets_per_source
-        ),
-        max_successful_runs_per_month=(
-            overrides.max_successful_runs_per_month
-            if overrides.max_successful_runs_per_month is not None
-            else defaults.max_successful_runs_per_month
-        ),
+        **{
+            key: override if (override := getattr(overrides, key)) is not None else getattr(defaults, key)
+            for key in AdminQuotaLimits.model_fields
+        }
     )
 
 
+def _quota_fields(defaults: AdminQuotaLimits) -> list[AdminQuotaField]:
+    """Field descriptors for admin quota surfaces, in the wire model's order.
+
+    Labels come from the registry definitions, so the frontend renders new
+    quotas without a matching code change.
+    """
+    return [
+        AdminQuotaField(key=key, label=QUOTAS[key].label, default=getattr(defaults, key))
+        for key in AdminQuotaLimits.model_fields
+    ]
+
+
 def _require_org(store: Store, org_id: UUID) -> Organisation:
     """Fetch an organisation or raise 404."""
     org = store.get_organisation(org_id)
@@ -540,7 +576,7 @@ def get_quotas(
     """Quota limits and current-period usage for every organisation."""
     defaults = _quota_limits(quota_defaults)
     period_start = store.current_period_start()
-    overrides = {quota.org_id: quota for quota in store.list_quotas()}
+    overrides = store.list_quota_overrides()
     usage = {
         row.org_id: row
         for row in store.list_usage(period_start=period_start)
@@ -552,12 +588,13 @@ def get_quotas(
 
     organisations = []
     for org, _member_count in store.list_all_organisations():
-        limits = _quota_limits(overrides.get(org.id))
+        limits = _quota_limits(overrides.get(org.id, {}))
         org_usage = usage.get(org.id)
         organisations.append(
             AdminOrgQuotaStatus(
                 id=org.id,
                 name=org.name,
+                deleted_at=org.deleted_at,
                 limits=limits,
                 effective=_effective_limits(limits, defaults),
                 sources=sources.get(org.id, 0),
@@ -567,7 +604,63 @@ def get_quotas(
                 recomputed_successful_runs=recomputed.get(org.id, 0),
             )
         )
-    return AdminQuotasResponse(period_start=period_start, defaults=defaults, organisations=organisations)
+    return AdminQuotasResponse(
+        period_start=period_start,
+        defaults=defaults,
+        fields=_quota_fields(defaults),
+        organisations=organisations,
+    )
+
+
+def _activity_title(entry: dict[str, Any]) -> tuple[str, str | None]:
+    """Presentation strings for a derived activity entry."""
+    kind, subject, extra = entry["kind"], entry["subject"], entry["extra"]
+    if kind == "org_created":
+        return "Organisation created", None
+    if kind == "org_deleted":
+        return "Organisation deleted", "Retained read-only for billing history."
+    if kind == "member_joined":
+        return f"{subject} joined the organisation", f"Role: {extra}" if extra else None
+    if kind == "invitation_sent":
+        return f"Invitation sent to {subject}", f"Invited by {extra}" if extra else None
+    if kind == "source_added":
+        return f"Source added — {subject}", None
+    if kind == "runs_completed":
+        count = int(subject)
+        return f"{count:,} run{'' if count == 1 else 's'} completed successfully", None
+    return kind, 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),
+) -> list[AdminActivityEntry]:
+    """Derived activity feed for one organisation, newest first.
+
+    Composed from existing records (memberships, pending invitations,
+    sources, run aggregates, the org row itself) — there is no audit
+    trail, so actor attribution is limited to what those rows carry.
+    """
+    entries = []
+    for entry in store.list_organisation_activity(org_id):
+        title, detail = _activity_title(entry)
+        entries.append(AdminActivityEntry(kind=entry["kind"], when=entry["when"], title=title, detail=detail))
+    return entries
+
+
+@router.patch("/organisations/{org_id}/quota")
+def update_org_quota(
+    org_id: UUID,
+    body: AdminQuotaUpdateRequest,
+    user: Profile = Depends(require_super_admin),
+    store: Store = Depends(get_store),
+) -> AdminQuotaLimits:
+    """Set an organisation's quota overrides; omitted fields keep their value, null clears one."""
+    _require_org(store, org_id)
+    overrides = store.set_quota(org_id, body.model_dump(exclude_unset=True))
+    return _quota_limits(overrides)
 
 
 # -- Users --------------------------------------------------------------------
@@ -614,13 +707,14 @@ def list_all_organisations(
     user: Profile = Depends(require_super_admin),
     store: Store = Depends(get_store),
 ) -> list[AdminOrganisationResponse]:
-    """List every organisation with its member count."""
+    """List every organisation with its member count, soft-deleted ones included."""
     return [
         AdminOrganisationResponse(
             id=org.id,
             name=org.name,
             member_count=count,
             created_at=org.created_at,
+            deleted_at=org.deleted_at,
         )
         for org, count in store.list_all_organisations()
     ]
@@ -667,7 +761,11 @@ def delete_organisation(
     user: Profile = Depends(require_super_admin),
     store: Store = Depends(get_store),
 ) -> dict[str, str]:
-    """Delete an organisation and all its data. The body must repeat the exact name."""
+    """Soft-delete an organisation: purges its data, keeps execution history and the usage ledger.
+
+    The body must repeat the exact name. Deleted organisations stay in the
+    list (read-only) and read as missing everywhere else.
+    """
     org = _require_org(store, org_id)
     if body.name != org.name:
         raise HTTPException(status_code=400, detail="Organisation name does not match")

{interloper_api-0.58.0 → interloper_api-0.60.0}/src/interloper_api/routes/backfills.py

@@ -100,17 +100,14 @@ def create_backfill(
     job = load_authorized(
         lambda i: store.get_component(i, kind="job"), body.component_id, user, store, label="Job", minimum="editor"
     )
-    try:
-        backfill = store.create_backfill(
-            job.org_id,
-            component_id=body.component_id,
-            start_date=body.start_date,
-            end_date=body.end_date,
-            concurrency=body.concurrency,
-            fail_fast=body.fail_fast,
-        )
-    except ValueError as e:  # span cap
-        raise HTTPException(status_code=400, detail=str(e))
+    backfill = store.create_backfill(
+        job.org_id,
+        component_id=body.component_id,
+        start_date=body.start_date,
+        end_date=body.end_date,
+        concurrency=body.concurrency,
+        fail_fast=body.fail_fast,
+    )
     return _backfill_to_response(backfill)