fixes StapiExceptions

Co-authored-by: Tyler <[email protected]>
Co-authored-by: Jarrett Keifer <[email protected]>

Author: 3 people

src/stapi_fastapi/backends/product_backend.py

@@ -20,7 +20,7 @@ async def search_opportunities(
         Search for ordering opportunities for the  given search parameters.
 
         Backends must validate search constraints and raise
-        `stapi_fastapi.backend.exceptions.ConstraintsException` if not valid.
+        `stapi_fastapi.exceptions.ConstraintsException` if not valid.
         """
         ...
 
@@ -34,6 +34,6 @@ async def create_order(
         Create a new order.
 
         Backends must validate order payload and raise
-        `stapi_fastapi.backend.exceptions.ConstraintsException` if not valid.
+        `stapi_fastapi.exceptions.ConstraintsException` if not valid.
         """
         ...

src/stapi_fastapi/backends/root_backend.py

@@ -16,7 +16,7 @@ async def get_order(self, order_id: str, request: Request) -> Order:
         """
         Get details for order with `order_id`.
 
-        Backends must raise `stapi_fastapi.backend.exceptions.NotFoundException`
+        Backends must raise `stapi_fastapi.exceptions.NotFoundException`
         if not found or access denied.
         """
         ...

src/stapi_fastapi/exceptions.py

@@ -1,20 +1,17 @@
-from typing import Any, Mapping
+from typing import Any
 
-from fastapi import HTTPException
+from fastapi import HTTPException, status
 
 
 class StapiException(HTTPException):
-    def __init__(self, status_code: int, detail: str) -> None:
-        super().__init__(status_code, detail)
-
+    pass
 
-class ConstraintsException(Exception):
-    detail: Mapping[str, Any] | None
 
-    def __init__(self, detail: Mapping[str, Any] | None = None) -> None:
-        super().__init__()
-        self.detail = detail
+class ConstraintsException(StapiException):
+    def __init__(self, detail: Any) -> None:
+        super().__init__(status.HTTP_422_UNPROCESSABLE_ENTITY, detail)
 
 
-class NotFoundException(Exception):
-    pass
+class NotFoundException(StapiException):
+    def __init__(self, detail: Any) -> None:
+        super().__init__(status.HTTP_404_NOT_FOUND, detail)

src/stapi_fastapi/models/shared.py

@@ -1,4 +1,4 @@
-from typing import Any, Optional, Self, Union
+from typing import Any, Self
 
 from pydantic import AnyUrl, BaseModel, ConfigDict
 
@@ -7,9 +7,9 @@ class Link(BaseModel):
     href: AnyUrl
     rel: str
     type: str | None = None
-    title: Optional[str] = None
-    method: Optional[str] = None
-    headers: Optional[dict[str, Union[str, list[str]]]] = None
+    title: str | None = None
+    method: str | None = None
+    headers: dict[str, str | list[str]] | None = None
     body: Any = None
 
     model_config = ConfigDict(extra="allow")

src/stapi_fastapi/routers/root_router.py

@@ -1,11 +1,10 @@
 from typing import Self
 
-from fastapi import APIRouter, HTTPException, Request, status
+from fastapi import APIRouter, Request
 from fastapi.datastructures import URL
 
 from stapi_fastapi.backends.root_backend import RootBackend
 from stapi_fastapi.constants import TYPE_GEOJSON, TYPE_JSON
-from stapi_fastapi.exceptions import NotFoundException
 from stapi_fastapi.models.order import Order
 from stapi_fastapi.models.product import Product, ProductsCollection
 from stapi_fastapi.models.root import RootResponse
@@ -132,11 +131,7 @@ async def get_order(self: Self, order_id: str, request: Request) -> Order:
         """
         Get details for order with `order_id`.
         """
-        try:
-            order = await self.backend.get_order(order_id, request)
-        except NotFoundException as exc:
-            raise HTTPException(status.HTTP_404_NOT_FOUND, detail="not found") from exc
-
+        order = await self.backend.get_order(order_id, request)
         order.links.append(Link(href=str(request.url), rel="self", type=TYPE_GEOJSON))
         return order