From 09b409d408b6d94aae350973794ae9040833b3b4 Mon Sep 17 00:00:00 2001 From: Justas Balcas Date: Mon, 12 Jan 2026 13:27:56 -0600 Subject: [PATCH 01/22] Add Facility API, demo data, stricter query validation and /api/v1 discovery endpoint This pull requests includes: - Implement /api/v1 to list metadata; - Implement /facility api (most fields are optional, and implemented based on the specification) - Capabilities, project include forbidExtraQueryParams to make validation happy. - Parse Raw query_string (catch duplicate keys) - Add HTTP 304 handling and return correct header --- Makefile | 1 + app/demo_adapter.py | 210 ++++++++++++++++++++++- app/main.py | 33 +++- app/routers/account/account.py | 8 + app/routers/compute/compute.py | 4 +- app/routers/error_handlers.py | 6 + app/routers/facility/__init__.py | 0 app/routers/facility/facility.py | 77 +++++++++ app/routers/facility/facility_adapter.py | 65 +++++++ app/routers/facility/models.py | 58 +++++++ app/routers/iri_router.py | 36 +++- 11 files changed, 484 insertions(+), 14 deletions(-) create mode 100644 app/routers/facility/__init__.py create mode 100644 app/routers/facility/facility.py create mode 100644 app/routers/facility/facility_adapter.py create mode 100644 app/routers/facility/models.py diff --git a/Makefile b/Makefile index 5bd9034..ba7552a 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,6 @@ dev : .venv @source ./.venv/bin/activate && \ + IRI_API_ADAPTER_facility=app.demo_adapter.DemoAdapter \ IRI_API_ADAPTER_status=app.demo_adapter.DemoAdapter \ IRI_API_ADAPTER_account=app.demo_adapter.DemoAdapter \ IRI_API_ADAPTER_compute=app.demo_adapter.DemoAdapter \ diff --git a/app/demo_adapter.py b/app/demo_adapter.py index 9cbc796..daf266d 100644 --- a/app/demo_adapter.py +++ b/app/demo_adapter.py @@ -13,6 +13,7 @@ from pydantic import BaseModel from typing import Any, Tuple from fastapi import HTTPException +from .routers.facility import models as facility_models, facility_adapter as facility_adapter from .routers.status import models as status_models, facility_adapter as status_adapter from .routers.account import models as account_models, facility_adapter as account_adapter from .routers.compute import models as compute_models, facility_adapter as compute_adapter @@ -40,9 +41,13 @@ def get_base_temp_dir(cls): return cls._base_temp_dir +def demo_uuid(kind: str, name: str) -> str: + return str(uuid.uuid5(uuid.NAMESPACE_DNS, f"demo:{kind}:{name}")) + + class DemoAdapter(status_adapter.FacilityAdapter, account_adapter.FacilityAdapter, compute_adapter.FacilityAdapter, filesystem_adapter.FacilityAdapter, - task_adapter.FacilityAdapter): + task_adapter.FacilityAdapter, facility_adapter.FacilityAdapter): def __init__(self): self.resources = [] self.incidents = [] @@ -52,11 +57,83 @@ def __init__(self): self.projects = [] self.project_allocations = [] self.user_allocations = [] - + self.locations = [] + self.facility = {} + self.sites = [] self._init_state() def _init_state(self): + now = datetime.datetime.now(datetime.timezone.utc) + loc1 = facility_models.Location( + id=demo_uuid("location", "demo_location_1"), + name="Demo Location 1", + description="The first demo location", + last_modified=now, + short_name="DL1", + country_name="USA", + locality_name="Demo City", + state_or_province_name="DC", + latitude=36.173357, + longitude=-234.51452) + + loc2 = facility_models.Location( + id=demo_uuid("location", "demo_location_2"), + name="Demo Location 2", + description="The second demo location", + last_modified=now, + short_name="DL2", + country_name="USA", + locality_name="Example Town", + state_or_province_name="ET", + latitude=38.410558, + longitude=-286.36999) + + site1 = facility_models.Site( + id=demo_uuid("site", "demo_site_1"), + name="Demo Site 1", + description="The first demo site", + last_modified=now, + short_name="DS1", + operating_organization="Demo Org", + location_uri=loc1.self_uri, + resource_uris=[]) + site2 = facility_models.Site( + id=demo_uuid("site", "demo_site_2"), + name="Demo Site 2", + description="The second demo site", + last_modified=now, + short_name="DS2", + operating_organization="Demo Org", + location_uri=loc2.self_uri, + resource_uris=[]) + + facility = facility_models.Facility( + id=demo_uuid("facility", "demo_facility"), + name="Demo Facility", + description="A demo facility for testing the IRI Facility API", + last_modified=now, + short_name="DEMO", + organization_name="Demo Organization", + support_uri="https://support.demo.example", + site_uris=[site1.self_uri, site2.self_uri], + location_uris=[loc1.self_uri, loc2.self_uri], + resource_uris=[], + event_uris=[], + incident_uris=[], + capability_uris=[], + project_uris=[], + project_allocation_uris=[], + user_allocation_uris=[], + ) + + self.facility = facility + loc1.site_uris.append(site1.self_uri) + loc2.site_uris.append(site2.self_uri) + self.locations = [loc1, loc2] + self.sites = [site1, site2] + + day_ago = datetime.datetime.now(datetime.timezone.utc) - datetime.timedelta(days=1) self.capabilities = { "cpu": account_models.Capability(id=str(uuid.uuid4()), name="CPU Nodes", units=[account_models.AllocationUnit.node_hours]), @@ -182,6 +259,135 @@ def _init_state(self): d += datetime.timedelta(minutes=int(random.random() * 15 + 1)) + # ---------------------------- + # Facility API + # ---------------------------- + + async def get_facility( + self: "DemoAdapter", + modified_since: str | None = None, + ) -> facility_models.Facility: + return self.facility + + + async def list_sites( + self: "DemoAdapter", + modified_since: str | None = None, + name: str | None = None, + offset: int | None = None, + limit: int | None = None, + short_name: str | None = None, + ) -> list[facility_models.Site]: + + sites = self.sites + + if name: + sites = [s for s in sites if name.lower() in s.name.lower()] + + if short_name: + sites = [s for s in sites if s.short_name == short_name] + + if modified_since: + ms = datetime.datetime.fromisoformat(str(modified_since)) + sites = [s for s in sites if s.last_modified > ms] + + o = offset or 0 + l = limit or len(sites) + return sites[o:o+l] + + + async def get_site( + self: "DemoAdapter", + site_id: str, + modified_since: str | None = None, + ) -> facility_models.Site: + + site = next((s for s in self.sites if s.id == site_id), None) + if not site: + raise HTTPException(status_code=404, detail="Site not found") + + if modified_since: + ms = datetime.datetime.fromisoformat(str(modified_since)) + if site.last_modified <= ms: + raise HTTPException(status_code=304, headers={"Last-Modified": site.last_modified.isoformat()}) + + return site + + + async def get_site_location( + self: "DemoAdapter", + site_id: str, + modified_since: str | None = None, + ) -> facility_models.Location: + + site = await self.get_site(site_id) + + if not site.location_uri: + raise HTTPException(status_code=404, detail="Site has no location") + + location = next((l for l in self.locations if l.self_uri == str(site.location_uri)), None) + + if not location: + raise HTTPException(status_code=404, detail="Location not found") + + if modified_since: + ms = datetime.datetime.fromisoformat(str(modified_since)) + if location.last_modified <= ms: + raise HTTPException(status_code=304, headers={"Last-Modified": location.last_modified.isoformat()}) + + return location + + + async def list_locations( + self: "DemoAdapter", + modified_since: str | None = None, + name: str | None = None, + offset: int | None = None, + limit: int | None = None, + short_name: str | None = None, + country_name: str | None = None, + ) -> list[facility_models.Location]: + + locs = self.locations + + if name: + locs = [l for l in locs if name.lower() in l.name.lower()] + + if short_name: + locs = [l for l in locs if l.short_name == short_name] + + if country_name: + locs = [l for l in locs if l.country_name == country_name] + + if modified_since: + ms = datetime.datetime.fromisoformat(str(modified_since)) + locs = [l for l in locs if l.last_modified > ms] + + o = offset or 0 + l = limit or len(locs) + return locs[o:o+l] + + + async def get_location( + self: "DemoAdapter", + location_id: str, + modified_since: str | None = None, + ) -> facility_models.Location: + + location = next((l for l in self.locations if l.id == location_id), None) + + if not location: + raise HTTPException(status_code=404, detail="Location not found") + + if modified_since: + ms = datetime.datetime.fromisoformat(str(modified_since)) + if location.last_modified <= ms: + raise HTTPException(status_code=304, headers={"Last-Modified": location.last_modified.isoformat()}) + return location + + # ---------------------------- + # Status API + # ---------------------------- async def get_resources( self : "DemoAdapter", diff --git a/app/main.py b/app/main.py index be5feaa..080645e 100644 --- a/app/main.py +++ b/app/main.py @@ -2,8 +2,11 @@ """Main API application""" import logging from fastapi import FastAPI +from fastapi import Request +from fastapi.routing import APIRoute from app.routers.error_handlers import install_error_handlers +from app.routers.facility import facility from app.routers.status import status from app.routers.account import account from app.routers.compute import compute @@ -19,11 +22,39 @@ api_prefix = f"{config.API_PREFIX}{config.API_URL}" +@APP.get(api_prefix) +async def api_discovery(request: Request): + base = str(request.base_url).rstrip("/") + items = [] + for route in APP.router.routes: + if not isinstance(route, APIRoute): + continue + # skip docs & openapi + if route.path.startswith("/docs") or route.path.startswith("/openapi"): + continue + for method in route.methods: + if method == "HEAD" or method == "OPTIONS": + continue + items.append({ + "id": route.name or f"{method}_{route.path}", + "method": method, + "path": route.path, + "_links": [ + { + "rel": "self", + "href": f"{base.rstrip('/')}{route.path}", + "type": "application/json" + } + ] + }) + return items + # Attach routers under the prefix +APP.include_router(facility.router, prefix=api_prefix) APP.include_router(status.router, prefix=api_prefix) APP.include_router(account.router, prefix=api_prefix) APP.include_router(compute.router, prefix=api_prefix) APP.include_router(filesystem.router, prefix=api_prefix) APP.include_router(task.router, prefix=api_prefix) -logging.getLogger().info(f"API path: {api_prefix}") +logging.getLogger().info(f"API path: {api_prefix}") \ No newline at end of file diff --git a/app/routers/account/account.py b/app/routers/account/account.py index 951fc9b..508d556 100644 --- a/app/routers/account/account.py +++ b/app/routers/account/account.py @@ -21,6 +21,7 @@ ) async def get_capabilities( request : Request, + _forbid = Depends(iri_router.forbidExtraQueryParams()), ) -> list[models.Capability]: return await router.adapter.get_capabilities() @@ -35,6 +36,7 @@ async def get_capabilities( async def get_capability( capability_id : str, request : Request, + _forbid = Depends(iri_router.forbidExtraQueryParams()), ) -> models.Capability: caps = await router.adapter.get_capabilities() cc = next((c for c in caps if c.id == capability_id), None) @@ -53,6 +55,7 @@ async def get_capability( ) async def get_projects( request : Request, + _forbid = Depends(iri_router.forbidExtraQueryParams()), ) -> list[models.Project]: user = await router.adapter.get_user(request.state.current_user_id, request.state.api_key, iri_router.get_client_ip(request)) if not user: @@ -71,6 +74,7 @@ async def get_projects( async def get_project( project_id : str, request : Request, + _forbid = Depends(iri_router.forbidExtraQueryParams()), ) -> models.Project: user = await router.adapter.get_user(request.state.current_user_id, request.state.api_key, iri_router.get_client_ip(request)) if not user: @@ -93,6 +97,7 @@ async def get_project( async def get_project_allocations( project_id: str, request : Request, + _forbid = Depends(iri_router.forbidExtraQueryParams()), ) -> list[models.ProjectAllocation]: user = await router.adapter.get_user(request.state.current_user_id, request.state.api_key, iri_router.get_client_ip(request)) if not user: @@ -116,6 +121,7 @@ async def get_project_allocation( project_id: str, project_allocation_id : str, request : Request, + _forbid = Depends(iri_router.forbidExtraQueryParams()), ) -> models.ProjectAllocation: user = await router.adapter.get_user(request.state.current_user_id, request.state.api_key, iri_router.get_client_ip(request)) if not user: @@ -141,6 +147,7 @@ async def get_user_allocations( project_id: str, project_allocation_id : str, request : Request, + _forbid = Depends(iri_router.forbidExtraQueryParams()), ) -> list[models.UserAllocation]: user = await router.adapter.get_user(request.state.current_user_id, request.state.api_key, iri_router.get_client_ip(request)) if not user: @@ -169,6 +176,7 @@ async def get_user_allocation( project_allocation_id : str, user_allocation_id : str, request : Request, + _forbid = Depends(iri_router.forbidExtraQueryParams()), ) -> models.UserAllocation: user = await router.adapter.get_user(request.state.current_user_id, request.state.api_key, iri_router.get_client_ip(request)) if not user: diff --git a/app/routers/compute/compute.py b/app/routers/compute/compute.py index e7481ac..72a8169 100644 --- a/app/routers/compute/compute.py +++ b/app/routers/compute/compute.py @@ -154,8 +154,8 @@ async def get_job_status( async def get_job_statuses( resource_id : str, request : Request, - offset : int = Query(default=0, ge=0), - limit : int = Query(default=100, le=10000), + offset : int = Query(default=0, ge=0, le=1000), + limit : int = Query(default=100, ge=0, le=1000), filters : dict[str, object] | None = None, historical : bool = False, include_spec: bool = False, diff --git a/app/routers/error_handlers.py b/app/routers/error_handlers.py index 09769ec..337b5fc 100644 --- a/app/routers/error_handlers.py +++ b/app/routers/error_handlers.py @@ -65,6 +65,12 @@ async def validation_error_handler(request: Request, exc: RequestValidationError @app.exception_handler(HTTPException) async def http_exception_handler(request: Request, exc: HTTPException): + if exc.status_code == 304: + return JSONResponse( + status_code=304, + content=None, + headers=exc.headers or {}) + if exc.status_code == 401: return problem_response( request=request, diff --git a/app/routers/facility/__init__.py b/app/routers/facility/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/app/routers/facility/facility.py b/app/routers/facility/facility.py new file mode 100644 index 0000000..9964925 --- /dev/null +++ b/app/routers/facility/facility.py @@ -0,0 +1,77 @@ +from fastapi import Request, HTTPException, Depends, Query +from .. import iri_router +from ..error_handlers import DEFAULT_RESPONSES +from .import models, facility_adapter + + +router = iri_router.IriRouter( + facility_adapter.FacilityAdapter, + prefix="/facility", + tags=["facility"], +) + +@router.get("", responses=DEFAULT_RESPONSES) +async def get_facility( + request: Request, + modified_since: iri_router.StrictDateTime = Query(default=None), + _forbid = Depends(iri_router.forbidExtraQueryParams("modified_since")), + ) -> models.Facility: + """Get facility information""" + return await router.adapter.get_facility(modified_since=modified_since) + +@router.get("/sites", responses=DEFAULT_RESPONSES) +async def list_sites( + request: Request, + modified_since: iri_router.StrictDateTime = Query(default=None), + name: str = Query(default=None, min_length=1), + offset: int = Query(default=0, ge=0, le=1000), + limit: int = Query(default=100, ge=0, le=1000), + short_name: str = Query(default=None, min_length=1), + _forbid = Depends(iri_router.forbidExtraQueryParams("modified_since", "name", "offset", "limit", "short_name")), + )-> list[models.Site]: + """List sites""" + return await router.adapter.list_sites(modified_since=modified_since, name=name, offset=offset, limit=limit, short_name=short_name) + +@router.get("/sites/{site_id}", responses=DEFAULT_RESPONSES) +async def get_site( + request: Request, + site_id: str, + modified_since: iri_router.StrictDateTime = Query(default=None), + _forbid = Depends(iri_router.forbidExtraQueryParams("modified_since")), + )-> models.Site: + """Get site by ID""" + return await router.adapter.get_site(site_id=site_id, modified_since=modified_since) + +@router.get("/sites/{site_id}/location", responses=DEFAULT_RESPONSES) +async def get_site_location( + request : Request, + site_id: str, + modified_since: iri_router.StrictDateTime = Query(default=None), + _forbid = Depends(iri_router.forbidExtraQueryParams("modified_since")), + )-> models.Location: + """Get site location by site ID""" + return await router.adapter.get_site_location(site_id=site_id, modified_since=modified_since) + +@router.get("/locations", responses=DEFAULT_RESPONSES) +async def list_locations( + request : Request, + modified_since: iri_router.StrictDateTime = Query(default=None), + name: str = Query(default=None, min_length=1), + offset: int = Query(default=0, ge=0, le=1000), + limit: int = Query(default=100, ge=0, le=1000), + short_name: str = Query(default=None, min_length=1), + country_name: str = Query(default=None, min_length=1), + _forbid = Depends(iri_router.forbidExtraQueryParams("modified_since", "name", "offset", "limit", "short_name", "country_name")), + )-> list[models.Location]: + """List locations""" + return await router.adapter.list_locations(modified_since=modified_since, name=name, offset=offset, limit=limit, short_name=short_name, country_name=country_name) + +@router.get("/locations/{location_id}", responses=DEFAULT_RESPONSES) +async def get_location( + request : Request, + location_id: str, + modified_since: iri_router.StrictDateTime = Query(default=None), + _forbid = Depends(iri_router.forbidExtraQueryParams("modified_since")), + )-> models.Location: + """Get location by ID""" + return await router.adapter.get_location(location_id=location_id, modified_since=modified_since) \ No newline at end of file diff --git a/app/routers/facility/facility_adapter.py b/app/routers/facility/facility_adapter.py new file mode 100644 index 0000000..d316674 --- /dev/null +++ b/app/routers/facility/facility_adapter.py @@ -0,0 +1,65 @@ +from abc import abstractmethod +from . import models as facility_models +from ..iri_router import AuthenticatedAdapter + + +class FacilityAdapter(AuthenticatedAdapter): + """ + Facility-specific code is handled by the implementation of this interface. + Use the `IRI_API_ADAPTER` environment variable (defaults to `app.demo_adapter.FacilityAdapter`) + to install your facility adapter before the API starts. + """ + + @abstractmethod + async def get_facility( + self: "FacilityAdapter", + modified_since: str | None = None, + ) -> facility_models.Facility | None: + pass + + @abstractmethod + async def list_sites( + self: "FacilityAdapter", + modified_since: str | None = None, + name: str | None = None, + offset: int | None = None, + limit: int | None = None, + short_name: str | None = None, + ) -> list[facility_models.Site]: + pass + + @abstractmethod + async def get_site( + self: "FacilityAdapter", + site_id: str, + modified_since: str | None = None, + ) -> facility_models.Site | None: + pass + + @abstractmethod + async def get_site_location( + self: "FacilityAdapter", + site_id: str, + modified_since: str | None = None, + ) -> facility_models.Location | None: + pass + + @abstractmethod + async def list_locations( + self: "FacilityAdapter", + modified_since: str | None = None, + name: str | None = None, + offset: int | None = None, + limit: int | None = None, + short_name: str | None = None, + country_name: str | None = None, + ) -> list[facility_models.Location]: + pass + + @abstractmethod + async def get_location( + self: "FacilityAdapter", + location_id: str, + modified_since: str | None = None, + ) -> facility_models.Location | None: + pass diff --git a/app/routers/facility/models.py b/app/routers/facility/models.py new file mode 100644 index 0000000..0c04cc4 --- /dev/null +++ b/app/routers/facility/models.py @@ -0,0 +1,58 @@ +from datetime import datetime +from uuid import UUID +from typing import List, Optional +from pydantic import BaseModel, Field, HttpUrl, computed_field +from .. import iri_router +from ... import config + +class NamedObject(BaseModel): + id: str = Field(..., description="The unique identifier for the object. Typically a UUID or URN.") + def _self_path(self) -> str: + raise NotImplementedError + @computed_field(description="The canonical URL of this object") + @property + def self_uri(self) -> str: + return f"{config.API_URL_ROOT}{config.API_PREFIX}{config.API_URL}{self._self_path()}" + + name: Optional[str] = Field(None, description="The long name of the object.") + description: Optional[str] = Field(None, description="Human-readable description of the object.") + last_modified: iri_router.StrictDateTime = Field(..., description="ISO 8601 timestamp when this object was last modified.") + + +class Site(NamedObject): + def _self_path(self) -> str: + return f"/facility/sites/{self.id}" + short_name: Optional[str] = Field(None, description="Common or short name of the Site.") + operating_organization: str = Field(..., description="Organization operating the Site.") + location_uri: Optional[HttpUrl] = Field(None, description="URI of Location containing this Site.") + resource_uris: List[HttpUrl] = Field(default_factory=list, description="URIs of Resources hosted at this Site.") + +class Location(NamedObject): + def _self_path(self) -> str: + return f"/facility/locations/{self.id}" + short_name: Optional[str] = Field(None, description="Common or short name of the Location.") + country_name: Optional[str] = Field(None, description="Country name of the Location.") + locality_name: Optional[str] = Field(None, description="City or locality name of the Location.") + state_or_province_name: Optional[str] = Field(None, description="State or province name of the Location.") + street_address: Optional[str] = Field(None, description="Street address of the Location.") + unlocode: Optional[str] = Field(None, description="United Nations trade and transport location code.") + altitude: Optional[float] = Field(None, description="Altitude of the Location.") + latitude: Optional[float] = Field(None, description="Latitude of the Location.") + longitude: Optional[float] = Field(None, description="Longitude of the Location.") + site_uris: List[HttpUrl] = Field(default_factory=list, description="URIs of Sites contained in this Location.") + +class Facility(NamedObject): + def _self_path(self) -> str: + return f"/facility/facilities/{self.id}" + short_name: Optional[str] = Field(None, description="Common or short name of the Facility.") + organization_name: Optional[str] = Field(None, description="Operating organization’s name.") + support_uri: Optional[HttpUrl] = Field(None, description="Link to facility support portal.") + site_uris: List[HttpUrl] = Field(default_factory=list, description="URIs of associated Sites.") + location_uris: List[HttpUrl] = Field(default_factory=list, description="URIs of associated Locations.") + resource_uris: List[HttpUrl] = Field(default_factory=list, description="URIs of contained Resources.") + event_uris: List[HttpUrl] = Field(default_factory=list, description="URIs of Events in this Facility.") + incident_uris: List[HttpUrl] = Field(default_factory=list, description="URIs of Incidents in this Facility.") + capability_uris: List[HttpUrl] = Field(default_factory=list, description="URIs of Capabilities offered by the Facility.") + project_uris: List[HttpUrl] = Field(default_factory=list, description="URIs of Projects associated with this Facility.") + project_allocation_uris: List[HttpUrl] = Field(default_factory=list, description="URIs of Project Allocations.") + user_allocation_uris: List[HttpUrl] = Field(default_factory=list, description="URIs of User Allocations.") diff --git a/app/routers/iri_router.py b/app/routers/iri_router.py index dafb970..2de7e69 100644 --- a/app/routers/iri_router.py +++ b/app/routers/iri_router.py @@ -3,11 +3,13 @@ import logging import importlib import datetime +from urllib.parse import parse_qs from fastapi import Request, Depends, HTTPException, APIRouter from fastapi.security import APIKeyHeader from pydantic_core import core_schema from .account.models import User + bearer_token = APIKeyHeader(name="Authorization") @@ -128,17 +130,33 @@ async def get_user( def forbidExtraQueryParams(*allowedParams: str): - """Dependency to forbid extra query parameters not in allowedParams.""" - - async def checker(_req: Request): + async def checker(req: Request): if "*" in allowedParams: - return # Permit anything - incoming = set(_req.query_params.keys()) + return + + raw_qs = req.scope.get("query_string", b"") + parsed = parse_qs(raw_qs.decode("utf-8", errors="strict"), keep_blank_values=True) + allowed = set(allowedParams) - unknown = incoming - allowed - if unknown: - raise HTTPException(status_code=422, - detail=[{"type": "extra_forbidden", "loc": ["query", param], "msg": f"Unexpected query parameter: {param}"} for param in unknown]) + + for key, values in parsed.items(): + if key not in allowed: + raise HTTPException( + status_code=422, + detail=[{ + "type": "extra_forbidden", + "loc": ["query", key], + "msg": f"Unexpected query parameter: {key}" + }]) + + if len(values) > 1: + raise HTTPException( + status_code=422, + detail=[{ + "type": "duplicate_forbidden", + "loc": ["query", key], + "msg": f"Duplicate query parameter: {key}" + }]) return checker class StrictDateTime: From 3e8b0b287594b23ebc07357af511a7f1c9e8dd06 Mon Sep 17 00:00:00 2001 From: Justas Balcas Date: Thu, 15 Jan 2026 07:50:47 -0600 Subject: [PATCH 02/22] Make NamedObject reusable --- app/routers/facility/models.py | 22 ++------- app/routers/models.py | 46 +++++++++++++++++++ app/routers/status/models.py | 82 +++++++++------------------------- 3 files changed, 69 insertions(+), 81 deletions(-) create mode 100644 app/routers/models.py diff --git a/app/routers/facility/models.py b/app/routers/facility/models.py index 0c04cc4..2bea62f 100644 --- a/app/routers/facility/models.py +++ b/app/routers/facility/models.py @@ -1,23 +1,7 @@ -from datetime import datetime -from uuid import UUID +"""Facility-related models.""" from typing import List, Optional -from pydantic import BaseModel, Field, HttpUrl, computed_field -from .. import iri_router -from ... import config - -class NamedObject(BaseModel): - id: str = Field(..., description="The unique identifier for the object. Typically a UUID or URN.") - def _self_path(self) -> str: - raise NotImplementedError - @computed_field(description="The canonical URL of this object") - @property - def self_uri(self) -> str: - return f"{config.API_URL_ROOT}{config.API_PREFIX}{config.API_URL}{self._self_path()}" - - name: Optional[str] = Field(None, description="The long name of the object.") - description: Optional[str] = Field(None, description="Human-readable description of the object.") - last_modified: iri_router.StrictDateTime = Field(..., description="ISO 8601 timestamp when this object was last modified.") - +from pydantic import Field, HttpUrl +from ..models import NamedObject class Site(NamedObject): def _self_path(self) -> str: diff --git a/app/routers/models.py b/app/routers/models.py new file mode 100644 index 0000000..f9a1c00 --- /dev/null +++ b/app/routers/models.py @@ -0,0 +1,46 @@ +"""Default models used by multiple routers.""" +import datetime +from typing import Optional +from pydantic import BaseModel, Field, computed_field +from . import iri_router +from .. import config + + +class NamedObject(BaseModel): + id: str = Field(..., description="The unique identifier for the object. Typically a UUID or URN.") + def _self_path(self) -> str: + raise NotImplementedError + + @computed_field(description="The canonical URL of this object") + @property + def self_uri(self) -> str: + """Computed self URI property.""" + return f"{config.API_URL_ROOT}{config.API_PREFIX}{config.API_URL}{self._self_path()}" + + name: Optional[str] = Field(None, description="The long name of the object.") + description: Optional[str] = Field(None, description="Human-readable description of the object.") + last_modified: iri_router.StrictDateTime = Field(..., description="ISO 8601 timestamp when this object was last modified.") + + @staticmethod + def find_by_id(a, id, allow_name: bool|None=False): + # Find a resource by its id. + # If allow_name is True, the id parameter can also match the resource's name. + return next((r for r in a if r.id == id or (allow_name and r.name == id)), None) + + + @staticmethod + def find(a, name, description, modified_since): + def normalize(dt: datetime) -> datetime: + # Convert naive datetimes into UTC-aware versions + if dt.tzinfo is None: + return dt.replace(tzinfo=datetime.timezone.utc) + return dt + if name: + a = [aa for aa in a if aa.name == name] + if description: + a = [aa for aa in a if description in aa.description] + if modified_since: + if modified_since.tzinfo is None: + modified_since = modified_since.replace(tzinfo=datetime.timezone.utc) + a = [aa for aa in a if normalize(aa.last_modified) >= modified_since] + return a diff --git a/app/routers/status/models.py b/app/routers/status/models.py index b1f3a8b..2c7dc76 100644 --- a/app/routers/status/models.py +++ b/app/routers/status/models.py @@ -2,6 +2,7 @@ import enum from pydantic import BaseModel, computed_field, Field from ... import config +from ..models import NamedObject class Link(BaseModel): rel : str @@ -15,38 +16,6 @@ class Status(enum.Enum): unknown = "unknown" -class NamedResource(BaseModel): - id : str - name : str - description : str - last_modified : datetime.datetime - - - @staticmethod - def find_by_id(a, id, allow_name: bool|None=False): - # Find a resource by its id. - # If allow_name is True, the id parameter can also match the resource's name. - return next((r for r in a if r.id == id or (allow_name and r.name == id)), None) - - - @staticmethod - def find(a, name, description, modified_since): - def normalize(dt: datetime) -> datetime: - # Convert naive datetimes into UTC-aware versions - if dt.tzinfo is None: - return dt.replace(tzinfo=datetime.timezone.utc) - return dt - if name: - a = [aa for aa in a if aa.name == name] - if description: - a = [aa for aa in a if description in aa.description] - if modified_since: - if modified_since.tzinfo is None: - modified_since = modified_since.replace(tzinfo=datetime.timezone.utc) - a = [aa for aa in a if normalize(aa.last_modified) >= modified_since] - return a - - class ResourceType(enum.Enum): website = "website" service = "service" @@ -57,28 +26,24 @@ class ResourceType(enum.Enum): unknown = "unknown" -class Resource(NamedResource): +class Resource(NamedObject): + + def _self_path(self) -> str: + return f"/status/resources/{self.id}" + capability_ids: list[str] = Field(exclude=True) group: str | None current_status: Status | None = Field("The current status comes from the status of the last event for this resource") resource_type: ResourceType - - @computed_field(description="The url of this object") - @property - def self_uri(self) -> str: - return f"{config.API_URL_ROOT}{config.API_PREFIX}{config.API_URL}/status/resources/{self.id}" - - @computed_field(description="The list of past events in this incident") @property def capability_uris(self) -> list[str]: return [f"{config.API_URL_ROOT}{config.API_PREFIX}{config.API_URL}/account/capabilities/{e}" for e in self.capability_ids] - @staticmethod def find(resources, name, description, group, modified_since, resource_type): - a = NamedResource.find(resources, name, description, modified_since) + a = NamedObject.find(resources, name, description, modified_since) if group: a = [aa for aa in a if aa.group == group] if resource_type: @@ -86,25 +51,21 @@ def find(resources, name, description, group, modified_since, resource_type): return a -class Event(NamedResource): +class Event(NamedObject): + + def _self_path(self) -> str: + return f"/status/incidents/{self.incident_id}/events/{self.id}" + occurred_at : datetime.datetime status : Status resource_id : str = Field(exclude=True) incident_id : str | None = Field(exclude=True, default=None) - - @computed_field(description="The url of this object") - @property - def self_uri(self) -> str: - return f"{config.API_URL_ROOT}{config.API_PREFIX}{config.API_URL}/status/incidents/{self.incident_id}/events/{self.id}" - - @computed_field(description="The resource belonging to this event") @property def resource_uri(self) -> str: return f"{config.API_URL_ROOT}{config.API_PREFIX}{config.API_URL}/status/resources/{self.resource_id}" - @computed_field(description="The event's incident") @property def incident_uri(self) -> str|None: @@ -123,7 +84,7 @@ def find( time_ : datetime.datetime | None = None, modified_since : datetime.datetime | None = None, ) -> list: - events = NamedResource.find(events, name, description, modified_since) + events = NamedObject.find(events, name, description, modified_since) if resource_id: events = [e for e in events if e.resource_id == resource_id] if status: @@ -150,7 +111,11 @@ class Resolution(enum.Enum): pending = "pending" -class Incident(NamedResource): +class Incident(NamedObject): + + def _self_path(self) -> str: + return f"/status/incidents/{self.id}" + status : Status resource_ids : list[str] = Field(exclude=True) event_ids : list[str] = Field(exclude=True) @@ -159,25 +124,18 @@ class Incident(NamedResource): type : IncidentType resolution : Resolution - - @computed_field(description="The url of this object") - @property - def self_uri(self) -> str: - return f"{config.API_URL_ROOT}{config.API_PREFIX}{config.API_URL}/status/incidents/{self.id}" - - @computed_field(description="The list of past events in this incident") @property def event_uris(self) -> list[str]: return [f"{config.API_URL_ROOT}{config.API_PREFIX}{config.API_URL}/status/incidents/{self.id}/events/{e}" for e in self.event_ids] - @computed_field(description="The list of resources that may be impacted by this incident") @property def resource_uris(self) -> list[str]: return [f"{config.API_URL_ROOT}{config.API_PREFIX}{config.API_URL}/status/resources/{r}" for r in self.resource_ids] def find( + self, incidents : list, name : str | None = None, description : str | None = None, @@ -189,7 +147,7 @@ def find( modified_since : datetime.datetime | None = None, resource_id : str | None = None, ) -> list: - incidents = NamedResource.find(incidents, name, description, modified_since) + incidents = NamedObject.find(incidents, name, description, modified_since) if resource_id: incidents = [e for e in incidents if resource_id in e.resource_ids] if status: From cf79917c7994ba62c0624ed8f03961acdc5736f1 Mon Sep 17 00:00:00 2001 From: Justas Balcas Date: Thu, 15 Jan 2026 08:16:21 -0600 Subject: [PATCH 03/22] Include operation_id for facility (similar to pull request #21) --- app/routers/facility/facility.py | 12 ++++++------ app/routers/status/models.py | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/routers/facility/facility.py b/app/routers/facility/facility.py index 9964925..0e6f960 100644 --- a/app/routers/facility/facility.py +++ b/app/routers/facility/facility.py @@ -10,7 +10,7 @@ tags=["facility"], ) -@router.get("", responses=DEFAULT_RESPONSES) +@router.get("", responses=DEFAULT_RESPONSES, operation_id="getFacility") async def get_facility( request: Request, modified_since: iri_router.StrictDateTime = Query(default=None), @@ -19,7 +19,7 @@ async def get_facility( """Get facility information""" return await router.adapter.get_facility(modified_since=modified_since) -@router.get("/sites", responses=DEFAULT_RESPONSES) +@router.get("/sites", responses=DEFAULT_RESPONSES, operation_id="getSites") async def list_sites( request: Request, modified_since: iri_router.StrictDateTime = Query(default=None), @@ -32,7 +32,7 @@ async def list_sites( """List sites""" return await router.adapter.list_sites(modified_since=modified_since, name=name, offset=offset, limit=limit, short_name=short_name) -@router.get("/sites/{site_id}", responses=DEFAULT_RESPONSES) +@router.get("/sites/{site_id}", responses=DEFAULT_RESPONSES, operation_id="getSite") async def get_site( request: Request, site_id: str, @@ -42,7 +42,7 @@ async def get_site( """Get site by ID""" return await router.adapter.get_site(site_id=site_id, modified_since=modified_since) -@router.get("/sites/{site_id}/location", responses=DEFAULT_RESPONSES) +@router.get("/sites/{site_id}/location", responses=DEFAULT_RESPONSES, operation_id="getLocationBySite") async def get_site_location( request : Request, site_id: str, @@ -52,7 +52,7 @@ async def get_site_location( """Get site location by site ID""" return await router.adapter.get_site_location(site_id=site_id, modified_since=modified_since) -@router.get("/locations", responses=DEFAULT_RESPONSES) +@router.get("/locations", responses=DEFAULT_RESPONSES, operation_id="getLocations") async def list_locations( request : Request, modified_since: iri_router.StrictDateTime = Query(default=None), @@ -66,7 +66,7 @@ async def list_locations( """List locations""" return await router.adapter.list_locations(modified_since=modified_since, name=name, offset=offset, limit=limit, short_name=short_name, country_name=country_name) -@router.get("/locations/{location_id}", responses=DEFAULT_RESPONSES) +@router.get("/locations/{location_id}", responses=DEFAULT_RESPONSES, operation_id="getLocation") async def get_location( request : Request, location_id: str, diff --git a/app/routers/status/models.py b/app/routers/status/models.py index 2c7dc76..bb1f87b 100644 --- a/app/routers/status/models.py +++ b/app/routers/status/models.py @@ -134,8 +134,8 @@ def event_uris(self) -> list[str]: def resource_uris(self) -> list[str]: return [f"{config.API_URL_ROOT}{config.API_PREFIX}{config.API_URL}/status/resources/{r}" for r in self.resource_ids] + @staticmethod def find( - self, incidents : list, name : str | None = None, description : str | None = None, From 0d68a1ca0e5e9ff9b0bc590c85d316009d7c4039 Mon Sep 17 00:00:00 2001 From: Gabor Torok Date: Thu, 15 Jan 2026 11:48:45 -0800 Subject: [PATCH 04/22] simplified facility endpoint proposal --- app/demo_adapter.py | 184 +---------------------- app/routers/facility/facility.py | 57 ------- app/routers/facility/facility_adapter.py | 47 ------ app/routers/facility/models.py | 33 +--- 4 files changed, 14 insertions(+), 307 deletions(-) diff --git a/app/demo_adapter.py b/app/demo_adapter.py index daf266d..2d2ca30 100644 --- a/app/demo_adapter.py +++ b/app/demo_adapter.py @@ -65,50 +65,7 @@ def __init__(self): def _init_state(self): now = datetime.datetime.now(datetime.timezone.utc) - loc1 = facility_models.Location( - id=demo_uuid("location", "demo_location_1"), - name="Demo Location 1", - description="The first demo location", - last_modified=now, - short_name="DL1", - country_name="USA", - locality_name="Demo City", - state_or_province_name="DC", - latitude=36.173357, - longitude=-234.51452) - - loc2 = facility_models.Location( - id=demo_uuid("location", "demo_location_2"), - name="Demo Location 2", - description="The second demo location", - last_modified=now, - short_name="DL2", - country_name="USA", - locality_name="Example Town", - state_or_province_name="ET", - latitude=38.410558, - longitude=-286.36999) - - site1 = facility_models.Site( - id=demo_uuid("site", "demo_site_1"), - name="Demo Site 1", - description="The first demo site", - last_modified=now, - short_name="DS1", - operating_organization="Demo Org", - location_uri=loc1.self_uri, - resource_uris=[]) - site2 = facility_models.Site( - id=demo_uuid("site", "demo_site_2"), - name="Demo Site 2", - description="The second demo site", - last_modified=now, - short_name="DS2", - operating_organization="Demo Org", - location_uri=loc2.self_uri, - resource_uris=[]) - - facility = facility_models.Facility( + self.facility = facility_models.Facility( id=demo_uuid("facility", "demo_facility"), name="Demo Facility", description="A demo facility for testing the IRI Facility API", @@ -116,24 +73,15 @@ def _init_state(self): short_name="DEMO", organization_name="Demo Organization", support_uri="https://support.demo.example", - site_uris=[site1.self_uri, site2.self_uri], - location_uris=[loc1.self_uri, loc2.self_uri], - resource_uris=[], - event_uris=[], - incident_uris=[], - capability_uris=[], - project_uris=[], - project_allocation_uris=[], - user_allocation_uris=[], + facility_uri="https://www.demo.example", + country_name="USA", + locality_name="Example Town", + state_or_province_name="ET", + street_address="1 main st", + latitude=38.410558, + longitude=-286.36999 ) - self.facility = facility - loc1.site_uris.append(site1.self_uri) - loc2.site_uris.append(site2.self_uri) - self.locations = [loc1, loc2] - self.sites = [site1, site2] - - day_ago = datetime.datetime.now(datetime.timezone.utc) - datetime.timedelta(days=1) self.capabilities = { "cpu": account_models.Capability(id=str(uuid.uuid4()), name="CPU Nodes", units=[account_models.AllocationUnit.node_hours]), @@ -269,122 +217,6 @@ async def get_facility( ) -> facility_models.Facility: return self.facility - - async def list_sites( - self: "DemoAdapter", - modified_since: str | None = None, - name: str | None = None, - offset: int | None = None, - limit: int | None = None, - short_name: str | None = None, - ) -> list[facility_models.Site]: - - sites = self.sites - - if name: - sites = [s for s in sites if name.lower() in s.name.lower()] - - if short_name: - sites = [s for s in sites if s.short_name == short_name] - - if modified_since: - ms = datetime.datetime.fromisoformat(str(modified_since)) - sites = [s for s in sites if s.last_modified > ms] - - o = offset or 0 - l = limit or len(sites) - return sites[o:o+l] - - - async def get_site( - self: "DemoAdapter", - site_id: str, - modified_since: str | None = None, - ) -> facility_models.Site: - - site = next((s for s in self.sites if s.id == site_id), None) - if not site: - raise HTTPException(status_code=404, detail="Site not found") - - if modified_since: - ms = datetime.datetime.fromisoformat(str(modified_since)) - if site.last_modified <= ms: - raise HTTPException(status_code=304, headers={"Last-Modified": site.last_modified.isoformat()}) - - return site - - - async def get_site_location( - self: "DemoAdapter", - site_id: str, - modified_since: str | None = None, - ) -> facility_models.Location: - - site = await self.get_site(site_id) - - if not site.location_uri: - raise HTTPException(status_code=404, detail="Site has no location") - - location = next((l for l in self.locations if l.self_uri == str(site.location_uri)), None) - - if not location: - raise HTTPException(status_code=404, detail="Location not found") - - if modified_since: - ms = datetime.datetime.fromisoformat(str(modified_since)) - if location.last_modified <= ms: - raise HTTPException(status_code=304, headers={"Last-Modified": location.last_modified.isoformat()}) - - return location - - - async def list_locations( - self: "DemoAdapter", - modified_since: str | None = None, - name: str | None = None, - offset: int | None = None, - limit: int | None = None, - short_name: str | None = None, - country_name: str | None = None, - ) -> list[facility_models.Location]: - - locs = self.locations - - if name: - locs = [l for l in locs if name.lower() in l.name.lower()] - - if short_name: - locs = [l for l in locs if l.short_name == short_name] - - if country_name: - locs = [l for l in locs if l.country_name == country_name] - - if modified_since: - ms = datetime.datetime.fromisoformat(str(modified_since)) - locs = [l for l in locs if l.last_modified > ms] - - o = offset or 0 - l = limit or len(locs) - return locs[o:o+l] - - - async def get_location( - self: "DemoAdapter", - location_id: str, - modified_since: str | None = None, - ) -> facility_models.Location: - - location = next((l for l in self.locations if l.id == location_id), None) - - if not location: - raise HTTPException(status_code=404, detail="Location not found") - - if modified_since: - ms = datetime.datetime.fromisoformat(str(modified_since)) - if location.last_modified <= ms: - raise HTTPException(status_code=304, headers={"Last-Modified": location.last_modified.isoformat()}) - return location - # ---------------------------- # Status API # ---------------------------- diff --git a/app/routers/facility/facility.py b/app/routers/facility/facility.py index 0e6f960..9b7545b 100644 --- a/app/routers/facility/facility.py +++ b/app/routers/facility/facility.py @@ -18,60 +18,3 @@ async def get_facility( ) -> models.Facility: """Get facility information""" return await router.adapter.get_facility(modified_since=modified_since) - -@router.get("/sites", responses=DEFAULT_RESPONSES, operation_id="getSites") -async def list_sites( - request: Request, - modified_since: iri_router.StrictDateTime = Query(default=None), - name: str = Query(default=None, min_length=1), - offset: int = Query(default=0, ge=0, le=1000), - limit: int = Query(default=100, ge=0, le=1000), - short_name: str = Query(default=None, min_length=1), - _forbid = Depends(iri_router.forbidExtraQueryParams("modified_since", "name", "offset", "limit", "short_name")), - )-> list[models.Site]: - """List sites""" - return await router.adapter.list_sites(modified_since=modified_since, name=name, offset=offset, limit=limit, short_name=short_name) - -@router.get("/sites/{site_id}", responses=DEFAULT_RESPONSES, operation_id="getSite") -async def get_site( - request: Request, - site_id: str, - modified_since: iri_router.StrictDateTime = Query(default=None), - _forbid = Depends(iri_router.forbidExtraQueryParams("modified_since")), - )-> models.Site: - """Get site by ID""" - return await router.adapter.get_site(site_id=site_id, modified_since=modified_since) - -@router.get("/sites/{site_id}/location", responses=DEFAULT_RESPONSES, operation_id="getLocationBySite") -async def get_site_location( - request : Request, - site_id: str, - modified_since: iri_router.StrictDateTime = Query(default=None), - _forbid = Depends(iri_router.forbidExtraQueryParams("modified_since")), - )-> models.Location: - """Get site location by site ID""" - return await router.adapter.get_site_location(site_id=site_id, modified_since=modified_since) - -@router.get("/locations", responses=DEFAULT_RESPONSES, operation_id="getLocations") -async def list_locations( - request : Request, - modified_since: iri_router.StrictDateTime = Query(default=None), - name: str = Query(default=None, min_length=1), - offset: int = Query(default=0, ge=0, le=1000), - limit: int = Query(default=100, ge=0, le=1000), - short_name: str = Query(default=None, min_length=1), - country_name: str = Query(default=None, min_length=1), - _forbid = Depends(iri_router.forbidExtraQueryParams("modified_since", "name", "offset", "limit", "short_name", "country_name")), - )-> list[models.Location]: - """List locations""" - return await router.adapter.list_locations(modified_since=modified_since, name=name, offset=offset, limit=limit, short_name=short_name, country_name=country_name) - -@router.get("/locations/{location_id}", responses=DEFAULT_RESPONSES, operation_id="getLocation") -async def get_location( - request : Request, - location_id: str, - modified_since: iri_router.StrictDateTime = Query(default=None), - _forbid = Depends(iri_router.forbidExtraQueryParams("modified_since")), - )-> models.Location: - """Get location by ID""" - return await router.adapter.get_location(location_id=location_id, modified_since=modified_since) \ No newline at end of file diff --git a/app/routers/facility/facility_adapter.py b/app/routers/facility/facility_adapter.py index d316674..bccdcfe 100644 --- a/app/routers/facility/facility_adapter.py +++ b/app/routers/facility/facility_adapter.py @@ -16,50 +16,3 @@ async def get_facility( modified_since: str | None = None, ) -> facility_models.Facility | None: pass - - @abstractmethod - async def list_sites( - self: "FacilityAdapter", - modified_since: str | None = None, - name: str | None = None, - offset: int | None = None, - limit: int | None = None, - short_name: str | None = None, - ) -> list[facility_models.Site]: - pass - - @abstractmethod - async def get_site( - self: "FacilityAdapter", - site_id: str, - modified_since: str | None = None, - ) -> facility_models.Site | None: - pass - - @abstractmethod - async def get_site_location( - self: "FacilityAdapter", - site_id: str, - modified_since: str | None = None, - ) -> facility_models.Location | None: - pass - - @abstractmethod - async def list_locations( - self: "FacilityAdapter", - modified_since: str | None = None, - name: str | None = None, - offset: int | None = None, - limit: int | None = None, - short_name: str | None = None, - country_name: str | None = None, - ) -> list[facility_models.Location]: - pass - - @abstractmethod - async def get_location( - self: "FacilityAdapter", - location_id: str, - modified_since: str | None = None, - ) -> facility_models.Location | None: - pass diff --git a/app/routers/facility/models.py b/app/routers/facility/models.py index 2bea62f..efd93dd 100644 --- a/app/routers/facility/models.py +++ b/app/routers/facility/models.py @@ -1,20 +1,13 @@ """Facility-related models.""" -from typing import List, Optional +from typing import Optional from pydantic import Field, HttpUrl from ..models import NamedObject -class Site(NamedObject): - def _self_path(self) -> str: - return f"/facility/sites/{self.id}" - short_name: Optional[str] = Field(None, description="Common or short name of the Site.") - operating_organization: str = Field(..., description="Organization operating the Site.") - location_uri: Optional[HttpUrl] = Field(None, description="URI of Location containing this Site.") - resource_uris: List[HttpUrl] = Field(default_factory=list, description="URIs of Resources hosted at this Site.") - -class Location(NamedObject): - def _self_path(self) -> str: - return f"/facility/locations/{self.id}" - short_name: Optional[str] = Field(None, description="Common or short name of the Location.") +class Facility(NamedObject): + short_name: Optional[str] = Field(None, description="Common or short name of the Facility.") + organization_name: Optional[str] = Field(None, description="Operating organization's name.") + facility_uri: Optional[HttpUrl] = Field(None, description="URI of this facility.") + support_uri: Optional[HttpUrl] = Field(None, description="Link to facility support portal.") country_name: Optional[str] = Field(None, description="Country name of the Location.") locality_name: Optional[str] = Field(None, description="City or locality name of the Location.") state_or_province_name: Optional[str] = Field(None, description="State or province name of the Location.") @@ -23,20 +16,6 @@ def _self_path(self) -> str: altitude: Optional[float] = Field(None, description="Altitude of the Location.") latitude: Optional[float] = Field(None, description="Latitude of the Location.") longitude: Optional[float] = Field(None, description="Longitude of the Location.") - site_uris: List[HttpUrl] = Field(default_factory=list, description="URIs of Sites contained in this Location.") -class Facility(NamedObject): def _self_path(self) -> str: return f"/facility/facilities/{self.id}" - short_name: Optional[str] = Field(None, description="Common or short name of the Facility.") - organization_name: Optional[str] = Field(None, description="Operating organization’s name.") - support_uri: Optional[HttpUrl] = Field(None, description="Link to facility support portal.") - site_uris: List[HttpUrl] = Field(default_factory=list, description="URIs of associated Sites.") - location_uris: List[HttpUrl] = Field(default_factory=list, description="URIs of associated Locations.") - resource_uris: List[HttpUrl] = Field(default_factory=list, description="URIs of contained Resources.") - event_uris: List[HttpUrl] = Field(default_factory=list, description="URIs of Events in this Facility.") - incident_uris: List[HttpUrl] = Field(default_factory=list, description="URIs of Incidents in this Facility.") - capability_uris: List[HttpUrl] = Field(default_factory=list, description="URIs of Capabilities offered by the Facility.") - project_uris: List[HttpUrl] = Field(default_factory=list, description="URIs of Projects associated with this Facility.") - project_allocation_uris: List[HttpUrl] = Field(default_factory=list, description="URIs of Project Allocations.") - user_allocation_uris: List[HttpUrl] = Field(default_factory=list, description="URIs of User Allocations.") From ed6befa032e9b8eb47662cb8cab653ddab52a991 Mon Sep 17 00:00:00 2001 From: Justas Balcas Date: Mon, 12 Jan 2026 13:27:56 -0600 Subject: [PATCH 05/22] Add Facility API, demo data, stricter query validation and /api/v1 discovery endpoint This pull requests includes: - Implement /api/v1 to list metadata; - Implement /facility api (most fields are optional, and implemented based on the specification) - Capabilities, project include forbidExtraQueryParams to make validation happy. - Parse Raw query_string (catch duplicate keys) - Add HTTP 304 handling and return correct header --- app/demo_adapter.py | 2 -- app/routers/facility/facility.py | 1 + app/routers/facility/facility_adapter.py | 1 + app/routers/facility/models.py | 1 + 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/demo_adapter.py b/app/demo_adapter.py index 2d2ca30..0d58103 100644 --- a/app/demo_adapter.py +++ b/app/demo_adapter.py @@ -57,9 +57,7 @@ def __init__(self): self.projects = [] self.project_allocations = [] self.user_allocations = [] - self.locations = [] self.facility = {} - self.sites = [] self._init_state() diff --git a/app/routers/facility/facility.py b/app/routers/facility/facility.py index 9b7545b..fdba124 100644 --- a/app/routers/facility/facility.py +++ b/app/routers/facility/facility.py @@ -18,3 +18,4 @@ async def get_facility( ) -> models.Facility: """Get facility information""" return await router.adapter.get_facility(modified_since=modified_since) + diff --git a/app/routers/facility/facility_adapter.py b/app/routers/facility/facility_adapter.py index bccdcfe..cbee951 100644 --- a/app/routers/facility/facility_adapter.py +++ b/app/routers/facility/facility_adapter.py @@ -16,3 +16,4 @@ async def get_facility( modified_since: str | None = None, ) -> facility_models.Facility | None: pass + diff --git a/app/routers/facility/models.py b/app/routers/facility/models.py index efd93dd..5b21d8a 100644 --- a/app/routers/facility/models.py +++ b/app/routers/facility/models.py @@ -19,3 +19,4 @@ class Facility(NamedObject): def _self_path(self) -> str: return f"/facility/facilities/{self.id}" + From 28e5ba75413b14b433f68bf4c2fc2d9cda850991 Mon Sep 17 00:00:00 2001 From: Justas Balcas Date: Thu, 15 Jan 2026 15:27:00 -0600 Subject: [PATCH 06/22] Remove /api/v1 --- app/main.py | 31 +------------------------------ 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/app/main.py b/app/main.py index 080645e..7864143 100644 --- a/app/main.py +++ b/app/main.py @@ -2,8 +2,6 @@ """Main API application""" import logging from fastapi import FastAPI -from fastapi import Request -from fastapi.routing import APIRoute from app.routers.error_handlers import install_error_handlers from app.routers.facility import facility @@ -22,33 +20,6 @@ api_prefix = f"{config.API_PREFIX}{config.API_URL}" -@APP.get(api_prefix) -async def api_discovery(request: Request): - base = str(request.base_url).rstrip("/") - items = [] - for route in APP.router.routes: - if not isinstance(route, APIRoute): - continue - # skip docs & openapi - if route.path.startswith("/docs") or route.path.startswith("/openapi"): - continue - for method in route.methods: - if method == "HEAD" or method == "OPTIONS": - continue - items.append({ - "id": route.name or f"{method}_{route.path}", - "method": method, - "path": route.path, - "_links": [ - { - "rel": "self", - "href": f"{base.rstrip('/')}{route.path}", - "type": "application/json" - } - ] - }) - return items - # Attach routers under the prefix APP.include_router(facility.router, prefix=api_prefix) APP.include_router(status.router, prefix=api_prefix) @@ -57,4 +28,4 @@ async def api_discovery(request: Request): APP.include_router(filesystem.router, prefix=api_prefix) APP.include_router(task.router, prefix=api_prefix) -logging.getLogger().info(f"API path: {api_prefix}") \ No newline at end of file +logging.getLogger().info(f"API path: {api_prefix}") From e8d256b4f630c525f90c4097743c61a8daca805f Mon Sep 17 00:00:00 2001 From: Justas Balcas Date: Tue, 20 Jan 2026 10:14:23 -0600 Subject: [PATCH 07/22] Refactor shared validators & models to fix import loading issues MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Move common validators and base models into routers/dependencies and update imports across routers and schemas to use the new shared location. This keeps API behavior unchanged. No functional API changes — purely structural and validation hygiene: --- app/routers/account/account.py | 17 +- app/routers/account/models.py | 15 +- app/routers/compute/compute.py | 88 ++++++----- app/routers/compute/models.py | 70 ++++---- app/routers/dependencies.py | 176 +++++++++++++++++++++ app/routers/facility/facility.py | 8 +- app/routers/facility/models.py | 2 +- app/routers/filesystem/facility_adapter.py | 4 +- app/routers/filesystem/filesystem.py | 42 +---- app/routers/filesystem/models.py | 9 +- app/routers/iri_router.py | 77 --------- app/routers/models.py | 46 ------ app/routers/status/models.py | 2 +- app/routers/status/status.py | 25 +-- app/routers/task/models.py | 19 ++- 15 files changed, 317 insertions(+), 283 deletions(-) create mode 100644 app/routers/dependencies.py delete mode 100644 app/routers/models.py diff --git a/app/routers/account/account.py b/app/routers/account/account.py index 508d556..b2c41f4 100644 --- a/app/routers/account/account.py +++ b/app/routers/account/account.py @@ -2,6 +2,7 @@ from . import models, facility_adapter from .. import iri_router from ..error_handlers import DEFAULT_RESPONSES +from ..dependencies import forbidExtraQueryParams router = iri_router.IriRouter( @@ -21,7 +22,7 @@ ) async def get_capabilities( request : Request, - _forbid = Depends(iri_router.forbidExtraQueryParams()), + _forbid = Depends(forbidExtraQueryParams()), ) -> list[models.Capability]: return await router.adapter.get_capabilities() @@ -36,7 +37,7 @@ async def get_capabilities( async def get_capability( capability_id : str, request : Request, - _forbid = Depends(iri_router.forbidExtraQueryParams()), + _forbid = Depends(forbidExtraQueryParams()), ) -> models.Capability: caps = await router.adapter.get_capabilities() cc = next((c for c in caps if c.id == capability_id), None) @@ -55,7 +56,7 @@ async def get_capability( ) async def get_projects( request : Request, - _forbid = Depends(iri_router.forbidExtraQueryParams()), + _forbid = Depends(forbidExtraQueryParams()), ) -> list[models.Project]: user = await router.adapter.get_user(request.state.current_user_id, request.state.api_key, iri_router.get_client_ip(request)) if not user: @@ -74,7 +75,7 @@ async def get_projects( async def get_project( project_id : str, request : Request, - _forbid = Depends(iri_router.forbidExtraQueryParams()), + _forbid = Depends(forbidExtraQueryParams()), ) -> models.Project: user = await router.adapter.get_user(request.state.current_user_id, request.state.api_key, iri_router.get_client_ip(request)) if not user: @@ -97,7 +98,7 @@ async def get_project( async def get_project_allocations( project_id: str, request : Request, - _forbid = Depends(iri_router.forbidExtraQueryParams()), + _forbid = Depends(forbidExtraQueryParams()), ) -> list[models.ProjectAllocation]: user = await router.adapter.get_user(request.state.current_user_id, request.state.api_key, iri_router.get_client_ip(request)) if not user: @@ -121,7 +122,7 @@ async def get_project_allocation( project_id: str, project_allocation_id : str, request : Request, - _forbid = Depends(iri_router.forbidExtraQueryParams()), + _forbid = Depends(forbidExtraQueryParams()), ) -> models.ProjectAllocation: user = await router.adapter.get_user(request.state.current_user_id, request.state.api_key, iri_router.get_client_ip(request)) if not user: @@ -147,7 +148,7 @@ async def get_user_allocations( project_id: str, project_allocation_id : str, request : Request, - _forbid = Depends(iri_router.forbidExtraQueryParams()), + _forbid = Depends(forbidExtraQueryParams()), ) -> list[models.UserAllocation]: user = await router.adapter.get_user(request.state.current_user_id, request.state.api_key, iri_router.get_client_ip(request)) if not user: @@ -176,7 +177,7 @@ async def get_user_allocation( project_allocation_id : str, user_allocation_id : str, request : Request, - _forbid = Depends(iri_router.forbidExtraQueryParams()), + _forbid = Depends(forbidExtraQueryParams()), ) -> models.UserAllocation: user = await router.adapter.get_user(request.state.current_user_id, request.state.api_key, iri_router.get_client_ip(request)) if not user: diff --git a/app/routers/account/models.py b/app/routers/account/models.py index 6ed69ea..c012ee3 100644 --- a/app/routers/account/models.py +++ b/app/routers/account/models.py @@ -1,6 +1,7 @@ -from pydantic import BaseModel, computed_field, Field +from pydantic import computed_field, Field import enum from ... import config +from ..dependencies import IRIBaseModel class AllocationUnit(enum.Enum): @@ -9,7 +10,7 @@ class AllocationUnit(enum.Enum): inodes = "inodes" -class Capability(BaseModel): +class Capability(IRIBaseModel): """ An aspect of a resource that can have an allocation. For example, Perlmutter nodes with GPUs @@ -22,7 +23,7 @@ class Capability(BaseModel): units: list[AllocationUnit] -class User(BaseModel): +class User(IRIBaseModel): """A user of the facility""" id: str name: str @@ -31,7 +32,7 @@ class User(BaseModel): # we could expose more fields here (eg. email) but it might be against policy -class Project(BaseModel): +class Project(IRIBaseModel): """A project and its users at a facility""" id: str name: str @@ -39,14 +40,14 @@ class Project(BaseModel): user_ids: list[str] -class AllocationEntry(BaseModel): +class AllocationEntry(IRIBaseModel): """Base class for allocations.""" allocation: float # how much this allocation can spend usage: float # how much this allocation has spent unit: AllocationUnit -class ProjectAllocation(BaseModel): +class ProjectAllocation(IRIBaseModel): """ A project's allocation for a capability. (aka. repo) This allocation is a piece of the total allocation for the capability. (eg. 5% of the total node hours of Perlmutter GPU nodes) @@ -71,7 +72,7 @@ def capability_uri(self) -> str: return f"{config.API_URL_ROOT}{config.API_PREFIX}{config.API_URL}/account/capabilities/{self.capability_id}" -class UserAllocation(BaseModel): +class UserAllocation(IRIBaseModel): """ A user's allcation in a project. This allocation is a piece of the project's allocation. diff --git a/app/routers/compute/compute.py b/app/routers/compute/compute.py index 72a8169..7a2db23 100644 --- a/app/routers/compute/compute.py +++ b/app/routers/compute/compute.py @@ -1,9 +1,10 @@ -from typing import List, Annotated -from fastapi import HTTPException, Request, Depends, status, Form, Query +from fastapi import HTTPException, Request, Depends, status, Query from . import models, facility_adapter from .. import iri_router + from ..error_handlers import DEFAULT_RESPONSES from ..status.status import router as status_router +from ..dependencies import forbidExtraQueryParams, StrictBool router = iri_router.IriRouter( facility_adapter.FacilityAdapter, @@ -24,6 +25,7 @@ async def submit_job( resource_id: str, job_spec : models.JobSpec, request : Request, + _forbid = Depends(forbidExtraQueryParams()), ): """ Submit a job on a compute resource @@ -45,39 +47,41 @@ async def submit_job( return await router.adapter.submit_job(resource, user, job_spec) -@router.post( - "/job/script/{resource_id:str}", - dependencies=[Depends(router.current_user)], - response_model=models.Job, - response_model_exclude_unset=True, - responses=DEFAULT_RESPONSES, - operation_id="launchJobScript", -) -async def submit_job_path( - resource_id: str, - job_script_path : str, - request : Request, - args : Annotated[List[str], Form()] = [], - ): - """ - Submit a job on a compute resource - - - **resource**: the name of the compute resource to use - - **job_script_path**: path to the job script on the compute resource - - **args**: optional arguments to the job script - - This command will attempt to submit a job and return its id. - """ - user = await router.adapter.get_user(request.state.current_user_id, request.state.api_key, iri_router.get_client_ip(request)) - if not user: - raise HTTPException(status_code=404, detail="User not found") - - # look up the resource (todo: maybe ensure it's available) - resource = await status_router.adapter.get_resource(resource_id) - - # the handler can use whatever means it wants to submit the job and then fill in its id - # see: https://exaworks.org/psij-python/docs/v/0.9.11/user_guide.html#submitting-jobs - return await router.adapter.submit_job_script(resource, user, job_script_path, args) +# TODO: this conflicts with PUT commented out while we finalize the API design +#@router.post( +# "/job/script/{resource_id:str}", +# dependencies=[Depends(router.current_user)], +# response_model=models.Job, +# response_model_exclude_unset=True, +# responses=DEFAULT_RESPONSES, +# operation_id="launchJobScript", +#) +#async def submit_job_path( +# resource_id: str, +# job_script_path : str, +# request : Request, +# args : Annotated[List[str], Form()] = [], +# _forbid = Depends(iri_router.forbidExtraQueryParams("job_script_path")), +# ): +# """ +# Submit a job on a compute resource +# +# - **resource**: the name of the compute resource to use +# - **job_script_path**: path to the job script on the compute resource +# - **args**: optional arguments to the job script +# +# This command will attempt to submit a job and return its id. +# """ +# user = await router.adapter.get_user(request.state.current_user_id, request.state.api_key, iri_router.get_client_ip(request)) +# if not user: +# raise HTTPException(status_code=404, detail="User not found") +# +# # look up the resource (todo: maybe ensure it's available) +# resource = await status_router.adapter.get_resource(resource_id) +# +# # the handler can use whatever means it wants to submit the job and then fill in its id +# # see: https://exaworks.org/psij-python/docs/v/0.9.11/user_guide.html#submitting-jobs +# return await router.adapter.submit_job_script(resource, user, job_script_path, args) @router.put( @@ -93,6 +97,7 @@ async def update_job( job_id: str, job_spec : models.JobSpec, request : Request, + _forbid = Depends(forbidExtraQueryParams()), ): """ Update a previously submitted job for a resource. @@ -126,8 +131,9 @@ async def get_job_status( resource_id : str, job_id : str, request : Request, - historical : bool = False, - include_spec: bool = False, + historical : StrictBool = Query(default=False, description="Whether to include historical jobs. Defaults to false"), + include_spec: StrictBool = Query(default=False, description="Whether to include the job specification. Defaults to false"), + _forbid = Depends(forbidExtraQueryParams("historical", "include_spec")), ): """Get a job's status""" user = await router.adapter.get_user(request.state.current_user_id, request.state.api_key, iri_router.get_client_ip(request)) @@ -149,7 +155,7 @@ async def get_job_status( response_model=list[models.Job], response_model_exclude_unset=True, responses=DEFAULT_RESPONSES, - operation_id="getJobs", + operation_id="getAllJobs", ) async def get_job_statuses( resource_id : str, @@ -157,8 +163,9 @@ async def get_job_statuses( offset : int = Query(default=0, ge=0, le=1000), limit : int = Query(default=100, ge=0, le=1000), filters : dict[str, object] | None = None, - historical : bool = False, - include_spec: bool = False, + historical : StrictBool = Query(default=False, description="Whether to include historical jobs. Defaults to false"), + include_spec: StrictBool = Query(default=False, description="Whether to include the job specification. Defaults to false"), + _forbid = Depends(forbidExtraQueryParams("offset", "limit", "filters", "historical", "include_spec")), ): """Get multiple jobs' statuses""" user = await router.adapter.get_user(request.state.current_user_id, request.state.api_key, iri_router.get_client_ip(request)) @@ -187,6 +194,7 @@ async def cancel_job( resource_id : str, job_id : str, request : Request, + _forbid = Depends(forbidExtraQueryParams()), ): """Cancel a job""" user = await router.adapter.get_user(request.state.current_user_id, request.state.api_key, iri_router.get_client_ip(request)) diff --git a/app/routers/compute/models.py b/app/routers/compute/models.py index 167643e..7bc4ab2 100644 --- a/app/routers/compute/models.py +++ b/app/routers/compute/models.py @@ -1,41 +1,42 @@ from typing import Annotated -from pydantic import BaseModel, field_serializer, ConfigDict, Field from enum import IntEnum +from pydantic import field_serializer, ConfigDict, StrictBool, Field +from ..dependencies import IRIBaseModel -class ResourceSpec(BaseModel): +class ResourceSpec(IRIBaseModel): """ Specification of computational resources required for a job. """ - node_count: Annotated[int | None, Field(description="Number of compute nodes to allocate")] = None - process_count: Annotated[int | None, Field(description="Total number of processes to launch")] = None - processes_per_node: Annotated[int | None, Field(description="Number of processes to launch per node")] = None - cpu_cores_per_process: Annotated[int | None, Field(description="Number of CPU cores to allocate per process")] = None - gpu_cores_per_process: Annotated[int | None, Field(description="Number of GPU cores to allocate per process")] = None - exclusive_node_use: Annotated[bool, Field(description="Whether to request exclusive use of allocated nodes")] = True - memory: Annotated[int | None, Field(description="Amount of memory to allocate in bytes")] = None + node_count: Annotated[int | None, Field(ge=1, description="Number of compute nodes to allocate")] = None + process_count: Annotated[int | None, Field(ge=1, description="Total number of processes to launch")] = None + processes_per_node: Annotated[int | None, Field(ge=1, description="Number of processes to launch per node")] = None + cpu_cores_per_process: Annotated[int | None, Field(ge=1, description="Number of CPU cores to allocate per process")] = None + gpu_cores_per_process: Annotated[int | None, Field(ge=1, description="Number of GPU cores to allocate per process")] = None + exclusive_node_use: Annotated[StrictBool, Field(description="Whether to request exclusive use of allocated nodes")] = True + memory: Annotated[int | None, Field(ge=1,description="Amount of memory to allocate in bytes")] = None -class JobAttributes(BaseModel): +class JobAttributes(IRIBaseModel): """ Additional attributes and scheduling parameters for a job. """ - duration: Annotated[int | None, Field(description="Duration in seconds", ge=0, examples=[30, 60, 120])] = None - queue_name: Annotated[str | None, Field(description="Name of the queue or partition to submit the job to")] = None - account: Annotated[str | None, Field(description="Account or project to charge for resource usage")] = None - reservation_id: Annotated[str | None, Field(description="ID of a reservation to use for the job")] = None + duration: Annotated[int | None, Field(description="Duration in seconds", ge=1, examples=[30, 60, 120])] = None + queue_name: Annotated[str | None, Field(min_length=1, description="Name of the queue or partition to submit the job to")] = None + account: Annotated[str | None, Field(min_length=1, description="Account or project to charge for resource usage")] = None + reservation_id: Annotated[str | None, Field(min_length=1, description="ID of a reservation to use for the job")] = None custom_attributes: Annotated[dict[str, str], Field(description="Custom scheduler-specific attributes as key-value pairs")] = {} -class VolumeMount(BaseModel): +class VolumeMount(IRIBaseModel): """ Represents a volume mount for a container. """ - source: Annotated[str, Field(description="The source path on the host system to mount")] - target: Annotated[str, Field(description="The target path inside the container where the volume will be mounted")] - read_only: Annotated[bool, Field(description="Whether the mount should be read-only")] = True + source: Annotated[str, Field(min_length=1, description="The source path on the host system to mount")] + target: Annotated[str, Field(min_length=1, description="The target path inside the container where the volume will be mounted")] + read_only: Annotated[StrictBool, Field(description="Whether the mount should be read-only")] = True -class Container(BaseModel): +class Container(IRIBaseModel): """ Represents a container specification for job execution. @@ -44,33 +45,33 @@ class Container(BaseModel): to determine if the container should be run with MPI support. The container should by default. be run with host networking. """ - image: Annotated[str, Field(description="The container image to use (e.g., 'docker.io/library/ubuntu:latest')")] + image: Annotated[str, Field(min_length=1, description="The container image to use (e.g., 'docker.io/library/ubuntu:latest')")] volume_mounts: Annotated[list[VolumeMount], Field(description="List of volume mounts for the container")] = [] -class JobSpec(BaseModel): +class JobSpec(IRIBaseModel): """ Specification for job. """ model_config = ConfigDict(extra="forbid") - executable: Annotated[str | None, Field(description="Path to the executable to run. If container is specified, this will be used as the entrypoint to the container.")] = None + executable: Annotated[str | None, Field(min_length=1, description="Path to the executable to run. If container is specified, this will be used as the entrypoint to the container.")] = None container: Annotated[Container | None, Field(description="Container specification for containerized execution")] = None arguments: Annotated[list[str], Field(description="Command-line arguments to pass to the executable or container")] = [] - directory: Annotated[str | None, Field(description="Working directory for the job")] = None - name: Annotated[str | None, Field(description="Name of the job")] = None - inherit_environment: Annotated[bool, Field(description="Whether to inherit the environment variables from the submission environment")] = True + directory: Annotated[str | None, Field(min_length=1, description="Working directory for the job")] = None + name: Annotated[str | None, Field(min_length=1, description="Name of the job")] = None + inherit_environment: Annotated[StrictBool, Field(description="Whether to inherit the environment variables from the submission environment")] = True environment: Annotated[dict[str, str], Field(description="Environment variables to set for the job. If container is specified, these will be set inside the container.")] = {} - stdin_path: Annotated[str | None, Field(description="Path to file to use as standard input")] = None - stdout_path: Annotated[str | None, Field(description="Path to file to write standard output")] = None - stderr_path: Annotated[str | None, Field(description="Path to file to write standard error")] = None + stdin_path: Annotated[str | None, Field(min_length=1, description="Path to file to use as standard input")] = None + stdout_path: Annotated[str | None, Field(min_length=1, description="Path to file to write standard output")] = None + stderr_path: Annotated[str | None, Field(min_length=1, description="Path to file to write standard error")] = None resources: Annotated[ResourceSpec | None, Field(description="Resource requirements for the job")] = None attributes: Annotated[JobAttributes | None, Field(description="Additional job attributes such as duration, queue, and account")] = None - pre_launch: Annotated[str | None, Field(description="Script or commands to run before launching the job")] = None - post_launch: Annotated[str | None, Field(description="Script or commands to run after the job completes")] = None - launcher: Annotated[str | None, Field(description="Job launcher to use (e.g., 'mpirun', 'srun')")] = None + pre_launch: Annotated[str | None, Field(min_length=1, description="Script or commands to run before launching the job")] = None + post_launch: Annotated[str | None, Field(min_length=1, description="Script or commands to run after the job completes")] = None + launcher: Annotated[str | None, Field(min_length=1, description="Job launcher to use (e.g., 'mpirun', 'srun')")] = None -class CommandResult(BaseModel): +class CommandResult(IRIBaseModel): status : str result : str | None = None @@ -110,20 +111,19 @@ class JobState(IntEnum): """Represents a job that was canceled by a call to :func:`~psij.Job.cancel()`.""" -class JobStatus(BaseModel): +class JobStatus(IRIBaseModel): state : JobState time : float | None = None message : str | None = None exit_code : int | None = None meta_data : dict[str, object] | None = None - @field_serializer('state') def serialize_state(self, state: JobState): return state.name -class Job(BaseModel): +class Job(IRIBaseModel): id : str status : JobStatus | None = None job_spec : JobSpec | None = None diff --git a/app/routers/dependencies.py b/app/routers/dependencies.py new file mode 100644 index 0000000..17b4f09 --- /dev/null +++ b/app/routers/dependencies.py @@ -0,0 +1,176 @@ +"""Default models used by multiple routers.""" +import datetime +from typing import Optional +from urllib.parse import parse_qs + +from pydantic_core import core_schema +from pydantic import BaseModel, ConfigDict, Field, computed_field, model_serializer +from fastapi import Request, HTTPException + +from .. import config + + +# These are Pydantic custom types for strict validation +# that are not implmented in Pydantic by default. +# ----------------------------------------------------------------------- +# StrictBool: a strict boolean type +class StrictBool: + """Strict boolean: + - Accepts: real booleans, 'true', 'false' + - Rejects everything else. + """ + + @classmethod + def __get_pydantic_core_schema__(cls, source, handler): + return core_schema.no_info_plain_validator_function(cls.validate) + + @staticmethod + def validate(value): + """Validate the input value as a strict boolean.""" + if isinstance(value, bool): + return value + if isinstance(value, str): + v = value.strip().lower() + if v == "true": + return True + if v == "false": + return False + raise ValueError("Invalid boolean value. Expected 'true' or 'false'.") + raise ValueError("Invalid boolean value. Expected true/false or 'true'/'false'.") + + @classmethod + def __get_pydantic_json_schema__(cls, schema, handler): + return { + "type": "boolean", + "description": "Strict boolean. Only true/false allowed (bool or string)." + } + +# ----------------------------------------------------------------------- +# StrictDateTime: a strict ISO8601 datetime type + +class StrictDateTime: + """ + Strict ISO8601 datetime: + - Accepts datetime objects + - Accepts ISO8601 strings: 2025-12-06T10:00:00Z, 2025-12-06T10:00:00+00:00 + - Converts 'Z' → UTC + - Converts naive datetimes → UTC + - Rejects integers ("0"), null, garbage strings, etc. + """ + + @classmethod + def __get_pydantic_core_schema__(cls, source, handler): + return core_schema.no_info_plain_validator_function(cls.validate) + + @staticmethod + def validate(value): + if isinstance(value, datetime.datetime): + return StrictDateTime._normalize(value) + if not isinstance(value, str): + raise ValueError("Invalid datetime value. Expected ISO8601 datetime string.") + v = value.strip() + if v.endswith("Z"): + v = v[:-1] + "+00:00" + try: + dt = datetime.datetime.fromisoformat(v) + except Exception as ex: + raise ValueError("Invalid datetime format. Expected ISO8601 string.") from ex + + return StrictDateTime._normalize(dt) + + @staticmethod + def _normalize(dt: datetime.datetime) -> datetime.datetime: + if dt.tzinfo is None: + return dt.replace(tzinfo=datetime.timezone.utc) + return dt + + @classmethod + def __get_pydantic_json_schema__(cls, schema, handler): + return { + "type": "string", + "format": "date-time", + "description": "Strict ISO8601 datetime. Only valid ISO8601 datetime strings are accepted." + } + + +def forbidExtraQueryParams(*allowedParams: str): + async def checker(req: Request): + if "*" in allowedParams: + return + + raw_qs = req.scope.get("query_string", b"") + parsed = parse_qs(raw_qs.decode("utf-8", errors="strict"), keep_blank_values=True) + + allowed = set(allowedParams) + + for key, values in parsed.items(): + if key not in allowed: + raise HTTPException( + status_code=422, + detail=[{ + "type": "extra_forbidden", + "loc": ["query", key], + "msg": f"Unexpected query parameter: {key}" + }]) + + if len(values) > 1: + raise HTTPException( + status_code=422, + detail=[{ + "type": "duplicate_forbidden", + "loc": ["query", key], + "msg": f"Duplicate query parameter: {key}" + }]) + return checker + + +class IRIBaseModel(BaseModel): + """Base model for IRI models.""" + model_config = ConfigDict(extra="allow") + + @model_serializer(mode="wrap") + def _hide_extra(self, handler): + data = handler(self) + extra = getattr(self, "__pydantic_extra__", {}) or {} + for k in extra: + data.pop(k, None) + return data + +class NamedObject(IRIBaseModel): + id: str = Field(..., description="The unique identifier for the object. Typically a UUID or URN.") + def _self_path(self) -> str: + raise NotImplementedError + + @computed_field(description="The canonical URL of this object") + @property + def self_uri(self) -> str: + """Computed self URI property.""" + return f"{config.API_URL_ROOT}{config.API_PREFIX}{config.API_URL}{self._self_path()}" + + name: Optional[str] = Field(None, description="The long name of the object.") + description: Optional[str] = Field(None, description="Human-readable description of the object.") + last_modified: StrictDateTime = Field(..., description="ISO 8601 timestamp when this object was last modified.") + + @staticmethod + def find_by_id(a, id, allow_name: bool|None=False): + # Find a resource by its id. + # If allow_name is True, the id parameter can also match the resource's name. + return next((r for r in a if r.id == id or (allow_name and r.name == id)), None) + + + @staticmethod + def find(a, name, description, modified_since): + def normalize(dt: datetime) -> datetime: + # Convert naive datetimes into UTC-aware versions + if dt.tzinfo is None: + return dt.replace(tzinfo=datetime.timezone.utc) + return dt + if name: + a = [aa for aa in a if aa.name == name] + if description: + a = [aa for aa in a if description in aa.description] + if modified_since: + if modified_since.tzinfo is None: + modified_since = modified_since.replace(tzinfo=datetime.timezone.utc) + a = [aa for aa in a if normalize(aa.last_modified) >= modified_since] + return a diff --git a/app/routers/facility/facility.py b/app/routers/facility/facility.py index fdba124..1c38918 100644 --- a/app/routers/facility/facility.py +++ b/app/routers/facility/facility.py @@ -1,7 +1,8 @@ -from fastapi import Request, HTTPException, Depends, Query +from fastapi import Request, Depends, Query from .. import iri_router from ..error_handlers import DEFAULT_RESPONSES from .import models, facility_adapter +from ..dependencies import StrictDateTime, forbidExtraQueryParams router = iri_router.IriRouter( @@ -13,9 +14,8 @@ @router.get("", responses=DEFAULT_RESPONSES, operation_id="getFacility") async def get_facility( request: Request, - modified_since: iri_router.StrictDateTime = Query(default=None), - _forbid = Depends(iri_router.forbidExtraQueryParams("modified_since")), + modified_since: StrictDateTime = Query(default=None), + _forbid = Depends(forbidExtraQueryParams("modified_since")), ) -> models.Facility: """Get facility information""" return await router.adapter.get_facility(modified_since=modified_since) - diff --git a/app/routers/facility/models.py b/app/routers/facility/models.py index 5b21d8a..5db7a18 100644 --- a/app/routers/facility/models.py +++ b/app/routers/facility/models.py @@ -1,7 +1,7 @@ """Facility-related models.""" from typing import Optional from pydantic import Field, HttpUrl -from ..models import NamedObject +from ..dependencies import NamedObject class Facility(NamedObject): short_name: Optional[str] = Field(None, description="Common or short name of the Facility.") diff --git a/app/routers/filesystem/facility_adapter.py b/app/routers/filesystem/facility_adapter.py index 2c08a3c..a70efb0 100644 --- a/app/routers/filesystem/facility_adapter.py +++ b/app/routers/filesystem/facility_adapter.py @@ -1,15 +1,15 @@ import os from abc import abstractmethod +from typing import Any, Tuple from ..status import models as status_models from ..account import models as account_models from . import models as filesystem_models from ..iri_router import AuthenticatedAdapter -from typing import Any, Tuple def to_int(name, default_value): try: - return os.environ.get(name) or default_value + return int(os.environ.get(name) or default_value) except: return default_value diff --git a/app/routers/filesystem/filesystem.py b/app/routers/filesystem/filesystem.py index a111484..d583c64 100644 --- a/app/routers/filesystem/filesystem.py +++ b/app/routers/filesystem/filesystem.py @@ -354,40 +354,13 @@ async def get_view( resource_id: str, request : Request, path: Annotated[str, Query(description="File path")], - size: Annotated[ - int, - Query( - alias="size", - description="Value, in bytes, of the size of data to be retrieved from the file.", - ), - ] = facility_adapter.OPS_SIZE_LIMIT, - offset: Annotated[ - int, - Query( - alias="offset", - description="Value in bytes of the offset.", - ), - ] = 0, -) -> str: - user, resource = await _user_resource(resource_id, request) - if offset < 0: - raise HTTPException( - status_code=status.HTTP_400_BAD_REQUEST, - detail="`offset` value must be an integer value equal or greater than 0", - ) - - if size <= 0: - raise HTTPException( - status_code=status.HTTP_400_BAD_REQUEST, - detail="`size` value must be an integer value greater than 0", - ) + size: Annotated[int, Query(description="Value, in bytes, of the size of data to be retrieved from the file.", + ge=1, le=facility_adapter.OPS_SIZE_LIMIT)] = facility_adapter.OPS_SIZE_LIMIT, - if size > facility_adapter.OPS_SIZE_LIMIT: - raise HTTPException( - status_code=status.HTTP_400_BAD_REQUEST, - detail=f"`size` value must be less than {facility_adapter.OPS_SIZE_LIMIT} bytes", - ) + offset: Annotated[int, Query( description="Value in bytes of the offset.", ge=0)] = 0 + ) -> str: + user, resource = await _user_resource(resource_id, request) return await router.task_adapter.put_task( user, @@ -397,9 +370,8 @@ async def get_view( command="view", args={ "path": path, - "size": size or facility_adapter.OPS_SIZE_LIMIT, - "offset": offset or 0, - + "size": size, + "offset": offset, } ) ) diff --git a/app/routers/filesystem/models.py b/app/routers/filesystem/models.py index b24c908..d32ad94 100644 --- a/app/routers/filesystem/models.py +++ b/app/routers/filesystem/models.py @@ -12,11 +12,10 @@ class CompressionType(str, Enum): - none = "none" - bzip2 = "bzip2" - gzip = "gzip" - xz = "xz" - + none = "none" + bzip2 = "bzip2" + gzip = "gzip" + xz = "xz" class ContentUnit(str, Enum): lines = "lines" diff --git a/app/routers/iri_router.py b/app/routers/iri_router.py index 2de7e69..d3fc9e1 100644 --- a/app/routers/iri_router.py +++ b/app/routers/iri_router.py @@ -2,11 +2,9 @@ import os import logging import importlib -import datetime from urllib.parse import parse_qs from fastapi import Request, Depends, HTTPException, APIRouter from fastapi.security import APIKeyHeader -from pydantic_core import core_schema from .account.models import User @@ -127,78 +125,3 @@ async def get_user( Retrieve additional user information (name, email, etc.) for the given user_id. """ pass - - -def forbidExtraQueryParams(*allowedParams: str): - async def checker(req: Request): - if "*" in allowedParams: - return - - raw_qs = req.scope.get("query_string", b"") - parsed = parse_qs(raw_qs.decode("utf-8", errors="strict"), keep_blank_values=True) - - allowed = set(allowedParams) - - for key, values in parsed.items(): - if key not in allowed: - raise HTTPException( - status_code=422, - detail=[{ - "type": "extra_forbidden", - "loc": ["query", key], - "msg": f"Unexpected query parameter: {key}" - }]) - - if len(values) > 1: - raise HTTPException( - status_code=422, - detail=[{ - "type": "duplicate_forbidden", - "loc": ["query", key], - "msg": f"Duplicate query parameter: {key}" - }]) - return checker - -class StrictDateTime: - """ - Strict ISO8601 datetime: - ✔ Accepts datetime objects - ✔ Accepts ISO8601 strings: 2025-12-06T10:00:00Z, 2025-12-06T10:00:00+00:00 - ✔ Converts 'Z' → UTC - ✔ Converts naive datetimes → UTC - ✘ Rejects integers ("0"), null, garbage strings, etc. - """ - - @classmethod - def __get_pydantic_core_schema__(cls, source, handler): - return core_schema.no_info_plain_validator_function(cls.validate) - - @staticmethod - def validate(value): - if isinstance(value, datetime.datetime): - return StrictDateTime._normalize(value) - if not isinstance(value, str): - raise ValueError("Invalid datetime value. Expected ISO8601 datetime string.") - v = value.strip() - if v.endswith("Z"): - v = v[:-1] + "+00:00" - try: - dt = datetime.datetime.fromisoformat(v) - except Exception as ex: - raise ValueError("Invalid datetime format. Expected ISO8601 string.") from ex - - return StrictDateTime._normalize(dt) - - @staticmethod - def _normalize(dt: datetime.datetime) -> datetime.datetime: - if dt.tzinfo is None: - return dt.replace(tzinfo=datetime.timezone.utc) - return dt - - @classmethod - def __get_pydantic_json_schema__(cls, schema, handler): - return { - "type": "string", - "format": "date-time", - "description": "Strict ISO8601 datetime. Only valid ISO8601 datetime strings are accepted." - } diff --git a/app/routers/models.py b/app/routers/models.py deleted file mode 100644 index f9a1c00..0000000 --- a/app/routers/models.py +++ /dev/null @@ -1,46 +0,0 @@ -"""Default models used by multiple routers.""" -import datetime -from typing import Optional -from pydantic import BaseModel, Field, computed_field -from . import iri_router -from .. import config - - -class NamedObject(BaseModel): - id: str = Field(..., description="The unique identifier for the object. Typically a UUID or URN.") - def _self_path(self) -> str: - raise NotImplementedError - - @computed_field(description="The canonical URL of this object") - @property - def self_uri(self) -> str: - """Computed self URI property.""" - return f"{config.API_URL_ROOT}{config.API_PREFIX}{config.API_URL}{self._self_path()}" - - name: Optional[str] = Field(None, description="The long name of the object.") - description: Optional[str] = Field(None, description="Human-readable description of the object.") - last_modified: iri_router.StrictDateTime = Field(..., description="ISO 8601 timestamp when this object was last modified.") - - @staticmethod - def find_by_id(a, id, allow_name: bool|None=False): - # Find a resource by its id. - # If allow_name is True, the id parameter can also match the resource's name. - return next((r for r in a if r.id == id or (allow_name and r.name == id)), None) - - - @staticmethod - def find(a, name, description, modified_since): - def normalize(dt: datetime) -> datetime: - # Convert naive datetimes into UTC-aware versions - if dt.tzinfo is None: - return dt.replace(tzinfo=datetime.timezone.utc) - return dt - if name: - a = [aa for aa in a if aa.name == name] - if description: - a = [aa for aa in a if description in aa.description] - if modified_since: - if modified_since.tzinfo is None: - modified_since = modified_since.replace(tzinfo=datetime.timezone.utc) - a = [aa for aa in a if normalize(aa.last_modified) >= modified_since] - return a diff --git a/app/routers/status/models.py b/app/routers/status/models.py index bb1f87b..ff5d4e4 100644 --- a/app/routers/status/models.py +++ b/app/routers/status/models.py @@ -2,7 +2,7 @@ import enum from pydantic import BaseModel, computed_field, Field from ... import config -from ..models import NamedObject +from ..dependencies import NamedObject class Link(BaseModel): rel : str diff --git a/app/routers/status/status.py b/app/routers/status/status.py index 7bb0fd0..2daf30e 100644 --- a/app/routers/status/status.py +++ b/app/routers/status/status.py @@ -2,6 +2,7 @@ from . import models, facility_adapter from .. import iri_router from ..error_handlers import DEFAULT_RESPONSES +from ..dependencies import StrictDateTime, forbidExtraQueryParams router = iri_router.IriRouter( facility_adapter.FacilityAdapter, @@ -23,9 +24,9 @@ async def get_resources( group : str = Query(default=None, min_length=1), offset : int = Query(default=0, ge=0), limit : int = Query(default=100, le=1000), - modified_since: iri_router.StrictDateTime = Query(default=None), + modified_since: StrictDateTime = Query(default=None), resource_type: models.ResourceType = Query(default=None), - _forbid = Depends(iri_router.forbidExtraQueryParams("name", "description", "group", "offset", "limit", "modified_since", "resource_type")), + _forbid = Depends(forbidExtraQueryParams("name", "description", "group", "offset", "limit", "modified_since", "resource_type")), ) -> list[models.Resource]: return await router.adapter.get_resources(offset, limit, name, description, group, modified_since, resource_type) @@ -60,14 +61,14 @@ async def get_incidents( description : str = Query(default=None, min_length=1), status : models.Status = Query(default=None), type_: models.IncidentType = Query(alias="type", default=None), - from_: iri_router.StrictDateTime = Query(alias="from", default=None), - time_ : iri_router.StrictDateTime = Query(alias="time", default=None), - to : iri_router.StrictDateTime = Query(default=None), - modified_since : iri_router.StrictDateTime = Query(default=None), + from_: StrictDateTime = Query(alias="from", default=None), + time_ : StrictDateTime = Query(alias="time", default=None), + to : StrictDateTime = Query(default=None), + modified_since : StrictDateTime = Query(default=None), resource_id : str = Query(default=None, min_length=1), offset : int = Query(default=0, ge=0), limit : int = Query(default=100, le=1000), - _forbid = Depends(iri_router.forbidExtraQueryParams("name", "description", "status", "type", "from", "to", "time", "modified_since", "resource_id", "offset", "limit")), + _forbid = Depends(forbidExtraQueryParams("name", "description", "status", "type", "from", "to", "time", "modified_since", "resource_id", "offset", "limit")), ) -> list[models.Incident]: return await router.adapter.get_incidents(offset, limit, name, description, status, type_, from_, to, time_, modified_since, resource_id) @@ -104,13 +105,13 @@ async def get_events( name : str = Query(default=None, min_length=1), description : str = Query(default=None, min_length=1), status : models.Status = Query(default=None), - from_: iri_router.StrictDateTime = Query(alias="from", default=None), - time_ : iri_router.StrictDateTime = Query(alias="time", default=None), - to : iri_router.StrictDateTime = Query(default=None), - modified_since : iri_router.StrictDateTime = Query(default=None), + from_: StrictDateTime = Query(alias="from", default=None), + time_ : StrictDateTime = Query(alias="time", default=None), + to : StrictDateTime = Query(default=None), + modified_since : StrictDateTime = Query(default=None), offset : int = Query(default=0, ge=0), limit : int = Query(default=100, le=1000), - _forbid = Depends(iri_router.forbidExtraQueryParams("resource_id", "name", "description", "status", "from", "to", "time", "modified_since", "offset", "limit")), + _forbid = Depends(forbidExtraQueryParams("resource_id", "name", "description", "status", "from", "to", "time", "modified_since", "offset", "limit")), ) -> list[models.Event]: return await router.adapter.get_events(incident_id, offset, limit, resource_id, name, description, status, from_, to, time_, modified_since) diff --git a/app/routers/task/models.py b/app/routers/task/models.py index da3c5cc..cea9787 100644 --- a/app/routers/task/models.py +++ b/app/routers/task/models.py @@ -1,19 +1,18 @@ -from pydantic import BaseModel import enum +from pydantic import BaseModel class TaskStatus(str, enum.Enum): - pending = "pending" - active = "active" - completed = "completed" - failed = "failed" - canceled = "canceled" - + pending = "pending" + active = "active" + completed = "completed" + failed = "failed" + canceled = "canceled" class TaskCommand(BaseModel): - router: str - command: str - args: dict + router: str + command: str + args: dict class Task(BaseModel): From 58b9ef8c0dc6c55163d50fea89dd3c19c34edfb1 Mon Sep 17 00:00:00 2001 From: Justas Balcas Date: Tue, 20 Jan 2026 10:17:00 -0600 Subject: [PATCH 08/22] Github Action to validate api --- .github/workflows/api-validation.yml | 133 +++++++++++++++++++++++++++ 1 file changed, 133 insertions(+) create mode 100644 .github/workflows/api-validation.yml diff --git a/.github/workflows/api-validation.yml b/.github/workflows/api-validation.yml new file mode 100644 index 0000000..624e84e --- /dev/null +++ b/.github/workflows/api-validation.yml @@ -0,0 +1,133 @@ +name: API Validation with Schemathesis + +on: + pull_request: + push: + branches: [ main ] + +jobs: + schemathesis: + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + token: ${{ secrets.GITHUB_TOKEN }} + + # TODO: Change to official iri-facility-api-docs repo once https://github.com/doe-iri/iri-facility-api-docs/pull/11 is merged + - name: Checkout schema validator repository + uses: actions/checkout@v4 + with: + repository: juztas/iri-facility-api-docs + ref: schemavalidator + path: schema-validator + token: ${{ secrets.GITHUB_TOKEN }} + + - name: Set up Python + uses: actions/setup-python@v5 + with: + python-version: "3.12" + + - name: Install uv + run: pip install uv + + - name: Build an image + run: docker build --platform=linux/amd64 -t iri-facility-api-base . + + - name: Run Facility API container + run: | + docker run -d \ + -p 8000:8000 \ + --platform=linux/amd64 \ + --name iri-facility-api-base \ + -e IRI_API_ADAPTER_facility=app.demo_adapter.DemoAdapter \ + -e IRI_API_ADAPTER_status=app.demo_adapter.DemoAdapter \ + -e IRI_API_ADAPTER_account=app.demo_adapter.DemoAdapter \ + -e IRI_API_ADAPTER_compute=app.demo_adapter.DemoAdapter \ + -e IRI_API_ADAPTER_filesystem=app.demo_adapter.DemoAdapter \ + -e IRI_API_ADAPTER_task=app.demo_adapter.DemoAdapter \ + -e API_URL_ROOT=http://127.0.0.1:8000 \ + -e IRI_API_TOKEN=12345 \ + iri-facility-api-base + + - name: Wait for API to be ready + run: | + for i in {1..60}; do + if curl -fs http://127.0.0.1:8000/openapi.json; then + echo "API ready" + exit 0 + fi + sleep 2 + done + echo "API did not start" + exit 1 + + - name: Create venv & install validator dependencies + run: | + uv venv + source .venv/bin/activate + uv pip install -r schema-validator/verification/requirements.txt + + - name: Run Schemathesis validation (local spec) + id: schemathesis_local + env: + IRI_API_TOKEN: "12345" # This is dummy token for testing (mock adapter) + run: | + set +e + source .venv/bin/activate + python schema-validator/verification/api-validator.py \ + --baseurl http://127.0.0.1:8000 \ + --report-name schemathesis-local + echo "exitcode=$?" >> $GITHUB_OUTPUT + + - name: Run Schemathesis validation (official spec) + id: schemathesis_official + env: + IRI_API_TOKEN: "12345" + run: | + set +e + source .venv/bin/activate + python schema-validator/verification/api-validator.py \ + --baseurl http://localhost:8000 \ + --schema-url https://raw.githubusercontent.com/doe-iri/iri-facility-api-docs/refs/heads/main/specification/openapi/openapi_iri_facility_api_v1.json \ + --report-name schemathesis-official + echo "exitcode=$?" >> $GITHUB_OUTPUT + + - name: Fail if any Schemathesis run failed + if: always() + run: | + if [ "${{ steps.schemathesis_local.outputs.exitcode }}" != "0" ] || \ + [ "${{ steps.schemathesis_official.outputs.exitcode }}" != "0" ]; then + echo "One or more Schemathesis validations failed" + exit 1 + else + echo "Both Schemathesis validations passed" + fi + + - name: Upload Schemathesis report # This only works on git actions + if: always() && env.ACT != 'true' + uses: actions/upload-artifact@v4 + with: + if-no-files-found: warn + name: schemathesis-report + path: | + schemathesis-local.html + schemathesis-local.xml + schemathesis-official.html + schemathesis-official.xml + + - name: Save Schemathesis reports locally # This only works if run locally with act + if: always() && env.ACT == 'true' + run: | + mkdir -p artifacts + cp schemathesis-local.html schemathesis-local.xml artifacts/ || true + cp schemathesis-official.html schemathesis-official.xml artifacts/ || true + + - name: Dump API logs + if: always() + run: docker logs iri-facility-api-base || true + + - name: Stop container + if: always() + run: docker stop iri-facility-api-base || true From bc5584359fbd0152cf350abd3bbed7d69939ba6c Mon Sep 17 00:00:00 2001 From: Justas Balcas Date: Tue, 20 Jan 2026 10:41:35 -0600 Subject: [PATCH 09/22] Add custom get extra function --- app/routers/dependencies.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/routers/dependencies.py b/app/routers/dependencies.py index 17b4f09..7bfaf0b 100644 --- a/app/routers/dependencies.py +++ b/app/routers/dependencies.py @@ -136,6 +136,10 @@ def _hide_extra(self, handler): data.pop(k, None) return data + def get_extra(self, key, default=None): + return getattr(self, "__pydantic_extra__", {}).get(key, default) + + class NamedObject(IRIBaseModel): id: str = Field(..., description="The unique identifier for the object. Typically a UUID or URN.") def _self_path(self) -> str: From 75a5cb6e1502c3423f8a1fbf0669661402e5420e Mon Sep 17 00:00:00 2001 From: Justas Balcas Date: Tue, 20 Jan 2026 13:06:36 -0600 Subject: [PATCH 10/22] Implement opentelemetry. Use UTC in demo adapter --- Makefile | 1 + README.md | 2 ++ VALIDATION.MD | 23 +++++++++++++++++++++++ app/config.py | 5 +++++ app/demo_adapter.py | 31 +++++++++++++++++++++---------- app/main.py | 32 ++++++++++++++++++++++++++++++++ pyproject.toml | 8 ++++++-- 7 files changed, 90 insertions(+), 12 deletions(-) create mode 100644 VALIDATION.MD diff --git a/Makefile b/Makefile index ba7552a..abd87e4 100644 --- a/Makefile +++ b/Makefile @@ -6,6 +6,7 @@ dev : .venv IRI_API_ADAPTER_compute=app.demo_adapter.DemoAdapter \ IRI_API_ADAPTER_filesystem=app.demo_adapter.DemoAdapter \ IRI_API_ADAPTER_task=app.demo_adapter.DemoAdapter \ + OPENTELEMETRY_ENABLED=true \ API_URL_ROOT='http://127.0.0.1:8000' fastapi dev diff --git a/README.md b/README.md index 5ef41a6..02b796c 100644 --- a/README.md +++ b/README.md @@ -51,6 +51,8 @@ If using docker (see next section), your dockerfile could extend this reference - `API_URL_ROOT`: the base url when constructing links returned by the api (eg.: https://iri.myfacility.com) - `API_PREFIX`: the path prefix where the api is hosted. Defaults to `/`. (eg.: `/api`) - `API_URL`: the path to the api itself. Defaults to `api/v1`. +- `OPENTELEMETRY_ENABLED`: Enables OpenTelemetry. If enabled, the application will use OpenTelemetry SDKs and emit traces, metrics, and logs. Default to false +- `OTLP_ENDPOINT`: OpenTelemetry Protocol collector endpoint to export telemetry data. If empty or not set, telemetry data is logged locally to log file. Default: "" Links to data, created by this api, will concatenate these values producing links, eg: `https://iri.myfacility.com/my_api_prefix/my_api_url/projects/123` diff --git a/VALIDATION.MD b/VALIDATION.MD new file mode 100644 index 0000000..26f77ef --- /dev/null +++ b/VALIDATION.MD @@ -0,0 +1,23 @@ +# API Validation with Schemathesis + +On every pull request or push to `main` branch, Github Actions run the following steps below that validates an IRI Facility API implementation against OpenAPI spec using Schemathesis. + +1. Builds the Facility API Docker image from Dockerfile. +2. Runs the API container with demo adapter. +3. Waits for `/openapi.json` to become available on localhost:8000. +4. Runs Schemathesis validation twice: + - Against Facilities API’s OpenAPI spec. (http://localhost:8000/openapi.json) + - Against the official IRI Facility API OpenAPI spec. (https://github.com/doe-iri/iri-facility-api-docs/blob/main/specification/openapi/openapi_iri_facility_api_v1.json) +5. Fails the workflow if either validation fails. +6. Saves Schemathesis HTML/XML reports as artifacts (or saves it locally when run with `act`). +7. Dumps API container logs and do clean up to stop container. + +## Running locally + +```bash +act -W .github/workflows/api-validator.yml -s GITHUB_TOKEN= +``` + +## Known issues + +Python implementation not fully aligns with the official Specification. Running against Official Spec will continue to fail, until Spec or Py implementation is fixed. diff --git a/app/config.py b/app/config.py index 078b6a5..71a7c20 100644 --- a/app/config.py +++ b/app/config.py @@ -40,3 +40,8 @@ API_URL_ROOT = os.environ.get("API_URL_ROOT", "https://api.iri.nersc.gov") API_PREFIX = os.environ.get("API_PREFIX", "/") API_URL = os.environ.get("API_URL", "api/v1") + +OPENTELEMETRY_ENABLED = os.environ.get("OPENTELEMETRY_ENABLED", "false").lower() == "true" +OPENTELEMETRY_DEBUG = os.environ.get("OPENTELEMETRY_DEBUG", "false").lower() == "true" +OTLP_ENDPOINT = os.environ.get("OTLP_ENDPOINT", "") +OTEL_SAMPLE_RATE = float(os.environ.get("OTEL_SAMPLE_RATE", "0.2")) diff --git a/app/demo_adapter.py b/app/demo_adapter.py index 0d58103..e63c720 100644 --- a/app/demo_adapter.py +++ b/app/demo_adapter.py @@ -1,7 +1,6 @@ import datetime import random import uuid -import time import os import stat import pwd @@ -45,6 +44,16 @@ def demo_uuid(kind: str, name: str) -> str: return str(uuid.uuid5(uuid.NAMESPACE_DNS, f"demo:{kind}:{name}")) +def utc_now() -> datetime.datetime: + """Return current UTC datetime timestamp""" + return datetime.datetime.now(datetime.timezone.utc) + + +def utc_timestamp() -> int: + """Return current UTC datetime timestamp as integer""" + return int(utc_now().timestamp()) + + class DemoAdapter(status_adapter.FacilityAdapter, account_adapter.FacilityAdapter, compute_adapter.FacilityAdapter, filesystem_adapter.FacilityAdapter, task_adapter.FacilityAdapter, facility_adapter.FacilityAdapter): @@ -62,7 +71,8 @@ def __init__(self): def _init_state(self): - now = datetime.datetime.now(datetime.timezone.utc) + now = utc_now() + self.facility = facility_models.Facility( id=demo_uuid("facility", "demo_facility"), name="Demo Facility", @@ -80,7 +90,8 @@ def _init_state(self): longitude=-286.36999 ) - day_ago = datetime.datetime.now(datetime.timezone.utc) - datetime.timedelta(days=1) + + day_ago = utc_now() - datetime.timedelta(days=1) self.capabilities = { "cpu": account_models.Capability(id=str(uuid.uuid4()), name="CPU Nodes", units=[account_models.AllocationUnit.node_hours]), "gpu": account_models.Capability(id=str(uuid.uuid4()), name="GPU Nodes", units=[account_models.AllocationUnit.node_hours]), @@ -352,7 +363,7 @@ async def submit_job( id="job_123", status=compute_models.JobStatus( state=compute_models.JobState.NEW, - time=time.time(), + time=utc_timestamp(), message="job submitted", exit_code=None, meta_data={ "account": "account1" }, @@ -371,7 +382,7 @@ async def submit_job_script( id="job_123", status=compute_models.JobStatus( state=compute_models.JobState.NEW, - time=time.time(), + time=utc_timestamp(), message="job submitted", exit_code=None, meta_data={ "account": "account1" }, @@ -390,7 +401,7 @@ async def update_job( id=job_id, status=compute_models.JobStatus( state=compute_models.JobState.ACTIVE, - time=time.time(), + time=utc_timestamp(), message="job updated", exit_code=None, meta_data={ "account": "account1" }, @@ -410,7 +421,7 @@ async def get_job( id=job_id, status=compute_models.JobStatus( state=compute_models.JobState.COMPLETED, - time=time.time(), + time=utc_timestamp(), message="job completed successfully", exit_code=0, meta_data={ "account": "account1" }, @@ -432,7 +443,7 @@ async def get_jobs( id=f"job_{i}", status=compute_models.JobStatus( state=random.choice([s for s in compute_models.JobState]), - time=time.time() - (random.random() * 100), + time=utc_timestamp() - int(random.random() * 100), message="", exit_code=random.choice([0, 0, 0, 0, 0, 1, 1, 128, 127]), meta_data={ "account": "account1" }, @@ -900,7 +911,7 @@ class DemoTaskQueue: @staticmethod async def _process_tasks(da: DemoAdapter): - now = time.time() + now = utc_timestamp() _tasks = [] for t in DemoTaskQueue.tasks: if now - t.start > 5 * 60 and t.status in [task_models.TaskStatus.completed, task_models.TaskStatus.canceled, task_models.TaskStatus.failed]: @@ -921,5 +932,5 @@ async def _process_tasks(da: DemoAdapter): @staticmethod def _create_task(user: account_models.User, resource: status_models.Resource, command: task_models.TaskCommand) -> str: task_id = f"task_{len(DemoTaskQueue.tasks)}" - DemoTaskQueue.tasks.append(DemoTask(id=task_id, body=command.model_dump_json(), user=user, resource=resource, start=time.time())) + DemoTaskQueue.tasks.append(DemoTask(id=task_id, body=command.model_dump_json(), user=user, resource=resource, start=utc_timestamp())) return task_id diff --git a/app/main.py b/app/main.py index 7864143..fa3f1ed 100644 --- a/app/main.py +++ b/app/main.py @@ -2,6 +2,13 @@ """Main API application""" import logging from fastapi import FastAPI +from opentelemetry import trace +from opentelemetry.sdk.resources import Resource +from opentelemetry.sdk.trace import TracerProvider +from opentelemetry.sdk.trace.export import ConsoleSpanExporter, BatchSpanProcessor, SimpleSpanProcessor +from opentelemetry.sdk.trace.sampling import TraceIdRatioBased, ParentBased +from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter +from opentelemetry.instrumentation.fastapi import FastAPIInstrumentor from app.routers.error_handlers import install_error_handlers from app.routers.facility import facility @@ -13,9 +20,34 @@ from . import config +# ------------------------------------------------------------------ +# OpenTelemetry Tracing Configuration +# ------------------------------------------------------------------ +if config.OPENTELEMETRY_ENABLED: + resource = Resource.create({ + "service.name": "iri-facility-api", + "service.version": config.API_VERSION, + "service.endpoint": config.API_URL_ROOT}) + + samplerate = "1.0" if config.OPENTELEMETRY_DEBUG else config.OTEL_SAMPLE_RATE + provider = TracerProvider(resource=resource, sampler=ParentBased(TraceIdRatioBased(samplerate))) + trace.set_tracer_provider(provider) + + if config.OTLP_ENDPOINT: + exporter = OTLPSpanExporter(endpoint=config.OTLP_ENDPOINT, insecure=True) + span_processor = BatchSpanProcessor(exporter) + else: + exporter = ConsoleSpanExporter() + span_processor = SimpleSpanProcessor(exporter) + provider.add_span_processor(span_processor) + tracer = trace.get_tracer(__name__) +# ------------------------------------------------------------------ APP = FastAPI(**config.API_CONFIG) +if config.OPENTELEMETRY_ENABLED: + FastAPIInstrumentor.instrument_app(APP) + install_error_handlers(APP) api_prefix = f"{config.API_PREFIX}{config.API_URL}" diff --git a/pyproject.toml b/pyproject.toml index 03858a4..1f5c0d6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,5 +5,9 @@ requires-python = ">=3.12" dependencies = [ "fastapi[standard]>=0.100.0", "uvicorn[standard]>=0.22.0", - "humps>=0.2.2" -] + "humps>=0.2.2", + "opentelemetry-api", + "opentelemetry-sdk", + "opentelemetry-instrumentation-fastapi", + "opentelemetry-exporter-otlp" +] \ No newline at end of file From be3057016ef83861f7fd6d166bedbde8bafc91fe Mon Sep 17 00:00:00 2001 From: Justas Balcas Date: Tue, 20 Jan 2026 14:28:41 -0600 Subject: [PATCH 11/22] Rename dependencies to common --- app/routers/account/account.py | 2 +- app/routers/account/models.py | 2 +- app/routers/{dependencies.py => common.py} | 0 app/routers/compute/compute.py | 2 +- app/routers/compute/models.py | 2 +- app/routers/facility/facility.py | 2 +- app/routers/facility/models.py | 2 +- app/routers/status/models.py | 2 +- app/routers/status/status.py | 2 +- 9 files changed, 8 insertions(+), 8 deletions(-) rename app/routers/{dependencies.py => common.py} (100%) diff --git a/app/routers/account/account.py b/app/routers/account/account.py index b2c41f4..fe16b8b 100644 --- a/app/routers/account/account.py +++ b/app/routers/account/account.py @@ -2,7 +2,7 @@ from . import models, facility_adapter from .. import iri_router from ..error_handlers import DEFAULT_RESPONSES -from ..dependencies import forbidExtraQueryParams +from ..common import forbidExtraQueryParams router = iri_router.IriRouter( diff --git a/app/routers/account/models.py b/app/routers/account/models.py index c012ee3..2158575 100644 --- a/app/routers/account/models.py +++ b/app/routers/account/models.py @@ -1,7 +1,7 @@ from pydantic import computed_field, Field import enum from ... import config -from ..dependencies import IRIBaseModel +from ..common import IRIBaseModel class AllocationUnit(enum.Enum): diff --git a/app/routers/dependencies.py b/app/routers/common.py similarity index 100% rename from app/routers/dependencies.py rename to app/routers/common.py diff --git a/app/routers/compute/compute.py b/app/routers/compute/compute.py index 7a2db23..20081ee 100644 --- a/app/routers/compute/compute.py +++ b/app/routers/compute/compute.py @@ -4,7 +4,7 @@ from ..error_handlers import DEFAULT_RESPONSES from ..status.status import router as status_router -from ..dependencies import forbidExtraQueryParams, StrictBool +from ..common import forbidExtraQueryParams, StrictBool router = iri_router.IriRouter( facility_adapter.FacilityAdapter, diff --git a/app/routers/compute/models.py b/app/routers/compute/models.py index 7bc4ab2..a56d4fe 100644 --- a/app/routers/compute/models.py +++ b/app/routers/compute/models.py @@ -1,7 +1,7 @@ from typing import Annotated from enum import IntEnum from pydantic import field_serializer, ConfigDict, StrictBool, Field -from ..dependencies import IRIBaseModel +from ..common import IRIBaseModel class ResourceSpec(IRIBaseModel): diff --git a/app/routers/facility/facility.py b/app/routers/facility/facility.py index 1c38918..c0d3e80 100644 --- a/app/routers/facility/facility.py +++ b/app/routers/facility/facility.py @@ -2,7 +2,7 @@ from .. import iri_router from ..error_handlers import DEFAULT_RESPONSES from .import models, facility_adapter -from ..dependencies import StrictDateTime, forbidExtraQueryParams +from ..common import StrictDateTime, forbidExtraQueryParams router = iri_router.IriRouter( diff --git a/app/routers/facility/models.py b/app/routers/facility/models.py index 5db7a18..508dbcf 100644 --- a/app/routers/facility/models.py +++ b/app/routers/facility/models.py @@ -1,7 +1,7 @@ """Facility-related models.""" from typing import Optional from pydantic import Field, HttpUrl -from ..dependencies import NamedObject +from ..common import NamedObject class Facility(NamedObject): short_name: Optional[str] = Field(None, description="Common or short name of the Facility.") diff --git a/app/routers/status/models.py b/app/routers/status/models.py index ff5d4e4..d338e2c 100644 --- a/app/routers/status/models.py +++ b/app/routers/status/models.py @@ -2,7 +2,7 @@ import enum from pydantic import BaseModel, computed_field, Field from ... import config -from ..dependencies import NamedObject +from ..common import NamedObject class Link(BaseModel): rel : str diff --git a/app/routers/status/status.py b/app/routers/status/status.py index 2daf30e..d599866 100644 --- a/app/routers/status/status.py +++ b/app/routers/status/status.py @@ -2,7 +2,7 @@ from . import models, facility_adapter from .. import iri_router from ..error_handlers import DEFAULT_RESPONSES -from ..dependencies import StrictDateTime, forbidExtraQueryParams +from ..common import StrictDateTime, forbidExtraQueryParams router = iri_router.IriRouter( facility_adapter.FacilityAdapter, From 6b85fbfcf66e341523ec61ff4dc6d245bdd21f42 Mon Sep 17 00:00:00 2001 From: Justas Balcas Date: Wed, 21 Jan 2026 09:26:32 -0600 Subject: [PATCH 12/22] Do not swallow exceptions --- app/routers/compute/compute.py | 9 ++++----- app/routers/iri_router.py | 6 ++---- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/app/routers/compute/compute.py b/app/routers/compute/compute.py index 20081ee..cca45be 100644 --- a/app/routers/compute/compute.py +++ b/app/routers/compute/compute.py @@ -1,3 +1,4 @@ +"""Compute resource API router""" from fastapi import HTTPException, Request, Depends, status, Query from . import models, facility_adapter from .. import iri_router @@ -6,13 +7,13 @@ from ..status.status import router as status_router from ..common import forbidExtraQueryParams, StrictBool + router = iri_router.IriRouter( facility_adapter.FacilityAdapter, prefix="/compute", tags=["compute"], ) - @router.post( "/job/{resource_id:str}", dependencies=[Depends(router.current_user)], @@ -204,8 +205,6 @@ async def cancel_job( # look up the resource (todo: maybe ensure it's available) resource = await status_router.adapter.get_resource(resource_id) - try: - await router.adapter.cancel_job(resource, user, job_id) - except Exception as exc: - raise HTTPException(status_code=400, detail=f"Unable to cancel job: {str(exc)}") from exc + await router.adapter.cancel_job(resource, user, job_id) + return None diff --git a/app/routers/iri_router.py b/app/routers/iri_router.py index d3fc9e1..f0b5b49 100644 --- a/app/routers/iri_router.py +++ b/app/routers/iri_router.py @@ -1,8 +1,8 @@ from abc import ABC, abstractmethod +import traceback import os import logging import importlib -from urllib.parse import parse_qs from fastapi import Request, Depends, HTTPException, APIRouter from fastapi.security import APIKeyHeader from .account.models import User @@ -12,9 +12,6 @@ def get_client_ip(request : Request) -> str|None: - # logging.debug("Request headers=%s" % request.headers) - # logging.debug("client=%s" % request.client.host) - forwarded_for = request.headers.get("X-Forwarded-For") if forwarded_for: return forwarded_for.split(",")[0].strip() @@ -91,6 +88,7 @@ async def current_user( user_id = await self.adapter.get_current_user(api_key, get_client_ip(request)) except Exception as exc: logging.getLogger().error(f"Error parsing IRI_API_PARAMS: {exc}") + traceback.print_exc() raise HTTPException(status_code=401, detail="Invalid or malformed Authorization parameters") from exc if not user_id: raise HTTPException(status_code=403, detail="Unauthorized access") From 952aea04bb7e8427fe5426b6890dea1d1c47afc6 Mon Sep 17 00:00:00 2001 From: Justas Balcas Date: Wed, 21 Jan 2026 18:58:36 -0600 Subject: [PATCH 13/22] Ensure that computed fields are included in output --- app/routers/common.py | 14 ++++++++++++-- app/routers/status/models.py | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/app/routers/common.py b/app/routers/common.py index 7bfaf0b..f46c888 100644 --- a/app/routers/common.py +++ b/app/routers/common.py @@ -129,13 +129,23 @@ class IRIBaseModel(BaseModel): model_config = ConfigDict(extra="allow") @model_serializer(mode="wrap") - def _hide_extra(self, handler): + def _hide_extra(self, handler, info): data = handler(self) + + model_fields = set(self.model_fields or {}) + computed_fields = set(self.model_computed_fields or {}) + print(model_fields) + print(computed_fields) extra = getattr(self, "__pydantic_extra__", {}) or {} for k in extra: - data.pop(k, None) + if k not in model_fields and k not in computed_fields: + data.pop(k, None) + return data + + + def get_extra(self, key, default=None): return getattr(self, "__pydantic_extra__", {}).get(key, default) diff --git a/app/routers/status/models.py b/app/routers/status/models.py index d338e2c..448a7e2 100644 --- a/app/routers/status/models.py +++ b/app/routers/status/models.py @@ -36,7 +36,7 @@ def _self_path(self) -> str: current_status: Status | None = Field("The current status comes from the status of the last event for this resource") resource_type: ResourceType - @computed_field(description="The list of past events in this incident") + @computed_field(description="The list of capabilities in this resource") @property def capability_uris(self) -> list[str]: return [f"{config.API_URL_ROOT}{config.API_PREFIX}{config.API_URL}/account/capabilities/{e}" for e in self.capability_ids] From a1c4e5336be12ece7ff97cae020707be3a4ee380 Mon Sep 17 00:00:00 2001 From: Justas Balcas Date: Fri, 23 Jan 2026 09:57:21 -0600 Subject: [PATCH 14/22] Code base compliant with the official Spec --- app/demo_adapter.py | 203 +++++++++++++++++++++-- app/routers/account/account.py | 17 +- app/routers/account/facility_adapter.py | 3 +- app/routers/account/models.py | 22 +-- app/routers/common.py | 48 ++++-- app/routers/facility/facility.py | 57 +++++++ app/routers/facility/facility_adapter.py | 46 +++++ app/routers/facility/models.py | 35 +++- app/routers/status/facility_adapter.py | 6 +- app/routers/status/models.py | 2 + app/routers/status/status.py | 32 ++-- 11 files changed, 398 insertions(+), 73 deletions(-) diff --git a/app/demo_adapter.py b/app/demo_adapter.py index e63c720..e68635e 100644 --- a/app/demo_adapter.py +++ b/app/demo_adapter.py @@ -9,9 +9,10 @@ import subprocess import pathlib import base64 -from pydantic import BaseModel from typing import Any, Tuple +from pydantic import BaseModel from fastapi import HTTPException +from .routers.common import AllocationUnit, Capability from .routers.facility import models as facility_models, facility_adapter as facility_adapter from .routers.status import models as status_models, facility_adapter as status_adapter from .routers.account import models as account_models, facility_adapter as account_adapter @@ -35,7 +36,7 @@ def get_base_temp_dir(cls): os.makedirs(cls._base_temp_dir, exist_ok=True) # create a test file - with open(f"{cls._base_temp_dir}/test.txt", "w") as f: + with open(f"{cls._base_temp_dir}/test.txt", encoding="utf-8", mode="w") as f: f.write("hello world") return cls._base_temp_dir @@ -67,12 +68,57 @@ def __init__(self): self.project_allocations = [] self.user_allocations = [] self.facility = {} + self.locations = [] + self.sites = [] self._init_state() def _init_state(self): now = utc_now() + loc1 = facility_models.Location( + id=demo_uuid("location", "demo_location_1"), + name="Demo Location 1", + description="The first demo location", + last_modified=now, + short_name="DL1", + country_name="USA", + locality_name="Demo City", + state_or_province_name="DC", + latitude=36.173357, + longitude=-234.51452) + + loc2 = facility_models.Location( + id=demo_uuid("location", "demo_location_2"), + name="Demo Location 2", + description="The second demo location", + last_modified=now, + short_name="DL2", + country_name="USA", + locality_name="Example Town", + state_or_province_name="ET", + latitude=38.410558, + longitude=-286.36999) + + site1 = facility_models.Site( + id=demo_uuid("site", "demo_site_1"), + name="Demo Site 1", + description="The first demo site", + last_modified=now, + short_name="DS1", + operating_organization="Demo Org", + location_uri=loc1.self_uri, + resource_uris=[]) + site2 = facility_models.Site( + id=demo_uuid("site", "demo_site_2"), + name="Demo Site 2", + description="The second demo site", + last_modified=now, + short_name="DS2", + operating_organization="Demo Org", + location_uri=loc2.self_uri, + resource_uris=[]) + self.facility = facility_models.Facility( id=demo_uuid("facility", "demo_facility"), name="Demo Facility", @@ -81,22 +127,29 @@ def _init_state(self): short_name="DEMO", organization_name="Demo Organization", support_uri="https://support.demo.example", - facility_uri="https://www.demo.example", - country_name="USA", - locality_name="Example Town", - state_or_province_name="ET", - street_address="1 main st", - latitude=38.410558, - longitude=-286.36999 + site_uris=[site1.self_uri, site2.self_uri], + location_uris=[loc1.self_uri, loc2.self_uri], + resource_uris=[], + event_uris=[], + incident_uris=[], + capability_uris=[], + project_uris=[], + project_allocation_uris=[], + user_allocation_uris=[], ) + loc1.site_uris.append(site1.self_uri) + loc2.site_uris.append(site2.self_uri) + self.locations = [loc1, loc2] + self.sites = [site1, site2] + day_ago = utc_now() - datetime.timedelta(days=1) self.capabilities = { - "cpu": account_models.Capability(id=str(uuid.uuid4()), name="CPU Nodes", units=[account_models.AllocationUnit.node_hours]), - "gpu": account_models.Capability(id=str(uuid.uuid4()), name="GPU Nodes", units=[account_models.AllocationUnit.node_hours]), - "hpss": account_models.Capability(id=str(uuid.uuid4()), name="Tape Storage", units=[account_models.AllocationUnit.bytes, account_models.AllocationUnit.inodes]), - "gpfs": account_models.Capability(id=str(uuid.uuid4()), name="GPFS Storage", units=[account_models.AllocationUnit.bytes, account_models.AllocationUnit.inodes]), + "cpu": Capability(id=str(uuid.uuid4()), name="CPU Nodes", units=[AllocationUnit.node_hours]), + "gpu": Capability(id=str(uuid.uuid4()), name="GPU Nodes", units=[AllocationUnit.node_hours]), + "hpss": Capability(id=str(uuid.uuid4()), name="Tape Storage", units=[AllocationUnit.bytes, AllocationUnit.inodes]), + "gpfs": Capability(id=str(uuid.uuid4()), name="GPFS Storage", units=[AllocationUnit.bytes, AllocationUnit.inodes]), } pm = status_models.Resource(id=str(uuid.uuid4()), group="perlmutter", name="compute nodes", description="the perlmutter computer compute nodes", capability_ids=[ @@ -226,6 +279,125 @@ async def get_facility( ) -> facility_models.Facility: return self.facility + + async def list_sites( + self: "DemoAdapter", + modified_since: str | None = None, + name: str | None = None, + offset: int | None = None, + limit: int | None = None, + short_name: str | None = None, + ) -> list[facility_models.Site]: + + sites = self.sites + + if name: + sites = [s for s in sites if name.lower() in s.name.lower()] + + if short_name: + sites = [s for s in sites if s.short_name == short_name] + + if modified_since: + ms = datetime.datetime.fromisoformat(str(modified_since)) + sites = [s for s in sites if s.last_modified > ms] + + o = offset or 0 + l = limit or len(sites) + return sites[o:o+l] + + + async def get_site( + self: "DemoAdapter", + site_id: str, + modified_since: str | None = None, + ) -> facility_models.Site: + + site = next((s for s in self.sites if s.id == site_id), None) + if not site: + raise HTTPException(status_code=404, detail="Site not found") + + if modified_since: + ms = datetime.datetime.fromisoformat(str(modified_since)) + if site.last_modified <= ms: + raise HTTPException(status_code=304, headers={"Last-Modified": site.last_modified.isoformat()}) + + return site + + + async def get_site_location( + self: "DemoAdapter", + site_id: str, + modified_since: str | None = None, + ) -> facility_models.Location: + + site = await self.get_site(site_id) + + if not site.location_uri: + raise HTTPException(status_code=404, detail="Site has no location") + + location = next((l for l in self.locations if l.self_uri == str(site.location_uri)), None) + + if not location: + raise HTTPException(status_code=404, detail="Location not found") + + if modified_since: + ms = datetime.datetime.fromisoformat(str(modified_since)) + if location.last_modified <= ms: + raise HTTPException(status_code=304, headers={"Last-Modified": location.last_modified.isoformat()}) + + return location + + + async def list_locations( + self: "DemoAdapter", + modified_since: str | None = None, + name: str | None = None, + offset: int | None = None, + limit: int | None = None, + short_name: str | None = None, + country_name: str | None = None, + ) -> list[facility_models.Location]: + + locs = self.locations + + if name: + locs = [l for l in locs if name.lower() in l.name.lower()] + + if short_name: + locs = [l for l in locs if l.short_name == short_name] + + if country_name: + locs = [l for l in locs if l.country_name == country_name] + + if modified_since: + ms = datetime.datetime.fromisoformat(str(modified_since)) + locs = [l for l in locs if l.last_modified > ms] + + o = offset or 0 + l = limit or len(locs) + return locs[o:o+l] + + + async def get_location( + self: "DemoAdapter", + location_id: str, + modified_since: str | None = None, + ) -> facility_models.Location: + + location = next((l for l in self.locations if l.id == location_id), None) + + if not location: + raise HTTPException(status_code=404, detail="Location not found") + + if modified_since: + ms = datetime.datetime.fromisoformat(str(modified_since)) + if location.last_modified <= ms: + raise HTTPException(status_code=304, headers={"Last-Modified": location.last_modified.isoformat()}) + return location + + + + # ---------------------------- # Status API # ---------------------------- @@ -239,6 +411,8 @@ async def get_resources( group : str | None = None, modified_since : datetime.datetime | None = None, resource_type : status_models.ResourceType | None = None, + current_status : status_models.Status | None = None, + capability: Capability | None = None ) -> list[status_models.Resource]: return status_models.Resource.find(self.resources, name, description, group, modified_since, resource_type)[offset:offset + limit] @@ -288,6 +462,7 @@ async def get_incidents( time_ : datetime.datetime | None = None, modified_since : datetime.datetime | None = None, resource_id : str | None = None, + resolution: status_models.Resolution | None = None, ) -> list[status_models.Incident]: return status_models.Incident.find(self.incidents, name, description, status, type, from_, to, time_, modified_since, resource_id)[offset:offset + limit] @@ -301,7 +476,7 @@ async def get_incident( async def get_capabilities( self : "DemoAdapter", - ) -> list[account_models.Capability]: + ) -> list[Capability]: return self.capabilities.values() diff --git a/app/routers/account/account.py b/app/routers/account/account.py index fe16b8b..f856312 100644 --- a/app/routers/account/account.py +++ b/app/routers/account/account.py @@ -1,8 +1,8 @@ -from fastapi import HTTPException, Request, Depends +from fastapi import HTTPException, Request, Depends, Query from . import models, facility_adapter from .. import iri_router from ..error_handlers import DEFAULT_RESPONSES -from ..common import forbidExtraQueryParams +from ..common import forbidExtraQueryParams, StrictDateTime, Capability router = iri_router.IriRouter( @@ -22,8 +22,12 @@ ) async def get_capabilities( request : Request, - _forbid = Depends(forbidExtraQueryParams()), - ) -> list[models.Capability]: + name : str = Query(default=None, min_length=1), + modified_since: StrictDateTime = Query(default=None), + offset : int = Query(default=0, ge=0, le=1000), + limit : int = Query(default=100, ge=0, le=1000), + _forbid = Depends(forbidExtraQueryParams("name", "modified_since", "offset", "limit")), + ) -> list[Capability]: return await router.adapter.get_capabilities() @@ -37,8 +41,9 @@ async def get_capabilities( async def get_capability( capability_id : str, request : Request, - _forbid = Depends(forbidExtraQueryParams()), - ) -> models.Capability: + modified_since: StrictDateTime = Query(default=None), + _forbid = Depends(forbidExtraQueryParams("modified_since")), + ) -> Capability: caps = await router.adapter.get_capabilities() cc = next((c for c in caps if c.id == capability_id), None) if not cc: diff --git a/app/routers/account/facility_adapter.py b/app/routers/account/facility_adapter.py index 78b622f..235a2f7 100644 --- a/app/routers/account/facility_adapter.py +++ b/app/routers/account/facility_adapter.py @@ -1,5 +1,6 @@ from abc import abstractmethod from . import models as account_models +from ..common import Capability from ..iri_router import AuthenticatedAdapter @@ -13,7 +14,7 @@ class FacilityAdapter(AuthenticatedAdapter): @abstractmethod async def get_capabilities( self : "FacilityAdapter", - ) -> list[account_models.Capability]: + ) -> list[Capability]: pass diff --git a/app/routers/account/models.py b/app/routers/account/models.py index 2158575..1a9333d 100644 --- a/app/routers/account/models.py +++ b/app/routers/account/models.py @@ -1,26 +1,6 @@ from pydantic import computed_field, Field -import enum from ... import config -from ..common import IRIBaseModel - - -class AllocationUnit(enum.Enum): - node_hours = "node_hours" - bytes = "bytes" - inodes = "inodes" - - -class Capability(IRIBaseModel): - """ - An aspect of a resource that can have an allocation. - For example, Perlmutter nodes with GPUs - For some resources at a facility, this will be 1 to 1 with the resource. - It is a way to further subdivide a resource into allocatable sub-resources. - The word "capability" is also known to users as something they need for a job to run. (eg. gpu) - """ - id: str - name: str - units: list[AllocationUnit] +from ..common import IRIBaseModel, AllocationUnit class User(IRIBaseModel): diff --git a/app/routers/common.py b/app/routers/common.py index f46c888..d580565 100644 --- a/app/routers/common.py +++ b/app/routers/common.py @@ -1,5 +1,6 @@ """Default models used by multiple routers.""" import datetime +import enum from typing import Optional from urllib.parse import parse_qs @@ -93,7 +94,11 @@ def __get_pydantic_json_schema__(cls, schema, handler): } -def forbidExtraQueryParams(*allowedParams: str): +def forbidExtraQueryParams(*allowedParams: str, multiParams: set[str] | None = None): + multiParams = multiParams or set() + + print(allowedParams, multiParams) + async def checker(req: Request): if "*" in allowedParams: return @@ -110,20 +115,26 @@ async def checker(req: Request): detail=[{ "type": "extra_forbidden", "loc": ["query", key], - "msg": f"Unexpected query parameter: {key}" - }]) + "msg": f"Unexpected query parameter: {key}", + }], + ) - if len(values) > 1: + if len(values) > 1 and key not in multiParams: raise HTTPException( status_code=422, detail=[{ "type": "duplicate_forbidden", "loc": ["query", key], - "msg": f"Duplicate query parameter: {key}" - }]) + "msg": f"Duplicate query parameter: {key}", + }], + ) + return checker + + + class IRIBaseModel(BaseModel): """Base model for IRI models.""" model_config = ConfigDict(extra="allow") @@ -134,18 +145,12 @@ def _hide_extra(self, handler, info): model_fields = set(self.model_fields or {}) computed_fields = set(self.model_computed_fields or {}) - print(model_fields) - print(computed_fields) extra = getattr(self, "__pydantic_extra__", {}) or {} for k in extra: if k not in model_fields and k not in computed_fields: data.pop(k, None) - return data - - - def get_extra(self, key, default=None): return getattr(self, "__pydantic_extra__", {}).get(key, default) @@ -188,3 +193,22 @@ def normalize(dt: datetime) -> datetime: modified_since = modified_since.replace(tzinfo=datetime.timezone.utc) a = [aa for aa in a if normalize(aa.last_modified) >= modified_since] return a + + +class AllocationUnit(enum.Enum): + node_hours = "node_hours" + bytes = "bytes" + inodes = "inodes" + + +class Capability(IRIBaseModel): + """ + An aspect of a resource that can have an allocation. + For example, Perlmutter nodes with GPUs + For some resources at a facility, this will be 1 to 1 with the resource. + It is a way to further subdivide a resource into allocatable sub-resources. + The word "capability" is also known to users as something they need for a job to run. (eg. gpu) + """ + id: str + name: str + units: list[AllocationUnit] \ No newline at end of file diff --git a/app/routers/facility/facility.py b/app/routers/facility/facility.py index c0d3e80..7c685e1 100644 --- a/app/routers/facility/facility.py +++ b/app/routers/facility/facility.py @@ -19,3 +19,60 @@ async def get_facility( ) -> models.Facility: """Get facility information""" return await router.adapter.get_facility(modified_since=modified_since) + +@router.get("/sites", responses=DEFAULT_RESPONSES, operation_id="getSites") +async def list_sites( + request: Request, + modified_since: StrictDateTime = Query(default=None), + name: str = Query(default=None, min_length=1), + offset: int = Query(default=0, ge=0, le=1000), + limit: int = Query(default=100, ge=0, le=1000), + short_name: str = Query(default=None, min_length=1), + _forbid = Depends(forbidExtraQueryParams("modified_since", "name", "offset", "limit", "short_name")), + )-> list[models.Site]: + """List sites""" + return await router.adapter.list_sites(modified_since=modified_since, name=name, offset=offset, limit=limit, short_name=short_name) + +@router.get("/sites/{site_id}", responses=DEFAULT_RESPONSES, operation_id="getSite") +async def get_site( + request: Request, + site_id: str, + modified_since: StrictDateTime = Query(default=None), + _forbid = Depends(forbidExtraQueryParams("modified_since")), + )-> models.Site: + """Get site by ID""" + return await router.adapter.get_site(site_id=site_id, modified_since=modified_since) + +@router.get("/sites/{site_id}/location", responses=DEFAULT_RESPONSES, operation_id="getLocationBySite") +async def get_site_location( + request : Request, + site_id: str, + modified_since: StrictDateTime = Query(default=None), + _forbid = Depends(forbidExtraQueryParams("modified_since")), + )-> models.Location: + """Get site location by site ID""" + return await router.adapter.get_site_location(site_id=site_id, modified_since=modified_since) + +@router.get("/locations", responses=DEFAULT_RESPONSES, operation_id="getLocations") +async def list_locations( + request : Request, + modified_since: StrictDateTime = Query(default=None), + name: str = Query(default=None, min_length=1), + offset: int = Query(default=0, ge=0, le=1000), + limit: int = Query(default=100, ge=0, le=1000), + short_name: str = Query(default=None, min_length=1), + country_name: str = Query(default=None, min_length=1), + _forbid = Depends(forbidExtraQueryParams("modified_since", "name", "offset", "limit", "short_name", "country_name")), + )-> list[models.Location]: + """List locations""" + return await router.adapter.list_locations(modified_since=modified_since, name=name, offset=offset, limit=limit, short_name=short_name, country_name=country_name) + +@router.get("/locations/{location_id}", responses=DEFAULT_RESPONSES, operation_id="getLocation") +async def get_location( + request : Request, + location_id: str, + modified_since: StrictDateTime = Query(default=None), + _forbid = Depends(forbidExtraQueryParams("modified_since")), + )-> models.Location: + """Get location by ID""" + return await router.adapter.get_location(location_id=location_id, modified_since=modified_since) \ No newline at end of file diff --git a/app/routers/facility/facility_adapter.py b/app/routers/facility/facility_adapter.py index cbee951..d316674 100644 --- a/app/routers/facility/facility_adapter.py +++ b/app/routers/facility/facility_adapter.py @@ -17,3 +17,49 @@ async def get_facility( ) -> facility_models.Facility | None: pass + @abstractmethod + async def list_sites( + self: "FacilityAdapter", + modified_since: str | None = None, + name: str | None = None, + offset: int | None = None, + limit: int | None = None, + short_name: str | None = None, + ) -> list[facility_models.Site]: + pass + + @abstractmethod + async def get_site( + self: "FacilityAdapter", + site_id: str, + modified_since: str | None = None, + ) -> facility_models.Site | None: + pass + + @abstractmethod + async def get_site_location( + self: "FacilityAdapter", + site_id: str, + modified_since: str | None = None, + ) -> facility_models.Location | None: + pass + + @abstractmethod + async def list_locations( + self: "FacilityAdapter", + modified_since: str | None = None, + name: str | None = None, + offset: int | None = None, + limit: int | None = None, + short_name: str | None = None, + country_name: str | None = None, + ) -> list[facility_models.Location]: + pass + + @abstractmethod + async def get_location( + self: "FacilityAdapter", + location_id: str, + modified_since: str | None = None, + ) -> facility_models.Location | None: + pass diff --git a/app/routers/facility/models.py b/app/routers/facility/models.py index 508dbcf..fd164fa 100644 --- a/app/routers/facility/models.py +++ b/app/routers/facility/models.py @@ -1,13 +1,22 @@ """Facility-related models.""" -from typing import Optional +from typing import Optional, List from pydantic import Field, HttpUrl from ..common import NamedObject -class Facility(NamedObject): - short_name: Optional[str] = Field(None, description="Common or short name of the Facility.") - organization_name: Optional[str] = Field(None, description="Operating organization's name.") - facility_uri: Optional[HttpUrl] = Field(None, description="URI of this facility.") - support_uri: Optional[HttpUrl] = Field(None, description="Link to facility support portal.") + + +class Site(NamedObject): + def _self_path(self) -> str: + return f"/facility/sites/{self.id}" + short_name: Optional[str] = Field(None, description="Common or short name of the Site.") + operating_organization: str = Field(..., description="Organization operating the Site.") + location_uri: Optional[HttpUrl] = Field(None, description="URI of Location containing this Site.") + resource_uris: List[HttpUrl] = Field(default_factory=list, description="URIs of Resources hosted at this Site.") + +class Location(NamedObject): + def _self_path(self) -> str: + return f"/facility/locations/{self.id}" + short_name: Optional[str] = Field(None, description="Common or short name of the Location.") country_name: Optional[str] = Field(None, description="Country name of the Location.") locality_name: Optional[str] = Field(None, description="City or locality name of the Location.") state_or_province_name: Optional[str] = Field(None, description="State or province name of the Location.") @@ -16,7 +25,21 @@ class Facility(NamedObject): altitude: Optional[float] = Field(None, description="Altitude of the Location.") latitude: Optional[float] = Field(None, description="Latitude of the Location.") longitude: Optional[float] = Field(None, description="Longitude of the Location.") + site_uris: List[HttpUrl] = Field(default_factory=list, description="URIs of Sites contained in this Location.") +class Facility(NamedObject): def _self_path(self) -> str: return f"/facility/facilities/{self.id}" + short_name: Optional[str] = Field(None, description="Common or short name of the Facility.") + organization_name: Optional[str] = Field(None, description="Operating organization’s name.") + support_uri: Optional[HttpUrl] = Field(None, description="Link to facility support portal.") + site_uris: List[HttpUrl] = Field(default_factory=list, description="URIs of associated Sites.") + location_uris: List[HttpUrl] = Field(default_factory=list, description="URIs of associated Locations.") + resource_uris: List[HttpUrl] = Field(default_factory=list, description="URIs of contained Resources.") + event_uris: List[HttpUrl] = Field(default_factory=list, description="URIs of Events in this Facility.") + incident_uris: List[HttpUrl] = Field(default_factory=list, description="URIs of Incidents in this Facility.") + capability_uris: List[HttpUrl] = Field(default_factory=list, description="URIs of Capabilities offered by the Facility.") + project_uris: List[HttpUrl] = Field(default_factory=list, description="URIs of Projects associated with this Facility.") + project_allocation_uris: List[HttpUrl] = Field(default_factory=list, description="URIs of Project Allocations.") + user_allocation_uris: List[HttpUrl] = Field(default_factory=list, description="URIs of User Allocations.") diff --git a/app/routers/status/facility_adapter.py b/app/routers/status/facility_adapter.py index 6753a47..d7358c5 100644 --- a/app/routers/status/facility_adapter.py +++ b/app/routers/status/facility_adapter.py @@ -2,6 +2,7 @@ import datetime from fastapi import Query from . import models as status_models +from ..common import Capability class FacilityAdapter(ABC): @@ -21,7 +22,9 @@ async def get_resources( description : str | None = None, group : str | None = None, modified_since : datetime.datetime | None = None, - resource_type: status_models.ResourceType = Query(default=None) + resource_type: status_models.ResourceType = Query(default=None), + current_status: status_models.Status = Query(default=None), + capability: Capability | None = None, ) -> list[status_models.Resource]: pass @@ -75,6 +78,7 @@ async def get_incidents( time_ : datetime.datetime | None = None, modified_since : datetime.datetime | None = None, resource_id : str | None = None, + resolution: status_models.Resolution | None = None, ) -> list[status_models.Incident]: pass diff --git a/app/routers/status/models.py b/app/routers/status/models.py index 448a7e2..3650451 100644 --- a/app/routers/status/models.py +++ b/app/routers/status/models.py @@ -101,6 +101,7 @@ def find( class IncidentType(enum.Enum): planned = "planned" unplanned = "unplanned" + reservation = "reservation" class Resolution(enum.Enum): @@ -111,6 +112,7 @@ class Resolution(enum.Enum): pending = "pending" + class Incident(NamedObject): def _self_path(self) -> str: diff --git a/app/routers/status/status.py b/app/routers/status/status.py index d599866..5290a8a 100644 --- a/app/routers/status/status.py +++ b/app/routers/status/status.py @@ -1,8 +1,9 @@ +from typing import Optional, List, Annotated from fastapi import HTTPException, Request, Query, Depends from . import models, facility_adapter from .. import iri_router from ..error_handlers import DEFAULT_RESPONSES -from ..common import StrictDateTime, forbidExtraQueryParams +from ..common import StrictDateTime, forbidExtraQueryParams, AllocationUnit router = iri_router.IriRouter( facility_adapter.FacilityAdapter, @@ -22,13 +23,16 @@ async def get_resources( name : str = Query(default=None, min_length=1), description : str = Query(default=None, min_length=1), group : str = Query(default=None, min_length=1), - offset : int = Query(default=0, ge=0), - limit : int = Query(default=100, le=1000), + offset : int = Query(default=0, ge=0, le=1000), + limit : int = Query(default=100, ge=0, le=1000), modified_since: StrictDateTime = Query(default=None), resource_type: models.ResourceType = Query(default=None), - _forbid = Depends(forbidExtraQueryParams("name", "description", "group", "offset", "limit", "modified_since", "resource_type")), + current_status: models.Status = Query(default=None), + #event_uris: Optional[List[str]] = Query(default=None, min_length=1), + capability: Annotated[Optional[List[AllocationUnit]], Query()] = None, + _forbid = Depends(forbidExtraQueryParams("name", "description", "group", "offset", "limit", "modified_since", "resource_type", "current_status", "capability", multiParams={"capability"})), ) -> list[models.Resource]: - return await router.adapter.get_resources(offset, limit, name, description, group, modified_since, resource_type) + return await router.adapter.get_resources(offset, limit, name, description, group, modified_since, resource_type, current_status) @router.get( @@ -48,7 +52,7 @@ async def get_resource( return item -@router.get( +@router.get( "/incidents", summary="Get all incidents without their events", description="Get a list of all incidents. Each incident will be returned without its events. You can optionally filter the returned list by specifying attributes.", @@ -66,11 +70,15 @@ async def get_incidents( to : StrictDateTime = Query(default=None), modified_since : StrictDateTime = Query(default=None), resource_id : str = Query(default=None, min_length=1), - offset : int = Query(default=0, ge=0), - limit : int = Query(default=100, le=1000), - _forbid = Depends(forbidExtraQueryParams("name", "description", "status", "type", "from", "to", "time", "modified_since", "resource_id", "offset", "limit")), + offset : int = Query(default=0, ge=0, le=1000), + limit : int = Query(default=100, ge=0, le=1000), + resolution : models.Resolution = Query(default=None), + resource_uris: Optional[List[str]] = Query(default=None, min_length=1), + event_uris: Optional[List[str]] = Query(default=None, min_length=1), + _forbid = Depends(forbidExtraQueryParams("name", "description", "status", "type", "from", "to", "time", "modified_since", "resource_id", + "offset", "limit", "resolution", "resource_uris", "event_uris", multiParams={"resource_uris", "event_uris"})), ) -> list[models.Incident]: - return await router.adapter.get_incidents(offset, limit, name, description, status, type_, from_, to, time_, modified_since, resource_id) + return await router.adapter.get_incidents(offset, limit, name, description, status, type_, from_, to, time_, modified_since, resource_id, resolution) @router.get( @@ -109,8 +117,8 @@ async def get_events( time_ : StrictDateTime = Query(alias="time", default=None), to : StrictDateTime = Query(default=None), modified_since : StrictDateTime = Query(default=None), - offset : int = Query(default=0, ge=0), - limit : int = Query(default=100, le=1000), + offset : int = Query(default=0, ge=0, le=1000), + limit : int = Query(default=100, ge=0, le=1000), _forbid = Depends(forbidExtraQueryParams("resource_id", "name", "description", "status", "from", "to", "time", "modified_since", "offset", "limit")), ) -> list[models.Event]: return await router.adapter.get_events(incident_id, offset, limit, resource_id, name, description, status, from_, to, time_, modified_since) From 6fb8e8b054ebb5bffec8801bc707e337c7cc752e Mon Sep 17 00:00:00 2001 From: Justas Balcas Date: Fri, 23 Jan 2026 13:08:21 -0600 Subject: [PATCH 15/22] Fully compliant with official spec --- app/routers/common.py | 28 +++++++++------------------- app/routers/status/status.py | 5 ++--- 2 files changed, 11 insertions(+), 22 deletions(-) diff --git a/app/routers/common.py b/app/routers/common.py index d580565..fd2882f 100644 --- a/app/routers/common.py +++ b/app/routers/common.py @@ -97,8 +97,6 @@ def __get_pydantic_json_schema__(cls, schema, handler): def forbidExtraQueryParams(*allowedParams: str, multiParams: set[str] | None = None): multiParams = multiParams or set() - print(allowedParams, multiParams) - async def checker(req: Request): if "*" in allowedParams: return @@ -110,31 +108,23 @@ async def checker(req: Request): for key, values in parsed.items(): if key not in allowed: - raise HTTPException( - status_code=422, - detail=[{ - "type": "extra_forbidden", - "loc": ["query", key], - "msg": f"Unexpected query parameter: {key}", - }], - ) + raise HTTPException(status_code=422, + detail=[{"type": "extra_forbidden", + "loc": ["query", key], + "msg": f"Unexpected query parameter: {key}"}]) + if len(values) > 1 and key not in multiParams: - raise HTTPException( - status_code=422, - detail=[{ - "type": "duplicate_forbidden", - "loc": ["query", key], - "msg": f"Duplicate query parameter: {key}", - }], - ) + raise HTTPException(status_code=422, + detail=[{"type": "duplicate_forbidden", + "loc": ["query", key], + "msg": f"Duplicate query parameter: {key}"}]) return checker - class IRIBaseModel(BaseModel): """Base model for IRI models.""" model_config = ConfigDict(extra="allow") diff --git a/app/routers/status/status.py b/app/routers/status/status.py index 5290a8a..6a0e948 100644 --- a/app/routers/status/status.py +++ b/app/routers/status/status.py @@ -28,11 +28,10 @@ async def get_resources( modified_since: StrictDateTime = Query(default=None), resource_type: models.ResourceType = Query(default=None), current_status: models.Status = Query(default=None), - #event_uris: Optional[List[str]] = Query(default=None, min_length=1), - capability: Annotated[Optional[List[AllocationUnit]], Query()] = None, + capability: List[AllocationUnit] = Query(default=None, min_length=1), _forbid = Depends(forbidExtraQueryParams("name", "description", "group", "offset", "limit", "modified_since", "resource_type", "current_status", "capability", multiParams={"capability"})), ) -> list[models.Resource]: - return await router.adapter.get_resources(offset, limit, name, description, group, modified_since, resource_type, current_status) + return await router.adapter.get_resources(offset, limit, name, description, group, modified_since, resource_type, current_status, capability) @router.get( From 53bc4c39791ea550b04a484df9e97027744e7894 Mon Sep 17 00:00:00 2001 From: Justas Balcas Date: Fri, 23 Jan 2026 13:45:23 -0600 Subject: [PATCH 16/22] Enforce Py 3.14 as used release for everything --- .github/workflows/api-validation.yml | 11 ++++++----- Dockerfile | 2 +- pyproject.toml | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/api-validation.yml b/.github/workflows/api-validation.yml index 624e84e..e4d688b 100644 --- a/.github/workflows/api-validation.yml +++ b/.github/workflows/api-validation.yml @@ -15,19 +15,18 @@ jobs: with: token: ${{ secrets.GITHUB_TOKEN }} - # TODO: Change to official iri-facility-api-docs repo once https://github.com/doe-iri/iri-facility-api-docs/pull/11 is merged - name: Checkout schema validator repository uses: actions/checkout@v4 with: - repository: juztas/iri-facility-api-docs - ref: schemavalidator + repository: doe-iri/iri-facility-api-docs + ref: main path: schema-validator token: ${{ secrets.GITHUB_TOKEN }} - name: Set up Python uses: actions/setup-python@v5 with: - python-version: "3.12" + python-version: "3.14" - name: Install uv run: pip install uv @@ -81,6 +80,8 @@ jobs: --report-name schemathesis-local echo "exitcode=$?" >> $GITHUB_OUTPUT + # TODO: Change back to https://raw.githubusercontent.com/doe-iri/iri-facility-api-docs/refs/heads/main/specification/openapi/openapi_iri_facility_api_v1.json + # Once https://github.com/doe-iri/iri-facility-api-docs/pull/12 merged. - name: Run Schemathesis validation (official spec) id: schemathesis_official env: @@ -90,7 +91,7 @@ jobs: source .venv/bin/activate python schema-validator/verification/api-validator.py \ --baseurl http://localhost:8000 \ - --schema-url https://raw.githubusercontent.com/doe-iri/iri-facility-api-docs/refs/heads/main/specification/openapi/openapi_iri_facility_api_v1.json \ + --schema-url https://raw.githubusercontent.com/juztas/iri-facility-api-docs/refs/heads/newspec/specification/openapi/openapi_iri_facility_api_v1.json \ --report-name schemathesis-official echo "exitcode=$?" >> $GITHUB_OUTPUT diff --git a/Dockerfile b/Dockerfile index f3ad071..93c80d9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3 +FROM python:3.14 RUN mkdir /app COPY . /app diff --git a/pyproject.toml b/pyproject.toml index 1f5c0d6..6dbf14b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [project] name = "iri-api-python" version = "0.1.0" -requires-python = ">=3.12" +requires-python = ">=3.12,<3.13" dependencies = [ "fastapi[standard]>=0.100.0", "uvicorn[standard]>=0.22.0", @@ -10,4 +10,4 @@ dependencies = [ "opentelemetry-sdk", "opentelemetry-instrumentation-fastapi", "opentelemetry-exporter-otlp" -] \ No newline at end of file +] From 846c1f8df388ac2dbc110417d5562c167cc0aa46 Mon Sep 17 00:00:00 2001 From: Justas Balcas Date: Fri, 23 Jan 2026 17:10:38 -0600 Subject: [PATCH 17/22] Enable deepsource scanning --- .deepsource.toml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .deepsource.toml diff --git a/.deepsource.toml b/.deepsource.toml new file mode 100644 index 0000000..01a1066 --- /dev/null +++ b/.deepsource.toml @@ -0,0 +1,9 @@ +version = 1 + +[[analyzers]] +name = "python" +enabled = true + + [analyzers.meta] + runtime_version = "3.x.x" + max_line_length = 200 From 2374d341d34ae4aa6344c4d6170e9e137f94e102 Mon Sep 17 00:00:00 2001 From: Justas Balcas Date: Sun, 25 Jan 2026 08:08:41 -0600 Subject: [PATCH 18/22] Enforce consistent package versions (pin major/minor version) --- pyproject.toml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 6dbf14b..63f6c02 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,13 +1,13 @@ [project] name = "iri-api-python" version = "0.1.0" -requires-python = ">=3.12,<3.13" +requires-python = ">=3.14,<3.15" dependencies = [ - "fastapi[standard]>=0.100.0", - "uvicorn[standard]>=0.22.0", - "humps>=0.2.2", - "opentelemetry-api", - "opentelemetry-sdk", - "opentelemetry-instrumentation-fastapi", - "opentelemetry-exporter-otlp" -] + "fastapi[standard]>=0.128.0,<0.129.0", + "uvicorn[standard]>=0.40.0,<0.41.0", + "humps>=0.2.2,<0.3.0", + "opentelemetry-api>=1.39.1,<1.40.0", + "opentelemetry-sdk>=1.39.1,<1.40.0", + "opentelemetry-instrumentation-fastapi>=0.60b1,<0.61b0", + "opentelemetry-exporter-otlp>=1.39.1,<1.40.0" +] \ No newline at end of file From 2040b483ffb839416996fb0c4cb4476ab67b6ae8 Mon Sep 17 00:00:00 2001 From: Justas Balcas Date: Thu, 5 Feb 2026 12:54:35 -0600 Subject: [PATCH 19/22] Update Facility endpoint (based on new Format discussed during the meeting) --- .github/workflows/api-validation.yml | 4 +- app/demo_adapter.py | 124 +++-------------------- app/routers/facility/facility.py | 36 +------ app/routers/facility/facility_adapter.py | 30 +----- app/routers/facility/models.py | 21 +--- app/routers/status/models.py | 11 +- 6 files changed, 26 insertions(+), 200 deletions(-) diff --git a/.github/workflows/api-validation.yml b/.github/workflows/api-validation.yml index e4d688b..51ed331 100644 --- a/.github/workflows/api-validation.yml +++ b/.github/workflows/api-validation.yml @@ -80,8 +80,6 @@ jobs: --report-name schemathesis-local echo "exitcode=$?" >> $GITHUB_OUTPUT - # TODO: Change back to https://raw.githubusercontent.com/doe-iri/iri-facility-api-docs/refs/heads/main/specification/openapi/openapi_iri_facility_api_v1.json - # Once https://github.com/doe-iri/iri-facility-api-docs/pull/12 merged. - name: Run Schemathesis validation (official spec) id: schemathesis_official env: @@ -91,7 +89,7 @@ jobs: source .venv/bin/activate python schema-validator/verification/api-validator.py \ --baseurl http://localhost:8000 \ - --schema-url https://raw.githubusercontent.com/juztas/iri-facility-api-docs/refs/heads/newspec/specification/openapi/openapi_iri_facility_api_v1.json \ + --schema-url https://raw.githubusercontent.com/doe-iri/iri-facility-api-docs/refs/heads/main/specification/openapi/openapi_iri_facility_api_v1.json \ --report-name schemathesis-official echo "exitcode=$?" >> $GITHUB_OUTPUT diff --git a/app/demo_adapter.py b/app/demo_adapter.py index e68635e..50a9267 100644 --- a/app/demo_adapter.py +++ b/app/demo_adapter.py @@ -76,30 +76,6 @@ def __init__(self): def _init_state(self): now = utc_now() - loc1 = facility_models.Location( - id=demo_uuid("location", "demo_location_1"), - name="Demo Location 1", - description="The first demo location", - last_modified=now, - short_name="DL1", - country_name="USA", - locality_name="Demo City", - state_or_province_name="DC", - latitude=36.173357, - longitude=-234.51452) - - loc2 = facility_models.Location( - id=demo_uuid("location", "demo_location_2"), - name="Demo Location 2", - description="The second demo location", - last_modified=now, - short_name="DL2", - country_name="USA", - locality_name="Example Town", - state_or_province_name="ET", - latitude=38.410558, - longitude=-286.36999) - site1 = facility_models.Site( id=demo_uuid("site", "demo_site_1"), name="Demo Site 1", @@ -107,8 +83,13 @@ def _init_state(self): last_modified=now, short_name="DS1", operating_organization="Demo Org", - location_uri=loc1.self_uri, + country_name="USA", + locality_name="Demo City", + state_or_province_name="DC", + latitude=36.173357, + longitude=-234.51452, resource_uris=[]) + site2 = facility_models.Site( id=demo_uuid("site", "demo_site_2"), name="Demo Site 2", @@ -116,7 +97,11 @@ def _init_state(self): last_modified=now, short_name="DS2", operating_organization="Demo Org", - location_uri=loc2.self_uri, + country_name="USA", + locality_name="Example Town", + state_or_province_name="ET", + latitude=38.410558, + longitude=-286.36999, resource_uris=[]) self.facility = facility_models.Facility( @@ -127,20 +112,9 @@ def _init_state(self): short_name="DEMO", organization_name="Demo Organization", support_uri="https://support.demo.example", - site_uris=[site1.self_uri, site2.self_uri], - location_uris=[loc1.self_uri, loc2.self_uri], - resource_uris=[], - event_uris=[], - incident_uris=[], - capability_uris=[], - project_uris=[], - project_allocation_uris=[], - user_allocation_uris=[], + site_uris=[site1.self_uri, site2.self_uri] ) - loc1.site_uris.append(site1.self_uri) - loc2.site_uris.append(site2.self_uri) - self.locations = [loc1, loc2] self.sites = [site1, site2] @@ -324,80 +298,6 @@ async def get_site( return site - async def get_site_location( - self: "DemoAdapter", - site_id: str, - modified_since: str | None = None, - ) -> facility_models.Location: - - site = await self.get_site(site_id) - - if not site.location_uri: - raise HTTPException(status_code=404, detail="Site has no location") - - location = next((l for l in self.locations if l.self_uri == str(site.location_uri)), None) - - if not location: - raise HTTPException(status_code=404, detail="Location not found") - - if modified_since: - ms = datetime.datetime.fromisoformat(str(modified_since)) - if location.last_modified <= ms: - raise HTTPException(status_code=304, headers={"Last-Modified": location.last_modified.isoformat()}) - - return location - - - async def list_locations( - self: "DemoAdapter", - modified_since: str | None = None, - name: str | None = None, - offset: int | None = None, - limit: int | None = None, - short_name: str | None = None, - country_name: str | None = None, - ) -> list[facility_models.Location]: - - locs = self.locations - - if name: - locs = [l for l in locs if name.lower() in l.name.lower()] - - if short_name: - locs = [l for l in locs if l.short_name == short_name] - - if country_name: - locs = [l for l in locs if l.country_name == country_name] - - if modified_since: - ms = datetime.datetime.fromisoformat(str(modified_since)) - locs = [l for l in locs if l.last_modified > ms] - - o = offset or 0 - l = limit or len(locs) - return locs[o:o+l] - - - async def get_location( - self: "DemoAdapter", - location_id: str, - modified_since: str | None = None, - ) -> facility_models.Location: - - location = next((l for l in self.locations if l.id == location_id), None) - - if not location: - raise HTTPException(status_code=404, detail="Location not found") - - if modified_since: - ms = datetime.datetime.fromisoformat(str(modified_since)) - if location.last_modified <= ms: - raise HTTPException(status_code=304, headers={"Last-Modified": location.last_modified.isoformat()}) - return location - - - - # ---------------------------- # Status API # ---------------------------- diff --git a/app/routers/facility/facility.py b/app/routers/facility/facility.py index 7c685e1..acd4d39 100644 --- a/app/routers/facility/facility.py +++ b/app/routers/facility/facility.py @@ -41,38 +41,4 @@ async def get_site( _forbid = Depends(forbidExtraQueryParams("modified_since")), )-> models.Site: """Get site by ID""" - return await router.adapter.get_site(site_id=site_id, modified_since=modified_since) - -@router.get("/sites/{site_id}/location", responses=DEFAULT_RESPONSES, operation_id="getLocationBySite") -async def get_site_location( - request : Request, - site_id: str, - modified_since: StrictDateTime = Query(default=None), - _forbid = Depends(forbidExtraQueryParams("modified_since")), - )-> models.Location: - """Get site location by site ID""" - return await router.adapter.get_site_location(site_id=site_id, modified_since=modified_since) - -@router.get("/locations", responses=DEFAULT_RESPONSES, operation_id="getLocations") -async def list_locations( - request : Request, - modified_since: StrictDateTime = Query(default=None), - name: str = Query(default=None, min_length=1), - offset: int = Query(default=0, ge=0, le=1000), - limit: int = Query(default=100, ge=0, le=1000), - short_name: str = Query(default=None, min_length=1), - country_name: str = Query(default=None, min_length=1), - _forbid = Depends(forbidExtraQueryParams("modified_since", "name", "offset", "limit", "short_name", "country_name")), - )-> list[models.Location]: - """List locations""" - return await router.adapter.list_locations(modified_since=modified_since, name=name, offset=offset, limit=limit, short_name=short_name, country_name=country_name) - -@router.get("/locations/{location_id}", responses=DEFAULT_RESPONSES, operation_id="getLocation") -async def get_location( - request : Request, - location_id: str, - modified_since: StrictDateTime = Query(default=None), - _forbid = Depends(forbidExtraQueryParams("modified_since")), - )-> models.Location: - """Get location by ID""" - return await router.adapter.get_location(location_id=location_id, modified_since=modified_since) \ No newline at end of file + return await router.adapter.get_site(site_id=site_id, modified_since=modified_since) \ No newline at end of file diff --git a/app/routers/facility/facility_adapter.py b/app/routers/facility/facility_adapter.py index d316674..7758f24 100644 --- a/app/routers/facility/facility_adapter.py +++ b/app/routers/facility/facility_adapter.py @@ -34,32 +34,4 @@ async def get_site( site_id: str, modified_since: str | None = None, ) -> facility_models.Site | None: - pass - - @abstractmethod - async def get_site_location( - self: "FacilityAdapter", - site_id: str, - modified_since: str | None = None, - ) -> facility_models.Location | None: - pass - - @abstractmethod - async def list_locations( - self: "FacilityAdapter", - modified_since: str | None = None, - name: str | None = None, - offset: int | None = None, - limit: int | None = None, - short_name: str | None = None, - country_name: str | None = None, - ) -> list[facility_models.Location]: - pass - - @abstractmethod - async def get_location( - self: "FacilityAdapter", - location_id: str, - modified_since: str | None = None, - ) -> facility_models.Location | None: - pass + pass \ No newline at end of file diff --git a/app/routers/facility/models.py b/app/routers/facility/models.py index fd164fa..a3a781c 100644 --- a/app/routers/facility/models.py +++ b/app/routers/facility/models.py @@ -10,13 +10,6 @@ def _self_path(self) -> str: return f"/facility/sites/{self.id}" short_name: Optional[str] = Field(None, description="Common or short name of the Site.") operating_organization: str = Field(..., description="Organization operating the Site.") - location_uri: Optional[HttpUrl] = Field(None, description="URI of Location containing this Site.") - resource_uris: List[HttpUrl] = Field(default_factory=list, description="URIs of Resources hosted at this Site.") - -class Location(NamedObject): - def _self_path(self) -> str: - return f"/facility/locations/{self.id}" - short_name: Optional[str] = Field(None, description="Common or short name of the Location.") country_name: Optional[str] = Field(None, description="Country name of the Location.") locality_name: Optional[str] = Field(None, description="City or locality name of the Location.") state_or_province_name: Optional[str] = Field(None, description="State or province name of the Location.") @@ -25,21 +18,13 @@ def _self_path(self) -> str: altitude: Optional[float] = Field(None, description="Altitude of the Location.") latitude: Optional[float] = Field(None, description="Latitude of the Location.") longitude: Optional[float] = Field(None, description="Longitude of the Location.") - site_uris: List[HttpUrl] = Field(default_factory=list, description="URIs of Sites contained in this Location.") + resource_uris: List[HttpUrl] = Field(default_factory=list, description="URIs of Resources hosted at this Site.") + class Facility(NamedObject): def _self_path(self) -> str: - return f"/facility/facilities/{self.id}" + return "/facility" short_name: Optional[str] = Field(None, description="Common or short name of the Facility.") organization_name: Optional[str] = Field(None, description="Operating organization’s name.") support_uri: Optional[HttpUrl] = Field(None, description="Link to facility support portal.") site_uris: List[HttpUrl] = Field(default_factory=list, description="URIs of associated Sites.") - location_uris: List[HttpUrl] = Field(default_factory=list, description="URIs of associated Locations.") - resource_uris: List[HttpUrl] = Field(default_factory=list, description="URIs of contained Resources.") - event_uris: List[HttpUrl] = Field(default_factory=list, description="URIs of Events in this Facility.") - incident_uris: List[HttpUrl] = Field(default_factory=list, description="URIs of Incidents in this Facility.") - capability_uris: List[HttpUrl] = Field(default_factory=list, description="URIs of Capabilities offered by the Facility.") - project_uris: List[HttpUrl] = Field(default_factory=list, description="URIs of Projects associated with this Facility.") - project_allocation_uris: List[HttpUrl] = Field(default_factory=list, description="URIs of Project Allocations.") - user_allocation_uris: List[HttpUrl] = Field(default_factory=list, description="URIs of User Allocations.") - diff --git a/app/routers/status/models.py b/app/routers/status/models.py index 3650451..15a9e36 100644 --- a/app/routers/status/models.py +++ b/app/routers/status/models.py @@ -1,9 +1,11 @@ import datetime import enum -from pydantic import BaseModel, computed_field, Field +from typing import Optional +from pydantic import BaseModel, computed_field, Field, HttpUrl from ... import config from ..common import NamedObject + class Link(BaseModel): rel : str href : str @@ -32,9 +34,12 @@ def _self_path(self) -> str: return f"/status/resources/{self.id}" capability_ids: list[str] = Field(exclude=True) - group: str | None - current_status: Status | None = Field("The current status comes from the status of the last event for this resource") resource_type: ResourceType + group: str | None = Field(None, description="Group this resource belongs to") + current_status: Status | None = Field(None, description="The current status comes from the status of the last event for this resource") + located_at_uri: Optional[HttpUrl] = Field(None, description="Resource located at specific Site") + + @computed_field(description="The list of capabilities in this resource") @property From e85c2660fd3e72a41837d4cfcca842ca34de368e Mon Sep 17 00:00:00 2001 From: Justas Balcas Date: Thu, 5 Feb 2026 15:57:55 -0600 Subject: [PATCH 20/22] Fix operation id: getJob, getJobs --- app/routers/compute/compute.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/routers/compute/compute.py b/app/routers/compute/compute.py index cca45be..e915048 100644 --- a/app/routers/compute/compute.py +++ b/app/routers/compute/compute.py @@ -126,7 +126,7 @@ async def update_job( response_model=models.Job, response_model_exclude_unset=True, responses=DEFAULT_RESPONSES, - operation_id="getJobs", + operation_id="getJob", ) async def get_job_status( resource_id : str, @@ -156,7 +156,7 @@ async def get_job_status( response_model=list[models.Job], response_model_exclude_unset=True, responses=DEFAULT_RESPONSES, - operation_id="getAllJobs", + operation_id="getJobs", ) async def get_job_statuses( resource_id : str, From 431da63708a06d68b9218d6c66945969716f6ae6 Mon Sep 17 00:00:00 2001 From: Justas Balcas Date: Thu, 5 Feb 2026 17:43:49 -0600 Subject: [PATCH 21/22] Remove resource_uri and event_uris --- app/routers/status/status.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/routers/status/status.py b/app/routers/status/status.py index 6a0e948..34cc80e 100644 --- a/app/routers/status/status.py +++ b/app/routers/status/status.py @@ -72,10 +72,8 @@ async def get_incidents( offset : int = Query(default=0, ge=0, le=1000), limit : int = Query(default=100, ge=0, le=1000), resolution : models.Resolution = Query(default=None), - resource_uris: Optional[List[str]] = Query(default=None, min_length=1), - event_uris: Optional[List[str]] = Query(default=None, min_length=1), _forbid = Depends(forbidExtraQueryParams("name", "description", "status", "type", "from", "to", "time", "modified_since", "resource_id", - "offset", "limit", "resolution", "resource_uris", "event_uris", multiParams={"resource_uris", "event_uris"})), + "offset", "limit", "resolution")), ) -> list[models.Incident]: return await router.adapter.get_incidents(offset, limit, name, description, status, type_, from_, to, time_, modified_since, resource_id, resolution) From 889272489bd764f3eaf6daed692fbf0a42586d57 Mon Sep 17 00:00:00 2001 From: Justas Balcas Date: Thu, 5 Feb 2026 17:43:58 -0600 Subject: [PATCH 22/22] Remove resource_uri and event_uris --- app/routers/status/status.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/routers/status/status.py b/app/routers/status/status.py index 34cc80e..7f4fae6 100644 --- a/app/routers/status/status.py +++ b/app/routers/status/status.py @@ -73,7 +73,7 @@ async def get_incidents( limit : int = Query(default=100, ge=0, le=1000), resolution : models.Resolution = Query(default=None), _forbid = Depends(forbidExtraQueryParams("name", "description", "status", "type", "from", "to", "time", "modified_since", "resource_id", - "offset", "limit", "resolution")), + "offset", "limit", "resolution", "resource_uris", "event_uris", multiParams={"resource_uris", "event_uris"})), ) -> list[models.Incident]: return await router.adapter.get_incidents(offset, limit, name, description, status, type_, from_, to, time_, modified_since, resource_id, resolution)