stac-fastapi.api 6.1.2__tar.gz → 6.1.4__tar.gz

{stac_fastapi_api-6.1.2 → stac_fastapi_api-6.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: stac-fastapi-api
-Version: 6.1.2
+Version: 6.1.4
 Summary: An implementation of STAC API based on the FastAPI framework.
 Project-URL: Homepage, https://github.com/stac-utils/stac-fastapi
 Author-email: ArturoAI <engineering@arturo.ai>

{stac_fastapi_api-6.1.2 → stac_fastapi_api-6.1.4}/stac_fastapi/api/app.py

@@ -8,6 +8,7 @@ import attr
 from brotli_asgi import BrotliMiddleware
 from fastapi import APIRouter, FastAPI
 from fastapi.params import Depends
+from pydantic import BaseModel
 from stac_pydantic import api
 from stac_pydantic.shared import MimeTypes
 from stac_pydantic.version import STAC_VERSION
@@ -114,12 +115,8 @@ class StacApi:
         converter=update_openapi,  # type: ignore
     )
     router: APIRouter = attr.ib(default=attr.Factory(APIRouter))
-    search_get_request_model: Type[BaseSearchGetRequest] = attr.ib(
-        default=BaseSearchGetRequest
-    )
-    search_post_request_model: Type[BaseSearchPostRequest] = attr.ib(
-        default=BaseSearchPostRequest
-    )
+    search_get_request_model: Type[APIRequest] = attr.ib(default=BaseSearchGetRequest)
+    search_post_request_model: Type[BaseModel] = attr.ib(default=BaseSearchPostRequest)
     collections_get_request_model: Type[APIRequest] = attr.ib(default=EmptyRequest)
     collection_get_request_model: Type[APIRequest] = attr.ib(default=CollectionUri)
     items_get_request_model: Type[APIRequest] = attr.ib(default=ItemCollectionUri)

{stac_fastapi_api-6.1.2 → stac_fastapi_api-6.1.4}/stac_fastapi/api/errors.py

@@ -93,6 +93,8 @@ def add_exception_handlers(
             status_code=status.HTTP_400_BAD_REQUEST,
         )
 
+    # TODO: Argument 2 to "add_exception_handler" of "Starlette" has incompatible type
     app.add_exception_handler(
-        RequestValidationError, request_validation_exception_handler
+        RequestValidationError,
+        request_validation_exception_handler,  # type: ignore [arg-type]
     )

{stac_fastapi_api-6.1.2 → stac_fastapi_api-6.1.4}/stac_fastapi/api/middleware.py

@@ -86,7 +86,7 @@ class ProxyHeaderMiddleware:
         proto = scope.get("scheme", "http")
         header_host = self._get_header_value_by_name(scope, "host")
         if header_host is None:
-            domain, port = scope.get("server")
+            domain, port = scope["server"]
         else:
             header_host_parts = header_host.split(":")
             if len(header_host_parts) == 2:

{stac_fastapi_api-6.1.2 → stac_fastapi_api-6.1.4}/stac_fastapi/api/models.py

@@ -1,6 +1,6 @@
 """Api request/response models."""
 
-from typing import List, Literal, Optional, Type, Union
+from typing import List, Literal, Optional, Type, Union, cast
 
 import attr
 from fastapi import Path, Query
@@ -24,7 +24,7 @@ try:
     import orjson  # noqa
     from fastapi.responses import ORJSONResponse as JSONResponse
 except ImportError:  # pragma: nocover
