Merge pull request #218 from UW-Macrostrat/interchange-schema

Interchange schema

Author: amyfromandi

services/api-v3/api/routes/dev.py

@@ -1,5 +1,5 @@
-from api.routes.dev_routes.interchange_data import interchange_router
+from api.routes.dev_routes.convert import convert_router
 from fastapi import APIRouter
 
 dev_router = APIRouter(prefix="/dev", tags=["dev"])
-dev_router.include_router(interchange_router)
+dev_router.include_router(convert_router)

…pi/routes/dev_routes/interchange_data.py …/api-v3/api/routes/dev_routes/convert.pyservices/api-v3/api/routes/dev_routes/interchange_data.py renamed to services/api-v3/api/routes/dev_routes/convert.py services/api-v3/api/routes/dev_routes/interchange_data.py renamed to services/api-v3/api/routes/dev_routes/convert.py

@@ -2,7 +2,16 @@
 
 import dotenv
 import httpx
-from fastapi import APIRouter, Body, Depends, HTTPException, Request, Response, status
+from fastapi import (
+    APIRouter,
+    Body,
+    Depends,
+    HTTPException,
+    Query,
+    Request,
+    Response,
+    status,
+)
 from slugify import slugify
 from sqlalchemy import func, insert, select, update
 from sqlalchemy.exc import NoResultFound, NoSuchTableError
@@ -30,9 +39,9 @@
 from api.query_parser import ParserException
 from api.routes.security import has_access
 
-interchange_router = APIRouter(
-    prefix="/interchange-data",
-    tags=["interchange-data"],
+convert_router = APIRouter(
+    prefix="/convert",
+    tags=["convert"],
     responses={404: {"description": "Not found"}},
 )
 
@@ -176,13 +185,12 @@ def spot_to_fieldsite(feat) -> FieldSite:
     )
 
 
-@interchange_router.post("/spot-to-fieldsite")
 def multiple_spot_to_fieldsite(
     feat: Union[dict, List[dict]] = Body(...)
 ) -> List[FieldSite]:
     """
     Accept a single FeatureCollection or a list of FeatureCollections and
-    return a FieldSite for each qualifying Point feature (non-image-basemap).
+    return a FieldSite for each qualifying Point feature.
     """
     out: list[FieldSite] = []
 
@@ -229,23 +237,21 @@ def fieldsite_to_checkin(fs: FieldSite) -> dict:
     return d
 
 
-@interchange_router.post("/fieldsite-to-checkin")
 def multiple_fieldsite_to_checkin(
     fieldsites: list[FieldSite] = Body(...),
 ) -> list[dict]:
     out: list[dict] = []
     for fs in fieldsites:
         try:
+            if not isinstance(fs, FieldSite):
+                fs = FieldSite(**fs)
             out.append(fieldsite_to_checkin(fs))
         except Exception:
             continue
     return out
 
 
-@interchange_router.post("/spot-to-checkin")
-async def spot_to_checkin(
-    request: Request, spot: Union[dict, List[dict]] = Body(...)
-) -> list[dict]:
+def spot_to_checkin(spot: Union[dict, List[dict]] = Body(...)) -> list[dict]:
     """Pipeline: Spot JSON (FeatureCollection[s]) or FieldSite list -> Checkin list."""
     # If it's already a list of FieldSite-like dicts (has 'location'), skip the first hop
     if (
@@ -258,6 +264,30 @@ async def spot_to_checkin(
     else:
         # Convert FeatureCollection (or list of them) -> FieldSite list
         fieldsites = multiple_spot_to_fieldsite(spot)
-
     # Convert FieldSite list -> Checkin list
     return multiple_fieldsite_to_checkin(fieldsites)
+
+
+@convert_router.post("/field-site")
+async def convert_field_site(
+    payload: Union[dict, List[dict]] = Body(...),
+    in_: str = Query(..., alias="in"),
+    out: str = Query(..., alias="out"),
+) -> Any:
+    """
+    Unified converter:
+    - ?in=spot&out=fieldsite   -> spot FeatureCollection(s) -> FieldSite
+    - ?in=fieldsite&out=checkin -> FieldSite -> Checkin
+    - ?in=spot&out=checkin     -> spot FeatureCollection(s) -> FieldSite -> Checkin
+    """
+    key = (in_.lower(), out.lower())
+    if key == ("spot", "fieldsite"):
+        return multiple_spot_to_fieldsite(payload)
+    if key == ("fieldsite", "checkin"):
+        return multiple_fieldsite_to_checkin(payload)
+    if key == ("spot", "checkin"):
+        return spot_to_checkin(payload)
+    raise HTTPException(
+        status_code=400,
+        detail="Unsupported conversion. Use in=[spot|fieldsite], out=[fieldsite|checkin].",
+    )