make OpportunityProperties and Opportunity models generics

Author: austin-sidekick

stapi_fastapi/backend.py

@@ -1,5 +1,4 @@
 from typing import Protocol
-
 from fastapi import Request
 
 from stapi_fastapi.models.opportunity import Opportunity, OpportunityRequest

stapi_fastapi/models/opportunity.py

@@ -1,4 +1,4 @@
-from typing import Literal, Optional
+from typing import Literal, Optional, TypeVar, Generic
 
 from geojson_pydantic import Feature, FeatureCollection
 from geojson_pydantic.geometries import Geometry
@@ -7,23 +7,27 @@
 from stapi_fastapi.types.datetime_interval import DatetimeInterval
 from stapi_fastapi.types.filter import CQL2Filter
 
+# Generic type definition for Opportunity Properties
+T = TypeVar("T")
 
-# GENERIC Python
 # Copied and modified from https://github.com/stac-utils/stac-pydantic/blob/main/stac_pydantic/item.py#L11
-class OpportunityProperties(BaseModel):
+class OpportunityProperties(BaseModel, Generic[T]):
     datetime: DatetimeInterval
     model_config = ConfigDict(extra="allow")
 
-# NOT GENERIC
 class OpportunityRequest(BaseModel):
     datetime: DatetimeInterval
     geometry: Geometry
     # TODO: validate the CQL2 filter?
     filter: Optional[CQL2Filter] = None
     # PHILOSOPH: strict?
 
-# GENERIC: Each product needs an opportunity model (constraints/parameters)
-class Opportunity(Feature[Geometry, OpportunityProperties]):
+# Generic type definition for Opportunity
+P = TypeVar("P", bound=OpportunityProperties)
+K = TypeVar("K", bound=Geometry)
+
+# Each product implements its own opportunity model
+class Opportunity(Feature[K, P], Generic[K, P]):
     type: Literal["Feature"] = "Feature"
 
 

stapi_fastapi/products_router.py

@@ -1,6 +1,5 @@
 # Generic product router factory
 from fastapi import APIRouter, HTTPException, status, Request
-from typing import Dict, Any
 from stapi_fastapi.models.opportunity import OpportunityRequest
 from stapi_fastapi.backend import StapiBackend
 from stapi_fastapi.exceptions import ConstraintsException
@@ -12,7 +11,6 @@
 """
 
 def create_products_router(product_id: str, backend: StapiBackend) -> APIRouter:
-    # TODO: map product names to product IDs
     """
     Creates a new APIRouter for a specific product type with standardized routes.
 

stapi_fastapi/umbra_spotlight_router.py

@@ -1,4 +1,4 @@
 from routers.products_router import create_products_router
 
 # Create a router for electronics using the base factory function
-umbra_spotlight_router = create_products_router("umbra_spotlight")
+umbra_spotlight_router = create_products_router("umbra-spotlight-1")