-    from starlette.responses import JSONResponse
+    from starlette.responses import JSONResponse  # type: ignore [assignment]
 
 
 def create_request_model(
@@ -32,11 +32,11 @@ def create_request_model(
     base_model: Union[Type[BaseModel], Type[APIRequest]] = BaseSearchGetRequest,
     extensions: Optional[List[ApiExtension]] = None,
     mixins: Optional[Union[List[Type[BaseModel]], List[Type[APIRequest]]]] = None,
-    request_type: Optional[str] = "GET",
+    request_type: str = "GET",
 ) -> Union[Type[BaseModel], Type[APIRequest]]:
     """Create a pydantic model for validating request bodies."""
     fields = {}
-    extension_models = []
+    extension_models: List[Union[Type[BaseModel], Type[APIRequest]]] = []
 
     # Check extensions for additional parameters to search
     for extension in extensions or []:
@@ -49,44 +49,47 @@ def create_request_model(
 
     # Handle GET requests
     if all([issubclass(m, APIRequest) for m in models]):
-        return attr.make_class(model_name, attrs={}, bases=tuple(models))
+        get_model = attr.make_class(model_name, attrs={}, bases=tuple(models))
+        return cast(Type[APIRequest], get_model)
 
     # Handle POST requests
     elif all([issubclass(m, BaseModel) for m in models]):
         for model in models:
-            for k, field_info in model.model_fields.items():
+            for k, field_info in model.model_fields.items():  # type: ignore
                 fields[k] = (field_info.annotation, field_info)
 
-        return create_model(model_name, **fields, __base__=base_model)  # type: ignore
+        post_model = create_model(model_name, **fields, __base__=base_model)  # type: ignore
+        return cast(Type[BaseModel], post_model)
 
     raise TypeError("Mixed Request Model types. Check extension request types.")
 
 
 def create_get_request_model(
     extensions: Optional[List[ApiExtension]],
-    base_model: BaseSearchGetRequest = BaseSearchGetRequest,
+    base_model: Type[APIRequest] = BaseSearchGetRequest,
 ) -> Type[APIRequest]:
     """Wrap create_request_model to create the GET request model."""
-
-    return create_request_model(
+    model = create_request_model(
         "SearchGetRequest",
         base_model=base_model,
         extensions=extensions,
         request_type="GET",
     )
+    return cast(Type[APIRequest], model)
 
 
 def create_post_request_model(
     extensions: Optional[List[ApiExtension]],
-    base_model: BaseSearchPostRequest = BaseSearchPostRequest,
+    base_model: Type[BaseModel] = BaseSearchPostRequest,
 ) -> Type[BaseModel]:
     """Wrap create_request_model to create the POST request model."""
-    return create_request_model(
+    model = create_request_model(
         "SearchPostRequest",
         base_model=base_model,
         extensions=extensions,
         request_type="POST",
     )
+    return cast(Type[BaseModel], model)
 
 
 @attr.s
@@ -122,7 +125,7 @@ class ItemCollectionUri(APIRequest, DatetimeMixin):
             description="Limits the number of results that are included in each page of the response (capped to 10_000)."  # noqa: E501
         ),
     ] = attr.ib(default=10)
-    bbox: Optional[BBox] = attr.ib(default=None, converter=_bbox_converter)  # type: ignore
+    bbox: Optional[BBox] = attr.ib(default=None, converter=_bbox_converter)  # type: ignore [misc]
     datetime: DateTimeQueryType = attr.ib(default=None, validator=_validate_datetime)
 
 

{stac_fastapi_api-6.1.2 → stac_fastapi_api-6.1.4}/stac_fastapi/api/openapi.py

@@ -14,8 +14,11 @@ def update_openapi(app: FastAPI) -> FastAPI:
     content-type response header.
     """
     # Find the route for the openapi_url in the app
+    # TODO: Type info is Route, while it shoukd maybe be APIRoute? Check FastAPI source.
     openapi_route: Route = next(
-        route for route in app.router.routes if route.path == app.openapi_url
+        route
+        for route in app.router.routes
+        if route.path == app.openapi_url  # type: ignore
     )
     # Store the old endpoint function so we can call it from the patched function
     old_endpoint = openapi_route.endpoint

{stac_fastapi_api-6.1.2 → stac_fastapi_api-6.1.4}/stac_fastapi/api/routes.py

@@ -16,7 +16,7 @@ from starlette.responses import Response
 from starlette.routing import BaseRoute, Match
 from starlette.status import HTTP_204_NO_CONTENT
 
-from stac_fastapi.api.models import APIRequest
+from stac_fastapi.types.search import APIRequest
 
 
 def _wrap_response(resp: Any) -> Any:
@@ -58,7 +58,7 @@ def create_async_endpoint(
 
     elif issubclass(request_model, APIRequest):
 
-        async def _endpoint(request: Request, request_data=Depends(request_model)):
+        async def _endpoint(request: Request, request_data=Depends(request_model)):  # type: ignore
             """Endpoint."""
             return _wrap_response(await func(request=request, **request_data.kwargs()))
 
@@ -100,10 +100,14 @@ def add_route_dependencies(
         _scope = copy.deepcopy(scope)
         for route in routes:
             if scope["path"] == "*":
-                _scope["path"] = route.path
+                # NOTE: ignore type, because BaseRoute has no "path" attribute
+                # but APIRoute does.
+                _scope["path"] = route.path  # type: ignore
 
+            # NOTE: ignore type, because BaseRoute has no "method" attribute
+            # but APIRoute does.
             if scope["method"] == "*":
-                _scope["method"] = list(route.methods)[0]
+                _scope["method"] = list(route.methods)[0]  # type: ignore
 
             match, _ = route.matches({"type": "http", **_scope})
             if match != Match.FULL:
@@ -119,7 +123,10 @@ def add_route_dependencies(
                 route.dependant.dependencies.insert(
                     0,
                     get_parameterless_sub_dependant(
-                        depends=depends, path=route.path_format
+                        # NOTE: ignore type, because BaseRoute has no "path_format"
+                        # attribute but APIRoute does.
+                        depends=depends,
+                        path=route.path_format,  # type: ignore
                     ),
                 )
 
@@ -128,7 +135,9 @@ def add_route_dependencies(
             # app.include_router(router))
             # https://github.com/tiangolo/fastapi/blob/58ab733f19846b4875c5b79bfb1f4d1cb7f4823f/fastapi/applications.py#L337-L360
             # https://github.com/tiangolo/fastapi/blob/58ab733f19846b4875c5b79bfb1f4d1cb7f4823f/fastapi/routing.py#L677-L678
-            route.dependencies.extend(dependencies)
+            # NOTE: ignore type, because BaseRoute has no "dependencies" attribute
+            # but APIRoute does.
+            route.dependencies.extend(dependencies)  # type: ignore
 
 
 def add_direct_response(app: FastAPI) -> None:

{stac_fastapi_api-6.1.2 → stac_fastapi_api-6.1.4}/stac_fastapi/api/version.py

@@ -1,3 +1,3 @@
 """Library version."""
 
-__version__ = "6.1.2"
+__version__ = "6.1.4"