update from main

Author: vincentsarago

.pre-commit-config.yaml

@@ -5,3 +5,13 @@ repos:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]
       - id: ruff-format
+
+  - repo: https://github.com/pre-commit/mirrors-mypy
+    rev: v1.15.0
+    hooks:
+    - id: mypy
+      language_version: python
+      exclude: tests/.*
+      additional_dependencies:
+      - types-attrs
+      - pydantic

CHANGES.md

@@ -2,7 +2,29 @@
 
 ## [Unreleased]
 
+### Changed
+
 * Add Item and Collection `PATCH` endpoints with support for [RFC 6902](https://tools.ietf.org/html/rfc6902) and [RFC 7396](https://tools.ietf.org/html/rfc7386)
+- remove support of `cql-json` in Filter extension ([#840](https://github.com/stac-utils/stac-fastapi/pull/840))
+
+### Fixed
+
+- add `py.typed` to package distributions ([#842](https://github.com/stac-utils/stac-fastapi/pull/842))
+- update/fix type informations ([#842](https://github.com/stac-utils/stac-fastapi/pull/842))
+- pin `stac_pydantic` to `>=3.3.0` for the correct import path of `stac_pydantic.shared.SearchDatetime` ([#844](https://github.com/stac-utils/stac-fastapi/pull/844))
+
+## [5.2.1] - 2025-04-18
+
+### Fixed
+
+- avoid future deprecation for pydantic.Field and use `json_schema_extra` instead of `openapi_examples`
+- use `orjson` based JSONResponse when available
+- changed from `AssertionError` to `HTTPException` for **bbox** parsing exceptions
+- update `$schema` in Filter's extension client responses to match OGC Feature specification
+
+### Added
+
+- add response model for `/_mgmt/health` endpoint
 
 ## [5.2.0] - 2025-04-18
 
@@ -153,7 +175,7 @@
 
 ## [3.0.0] - 2024-07-29
 
-Full changelog: https://stac-utils.github.io/stac-fastapi/migrations/v3.0.0/#changelog 
+Full changelog: https://stac-utils.github.io/stac-fastapi/migrations/v3.0.0/#changelog
 **Changes since 3.0.0b3:**
 
 ### Changed
@@ -616,7 +638,8 @@ Full changelog: https://stac-utils.github.io/stac-fastapi/migrations/v3.0.0/#cha
 
 * First PyPi release!
 
-[Unreleased]: <https://github.com/stac-utils/stac-fastapi/compare/5.2.0..main>
+[Unreleased]: <https://github.com/stac-utils/stac-fastapi/compare/5.2.1..main>
+[5.2.1]: <https://github.com/stac-utils/stac-fastapi/compare/5.2.0..5.2.1>
 [5.2.0]: <https://github.com/stac-utils/stac-fastapi/compare/5.1.1..5.2.0>
 [5.1.1]: <https://github.com/stac-utils/stac-fastapi/compare/5.1.0..5.1.1>
 [5.1.0]: <https://github.com/stac-utils/stac-fastapi/compare/5.0.3..5.1.0>

VERSION

@@ -1 +1 @@
-5.2.0
+5.2.1

pyproject.toml

@@ -23,8 +23,14 @@ section-order = ["future", "standard-library", "third-party", "first-party", "lo
 [tool.ruff.format]
 quote-style = "double"
 
+[tool.mypy]
+ignore_missing_imports = true
+namespace_packages = true
+explicit_package_bases = true
+exclude = ["tests", ".venv"]
+
 [tool.bumpversion]
-current_version = "5.2.0"
+current_version = "5.2.1"
 parse = """(?x)
     (?P<major>\\d+)\\.
     (?P<minor>\\d+)\\.

stac_fastapi/api/stac_fastapi/api/app.py

@@ -12,7 +12,7 @@
 from stac_pydantic.shared import MimeTypes
 from stac_pydantic.version import STAC_VERSION
 from starlette.middleware import Middleware
-from starlette.responses import JSONResponse, Response
+from starlette.responses import Response
 
 from stac_fastapi.api.errors import DEFAULT_STATUS_CODES, add_exception_handlers
 from stac_fastapi.api.middleware import CORSMiddleware, ProxyHeaderMiddleware
@@ -21,8 +21,10 @@
     CollectionUri,
     EmptyRequest,
     GeoJSONResponse,
+    HealthCheck,
     ItemCollectionUri,
     ItemUri,
+    JSONResponse,
 )
 from stac_fastapi.api.openapi import update_openapi
 from stac_fastapi.api.routes import (
@@ -108,7 +110,7 @@ class StacApi:
             ),
             takes_self=True,
         ),
-        converter=update_openapi,
+        converter=update_openapi,  # type: ignore
     )
     router: APIRouter = attr.ib(default=attr.Factory(APIRouter))
     search_get_request_model: Type[BaseSearchGetRequest] = attr.ib(
@@ -396,12 +398,15 @@ async def ping():
         mgmt_router.add_api_route(
             name="Health",
             path="/_mgmt/health",
-            response_model=Dict,
+            response_model=(
+                HealthCheck if self.settings.enable_response_models else None
+            ),
             responses={
                 200: {
                     "content": {
                         MimeTypes.json.value: {},
                     },
+                    "model": HealthCheck,
                 },
             },
             response_class=self.response_class,

stac_fastapi/api/stac_fastapi/api/errors.py

@@ -8,8 +8,8 @@
 from fastapi.exceptions import RequestValidationError, ResponseValidationError
 from starlette import status
 from starlette.requests import Request
-from starlette.responses import JSONResponse
 
+from stac_fastapi.api.models import JSONResponse
 from stac_fastapi.types.errors import (
     ConflictError,
     DatabaseError,

stac_fastapi/api/stac_fastapi/api/models.py

@@ -1,6 +1,6 @@
 """Api request/response models."""
 
-from typing import List, Optional, Type, Union
+from typing import List, Literal, Optional, Type, Union
 
 import attr
 from fastapi import Path, Query
@@ -56,7 +56,8 @@ def create_request_model(
         for model in models:
             for k, field_info in model.model_fields.items():
                 fields[k] = (field_info.annotation, field_info)
-        return create_model(model_name, **fields, __base__=base_model)
+
+        return create_model(model_name, **fields, __base__=base_model)  # type: ignore
 
     raise TypeError("Mixed Request Model types. Check extension request types.")
 
@@ -121,7 +122,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)
+    bbox: Optional[BBox] = attr.ib(default=None, converter=_bbox_converter)  # type: ignore
     datetime: DateTimeQueryType = attr.ib(default=None, validator=_validate_datetime)
 
 
@@ -135,3 +136,9 @@ class JSONSchemaResponse(JSONResponse):
     """JSON with custom, vendor content-type."""
 
     media_type = "application/schema+json"
+
+
+class HealthCheck(BaseModel, extra="allow"):
+    """health check response model."""
+
+    status: Literal["UP", "DOWN"]

stac_fastapi/api/stac_fastapi/api/openapi.py

@@ -2,7 +2,7 @@
 
 from fastapi import FastAPI
 from starlette.requests import Request
-from starlette.responses import JSONResponse, Response
+from starlette.responses import Response
 from starlette.routing import Route, request_response
 
 
@@ -22,7 +22,7 @@ def update_openapi(app: FastAPI) -> FastAPI:
     # Create a patched endpoint function that modifies the content type of the response
     async def patched_openapi_endpoint(req: Request) -> Response:
         # Get the response from the old endpoint function
-        response: JSONResponse = await old_endpoint(req)
+        response = await old_endpoint(req)
         # Update the content type header in place
         response.headers["content-type"] = "application/vnd.oai.openapi+json;version=3.0"
         # Return the updated response

stac_fastapi/api/stac_fastapi/api/py.typed

@@ -3,7 +3,7 @@
 import copy
 import functools
 import inspect
-from typing import Any, Callable, Dict, List, Optional, Type, TypedDict, Union
+from typing import Any, Awaitable, Callable, Dict, List, Optional, Type, TypedDict, Union
 
 from fastapi import Depends, FastAPI, params
 from fastapi.datastructures import DefaultPlaceholder
@@ -39,7 +39,7 @@ async def run(*args, **kwargs):
 def create_async_endpoint(
     func: Callable,
     request_model: Union[Type[APIRequest], Type[BaseModel], Dict],
-):
+) -> Callable[[Any, Any], Awaitable[Any]]:
     """Wrap a function in a coroutine which may be used to create a FastAPI endpoint.
 
     Synchronous functions are executed asynchronously using a background thread.
@@ -48,32 +48,28 @@ def create_async_endpoint(
     if not inspect.iscoroutinefunction(func):
         func = sync_to_async(func)
 
-    if issubclass(request_model, APIRequest):
+    _endpoint: Callable[[Any, Any], Awaitable[Any]]
 
-        async def _endpoint(
-            request: Request,
-            request_data: request_model = Depends(),  # type:ignore
-        ):
+    if isinstance(request_model, dict):
+
+        async def _endpoint(request: Request, request_data: Dict[str, Any]):
+            """Endpoint."""
+            return _wrap_response(await func(request_data, request=request))
+
+    elif issubclass(request_model, APIRequest):
+
+        async def _endpoint(request: Request, request_data=Depends(request_model)):
             """Endpoint."""
             return _wrap_response(await func(request=request, **request_data.kwargs()))
 
     elif issubclass(request_model, BaseModel):
 
-        async def _endpoint(
-            request: Request,
-            request_data: request_model,  # type:ignore
-        ):
+        async def _endpoint(request: Request, request_data: request_model):  # type: ignore
             """Endpoint."""
             return _wrap_response(await func(request_data, request=request))
 
     else:
-
-        async def _endpoint(
-            request: Request,
-            request_data: Dict[str, Any],  # type:ignore
-        ):
-            """Endpoint."""
-            return _wrap_response(await func(request_data, request=request))
+        raise ValueError(f"Unsupported type for request model {type(request_model)}")
 
     return _endpoint
 

stac_fastapi/api/stac_fastapi/api/routes.py

@@ -1,3 +1,3 @@
 """Library version."""
 
-__version__ = "5.2.0"
+__version__ = "5.2.1"

stac_fastapi/api/stac_fastapi/api/version.py

@@ -43,7 +43,10 @@ def test_create_get_request_model():
     model = request_model(bbox="0,0,0,1,1,1")
     assert model.bbox == (0.0, 0.0, 0.0, 1.0, 1.0, 1.0)
 
-    with pytest.raises(AssertionError):
+    with pytest.raises(HTTPException):
+        request_model(bbox="a,b")
+
+    with pytest.raises(HTTPException):
         request_model(bbox="0,0,0,1,1")
 
     model = request_model(

stac_fastapi/api/tests/test_models.py

@@ -4,7 +4,7 @@
 
 import attr
 
-from stac_fastapi.types import stac
+from stac_fastapi.types.stac import ItemCollection
 
 from .request import BaseCollectionSearchPostRequest
 
@@ -18,7 +18,7 @@ async def post_all_collections(
         self,
         search_request: BaseCollectionSearchPostRequest,
         **kwargs,
-    ) -> stac.ItemCollection:
+    ) -> ItemCollection:
         """Get all available collections.
 
         Called with `POST /collections`.
@@ -37,7 +37,7 @@ class BaseCollectionSearchClient(abc.ABC):
     @abc.abstractmethod
     def post_all_collections(
         self, search_request: BaseCollectionSearchPostRequest, **kwargs
-    ) -> stac.ItemCollection:
+    ) -> ItemCollection:
         """Get all available collections.
 
         Called with `POST /collections`.

stac_fastapi/extensions/stac_fastapi/extensions/core/collection_search/client.py

@@ -47,13 +47,13 @@ class CollectionSearchExtension(ApiExtension):
             the extension
     """
 
-    GET: BaseCollectionSearchGetRequest = attr.ib(default=BaseCollectionSearchGetRequest)
-    POST = None
+    GET: BaseCollectionSearchGetRequest = attr.ib(default=BaseCollectionSearchGetRequest)  # type: ignore
+    POST = attr.ib(init=False)
 
     conformance_classes: List[str] = attr.ib(
         default=[
-            CollectionSearchConformanceClasses.COLLECTIONSEARCH,
-            CollectionSearchConformanceClasses.BASIS,
+            CollectionSearchConformanceClasses.COLLECTIONSEARCH.value,
+            CollectionSearchConformanceClasses.BASIS.value,
         ]
     )
     schema_href: Optional[str] = attr.ib(default=None)
@@ -73,13 +73,14 @@ def register(self, app: FastAPI) -> None:
     def from_extensions(
         cls,
         extensions: List[ApiExtension],
+        *,
         schema_href: Optional[str] = None,
     ) -> "CollectionSearchExtension":
         """Create CollectionSearchExtension object from extensions."""
 
         conformance_classes = [
-            CollectionSearchConformanceClasses.COLLECTIONSEARCH,
-            CollectionSearchConformanceClasses.BASIS,
+            CollectionSearchConformanceClasses.COLLECTIONSEARCH.value,
+            CollectionSearchConformanceClasses.BASIS.value,
         ]
         for ext in extensions:
             conformance_classes.extend(ext.conformance_classes)
@@ -119,15 +120,15 @@ class CollectionSearchPostExtension(CollectionSearchExtension):
     settings: ApiSettings = attr.ib()
     conformance_classes: List[str] = attr.ib(
         default=[
-            CollectionSearchConformanceClasses.COLLECTIONSEARCH,
-            CollectionSearchConformanceClasses.BASIS,
+            CollectionSearchConformanceClasses.COLLECTIONSEARCH.value,
+            CollectionSearchConformanceClasses.BASIS.value,
         ]
     )
     schema_href: Optional[str] = attr.ib(default=None)
     router: APIRouter = attr.ib(factory=APIRouter)
 
-    GET: BaseCollectionSearchGetRequest = attr.ib(default=BaseCollectionSearchGetRequest)
-    POST: BaseCollectionSearchPostRequest = attr.ib(
+    GET: BaseCollectionSearchGetRequest = attr.ib(default=BaseCollectionSearchGetRequest)  # type: ignore
+    POST: BaseCollectionSearchPostRequest = attr.ib(  # type: ignore
         default=BaseCollectionSearchPostRequest
     )
 
@@ -163,19 +164,19 @@ def register(self, app: FastAPI) -> None:
         app.include_router(self.router)
 
     @classmethod
-    def from_extensions(
+    def from_extensions(  # type: ignore
         cls,
         extensions: List[ApiExtension],
         *,
+        schema_href: Optional[str] = None,
         client: Union[AsyncBaseCollectionSearchClient, BaseCollectionSearchClient],
         settings: ApiSettings,
-        schema_href: Optional[str] = None,
         router: Optional[APIRouter] = None,
     ) -> "CollectionSearchPostExtension":
         """Create CollectionSearchPostExtension object from extensions."""
         conformance_classes = [
-            CollectionSearchConformanceClasses.COLLECTIONSEARCH,
-            CollectionSearchConformanceClasses.BASIS,
+            CollectionSearchConformanceClasses.COLLECTIONSEARCH.value,
+            CollectionSearchConformanceClasses.BASIS.value,
         ]
         for ext in extensions:
             conformance_classes.extend(ext.conformance_classes)