rework imports, etc

Author: Phil Varner

stapi-fastapi/src/stapi_fastapi/backends/root_backend.py

@@ -1,17 +1,10 @@
 from collections.abc import Callable, Coroutine
-from typing import Any, Generic, Protocol, TypeVar
+from typing import Any, Generic, Protocol
 
 from fastapi import Request
 from returns.maybe import Maybe
 from returns.result import ResultE
-from stapi_pydantic import (
-    OpportunitySearchRecord,
-    OpportunitySearchStatus,
-    Order,
-    OrderStatus,
-)
-
-OrderStatusBound = TypeVar("OrderStatusBound", bound=OrderStatus)
+from stapi_pydantic import OpportunitySearchRecord, OpportunitySearchStatus, Order, OrderStatusBound
 
 
 class GetOrders(Protocol, Generic[OrderStatusBound]):

stapi-fastapi/src/stapi_fastapi/routers/root_router.py

@@ -15,11 +15,12 @@
     OpportunitySearchStatus,
     Order,
     OrderCollection,
+    OrderStatus,
+    OrderStatusBound,
     OrderStatuses,
     ProductsCollection,
     RootResponse,
 )
-from stapi_pydantic.order import OrderStatus, OrderStatusBound
 
 from stapi_fastapi.backends.root_backend import (
     GetOpportunitySearchRecord,

stapi-pydantic/src/stapi_pydantic/__init__.py

@@ -21,6 +21,7 @@
     OrderProperties,
     OrderSearchParameters,
     OrderStatus,
+    OrderStatusBound,
     OrderStatusCode,
     OrderStatuses,
 )
@@ -52,6 +53,7 @@
     "OrderStatus",
     "OrderStatusCode",
     "OrderStatuses",
+    "OrderStatusBound",
     "Prefer",
     "Product",
     "ProductsCollection",

stapi-pydantic/tests/test_json_schema.py

@@ -1,5 +1,5 @@
 from pydantic import TypeAdapter
-from stapi_pydantic.datetime_interval import DatetimeInterval
+from stapi_pydantic import DatetimeInterval
 
 
 def test_datetime_interval() -> None: