rename classes

Author: Phil Varner

bin/server.py

@@ -5,10 +5,10 @@
 from stapi_fastapi.exceptions import ConstraintsException, NotFoundException
 from stapi_fastapi.models.opportunity import (
     Opportunity,
-    OpportunityPropertiesBase,
+    OpportunityProperties,
     OpportunityRequest,
 )
-from stapi_fastapi.models.order import Order, OrderParametersBase, OrderRequest
+from stapi_fastapi.models.order import Order, OrderParameters, OrderRequest
 from stapi_fastapi.models.product import (
     Product,
     Provider,
@@ -81,11 +81,11 @@ async def create_order(
         raise ConstraintsException("not allowed")
 
 
-class TestSpotlightProperties(OpportunityPropertiesBase):
+class TestSpotlightProperties(OpportunityProperties):
     off_nadir: int
 
 
-class TestOrderParameters(OrderParametersBase):
+class TestOrderParameters(OrderParameters):
     s3_path: str
 
 

src/stapi_fastapi/__init__.py

@@ -1,7 +1,7 @@
 from .backends import ProductBackend, RootBackend
 from .models import (
     Link,
-    OpportunityPropertiesBase,
+    OpportunityProperties,
     Product,
     Provider,
     ProviderRole,
@@ -10,7 +10,7 @@
 
 __all__ = [
     "Link",
-    "OpportunityPropertiesBase",
+    "OpportunityProperties",
     "Product",
     "ProductBackend",
     "ProductRouter",

src/stapi_fastapi/models/__init__.py

@@ -1,10 +1,10 @@
-from .opportunity import OpportunityPropertiesBase
+from .opportunity import OpportunityProperties
 from .product import Product, Provider, ProviderRole
 from .shared import Link
 
 __all__ = [
     "Link",
-    "OpportunityPropertiesBase",
+    "OpportunityProperties",
     "Product",
     "Provider",
     "ProviderRole",

src/stapi_fastapi/models/opportunity.py

@@ -10,7 +10,7 @@
 
 
 # Copied and modified from https://github.com/stac-utils/stac-pydantic/blob/main/stac_pydantic/item.py#L11
-class OpportunityPropertiesBase(BaseModel):
+class OpportunityProperties(BaseModel):
     datetime: DatetimeInterval
     model_config = ConfigDict(extra="allow")
 
@@ -24,7 +24,7 @@ class OpportunityRequest(BaseModel):
 
 
 G = TypeVar("G", bound=Geometry)
-P = TypeVar("P", bound=OpportunityPropertiesBase)
+P = TypeVar("P", bound=OpportunityProperties)
 
 
 class Opportunity(Feature[G, P]):

src/stapi_fastapi/models/order.py

@@ -4,15 +4,15 @@
 from geojson_pydantic.geometries import Geometry
 from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr
 
-from stapi_fastapi.models.opportunity import OpportunityRequest, OpportunityPropertiesBase
+from stapi_fastapi.models.opportunity import OpportunityRequest, OpportunityProperties
 from stapi_fastapi.models.shared import Link
 
 
-class OrderParametersBase(BaseModel):
-    model_config = ConfigDict(extra="forbid")
+class OrderParameters(BaseModel):
+    model_config = ConfigDict(extra="allow")
 
-P = TypeVar("P", bound=OrderParametersBase)
-O = TypeVar("O", bound=OpportunityPropertiesBase)
+P = TypeVar("P", bound=OrderParameters)
+O = TypeVar("O", bound=OpportunityProperties)
 
 class OrderRequest(OpportunityRequest, Generic[P]):
     order_parameters: P

src/stapi_fastapi/models/product.py

@@ -6,8 +6,8 @@
 
 from pydantic import AnyHttpUrl, BaseModel, Field
 
-from stapi_fastapi.models.opportunity import OpportunityPropertiesBase
-from stapi_fastapi.models.order import OrderParametersBase
+from stapi_fastapi.models.opportunity import OpportunityProperties
+from stapi_fastapi.models.order import OrderParameters
 from stapi_fastapi.models.shared import Link
 
 if TYPE_CHECKING:
@@ -45,16 +45,16 @@ class Product(BaseModel):
     links: list[Link] = Field(default_factory=list)
 
     # we don't want to include these in the model fields
-    _constraints: type[OpportunityPropertiesBase]
-    _order_parameters: OrderParametersBase
+    _constraints: type[OpportunityProperties]
+    _order_parameters: type[OrderParameters]
     _backend: ProductBackend
 
     def __init__(
         self,
         *args,
         backend: ProductBackend,
-        constraints: type[OpportunityPropertiesBase],
-        order_parameters: type[OrderParametersBase],
+        constraints: type[OpportunityProperties],
+        order_parameters: type[OrderParameters],
         **kwargs,
     ) -> None:
         super().__init__(*args, **kwargs)
@@ -67,11 +67,11 @@ def backend(self: Self) -> ProductBackend:
         return self._backend
 
     @property
-    def constraints(self: Self) -> type[OpportunityPropertiesBase]:
+    def constraints(self: Self) -> type[OpportunityProperties]:
         return self._constraints
 
     @property
-    def order_parameters(self: Self) -> type[OrderParametersBase]:
+    def order_parameters(self: Self) -> type[OrderParameters]:
         return self._order_parameters
 
     def with_links(self: Self, links: list[Link] | None = None) -> Self:

tests/backends.py

@@ -55,8 +55,7 @@ async def create_order(
         """
         Create a new order.
         """
-        allowed = any(allowed == payload for allowed in self._allowed_payloads)
-        if allowed:
+        if any(allowed == payload for allowed in self._allowed_payloads):
             order = Order(
                 id=str(uuid4()),
                 geometry=payload.geometry,
@@ -70,4 +69,5 @@ async def create_order(
             )
             self._orders[order.id] = order
             return order
-        raise ConstraintsException("not allowed")
+        else:
+            raise ConstraintsException(f"not allowed: payload {payload.model_dump_json()} not in {[p.model_dump_json() for p in self._allowed_payloads]}")

tests/conftest.py

@@ -11,20 +11,20 @@
 from geojson_pydantic.types import Position2D
 from stapi_fastapi.models.opportunity import (
     Opportunity,
-    OpportunityPropertiesBase,
+    OpportunityProperties,
 )
-from stapi_fastapi.models.order import OrderParametersBase, OrderRequest
+from stapi_fastapi.models.order import OrderParameters, OrderRequest
 from stapi_fastapi.models.product import Product, Provider, ProviderRole
 from stapi_fastapi.routers.root_router import RootRouter
 
 from .backends import MockOrderDB, MockProductBackend, MockRootBackend
 
 
-class TestSpotlightProperties(OpportunityPropertiesBase):
+class TestSpotlightProperties(OpportunityProperties):
     off_nadir: int
 
 
-class TestSpotlightOrderProperties(OrderParametersBase):
+class TestSpotlightOrderProperties(OrderParameters):
     s3_path: str | None = None
 
 

tests/order_test.py

@@ -28,7 +28,7 @@ def new_order_response(
         json=allowed_payloads[0].model_dump(),
     )
 
-    assert res.status_code == status.HTTP_201_CREATED
+    assert res.status_code == status.HTTP_201_CREATED, res.text
     assert res.headers["Content-Type"] == "application/geo+json"
     return res