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

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

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

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

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

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

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

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

@@ -18,7 +18,7 @@ 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 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
@@ -234,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):
@@ -254,11 +255,20 @@ 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]
 
 
@@ -268,6 +278,7 @@ class AdminQuotaUpdateRequest(BaseModel):
     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):
@@ -468,30 +479,31 @@ def _quota_limits(limits: Any) -> AdminQuotaLimits:
     """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(
-        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),
-    )
+    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)
@@ -592,7 +604,12 @@ 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]:

{interloper_api-0.59.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)