Skip to content
This repository was archived by the owner on Apr 2, 2025. It is now read-only.

Commit 4491db5

Browse files
author
Phil Varner
committed
remove unused Order typing
1 parent b050900 commit 4491db5

File tree

4 files changed

+5
-15
lines changed

4 files changed

+5
-15
lines changed

bin/server.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ async def create_order(
7373
"""
7474
Create a new order.
7575
"""
76-
order = Order[MyOpportunityProperties, MyOrderParameters](
76+
order = Order(
7777
id=str(uuid4()),
7878
geometry=payload.geometry,
7979
properties={

src/stapi_fastapi/models/order.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class OrderSearchParameters(BaseModel):
6060
filter: CQL2Filter | None = None
6161

6262

63-
class OrderProperties(BaseModel, Generic[OPP, ORP]):
63+
class OrderProperties(BaseModel):
6464
product_id: str
6565
created: AwareDatetime
6666
status: OrderStatus
@@ -72,14 +72,14 @@ class OrderProperties(BaseModel, Generic[OPP, ORP]):
7272
model_config = ConfigDict(extra="allow")
7373

7474

75-
class Order(Feature[Geometry, OrderProperties[OPP, ORP]]):
75+
class Order(Feature[Geometry, OrderProperties]):
7676
# We need to enforce that orders have an id defined, as that is required to
7777
# retrieve them via the API
7878
id: StrictInt | StrictStr
7979
type: Literal["Feature"] = "Feature"
8080
links: list[Link] = Field(default_factory=list)
8181

8282

83-
class OrderCollection(FeatureCollection[Order[OPP, ORP]]):
83+
class OrderCollection(FeatureCollection[Order]):
8484
type: Literal["FeatureCollection"] = "FeatureCollection"
8585
links: list[Link] = Field(default_factory=list)

src/stapi_fastapi/routers/product_router.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,19 +89,13 @@ async def _create_order(
8989
_create_order.__annotations__["payload"] = OrderRequest[
9090
self.product.order_parameters # type: ignore
9191
]
92-
_create_order.__annotations__["return"] = Order[
93-
self.product.constraints, self.product.order_parameters # type: ignore
94-
]
9592

9693
self.add_api_route(
9794
path="/order",
9895
endpoint=_create_order,
9996
name=f"{self.root_router.name}:{self.product.id}:create-order",
10097
methods=["POST"],
10198
response_class=GeoJSONResponse,
102-
response_model=Order[
103-
self.product.constraints, self.product.order_parameters # type: ignore
104-
],
10599
status_code=status.HTTP_201_CREATED,
106100
summary="Create an order for the product",
107101
tags=["Products"],

tests/backends.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
)
1717
from stapi_fastapi.routers.product_router import ProductRouter
1818

19-
from .shared import SpotlightOpportunityProperties, SpotlightOrderParameters
20-
2119

2220
class MockOrderDB(dict[int | str, Order]):
2321
pass
@@ -67,9 +65,7 @@ async def create_order(
6765
Create a new order.
6866
"""
6967
if any(allowed == payload for allowed in self._allowed_payloads):
70-
order = Order[
71-
SpotlightOpportunityProperties, SpotlightOrderParameters
72-
](
68+
order = Order(
7369
id=str(uuid4()),
7470
geometry=payload.geometry, # maybe set to a different value by opportunity resolution process
7571
properties={

0 commit comments

Comments
 (0)