update from maint-6.1.x

Author: vincentsarago

.github/workflows/cicd.yaml

@@ -1,9 +1,9 @@
 name: stac-fastapi
 on:
   push:
-    branches: [main]
+    branches: [main, maint-6.1.x]
   pull_request:
-    branches: [main]
+    branches: [main, maint-6.1.x]
 
 env:
   LATEST_PY_VERSION: '3.14'

CHANGES.md

@@ -6,6 +6,14 @@
 
 - support for python 3.9 and 3.10
 
+## [6.1.4] - 2025-12-12
+
+### Fixed 
+
+- improve type hints
+  - `api.app.StacAPI.search_get_request_model` now defined as `Type[APIRequest]`
+  - `api.app.StacAPI.search_post_request_model` now defined as `Type[BaseModel]`
+
 ## [6.1.3] - 2025-12-09
 
 ### Fixed 
@@ -688,7 +696,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/6.1.3..main>
+[Unreleased]: <https://github.com/stac-utils/stac-fastapi/compare/6.1.4..main>
+[6.1.4]: <https://github.com/stac-utils/stac-fastapi/compare/6.1.3..6.1.4>
 [6.1.3]: <https://github.com/stac-utils/stac-fastapi/compare/6.1.2..6.1.3>
 [6.1.2]: <https://github.com/stac-utils/stac-fastapi/compare/6.1.1..6.1.2>
 [6.1.1]: <https://github.com/stac-utils/stac-fastapi/compare/6.1.0..6.1.1>

VERSION

@@ -1 +1 @@
-6.1.3
+6.1.4

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "stac-fastapi"
-version = "6.1.3"
+version = "6.1.4"
 description = "Python library for building a STAC-compliant FastAPI application."
 requires-python = ">=3.11"
 readme = "README.md"
@@ -81,7 +81,7 @@ explicit_package_bases = true
 exclude = ["tests", ".venv"]
 
 [tool.bumpversion]
-current_version = "6.1.3"
+current_version = "6.1.4"
 parse = """(?x)
     (?P<major>\\d+)\\.
     (?P<minor>\\d+)\\.

stac_fastapi/api/stac_fastapi/api/app.py

@@ -8,6 +8,7 @@
 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/stac_fastapi/api/errors.py

@@ -96,5 +96,5 @@ def request_validation_exception_handler(
     # TODO: Argument 2 to "add_exception_handler" of "Starlette" has incompatible type
     app.add_exception_handler(
         RequestValidationError,
-        request_validation_exception_handler,  # type: ignore
+        request_validation_exception_handler,  # type: ignore [arg-type]
     )

stac_fastapi/api/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 @@
     import orjson  # noqa
     from fastapi.responses import ORJSONResponse as JSONResponse
 except ImportError:  # pragma: nocover
-    from starlette.responses import JSONResponse  # type: ignore
+    from starlette.responses import JSONResponse  # type: ignore [assignment]
 
 
 def create_request_model(
@@ -49,43 +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():  # 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: Type[BaseSearchGetRequest] = BaseSearchGetRequest,
+    base_model: Type[APIRequest] = BaseSearchGetRequest,
 ) -> Type[APIRequest]:
     """Wrap create_request_model to create the GET request model."""
-    return create_request_model(  # type: ignore
+    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: Type[BaseSearchPostRequest] = BaseSearchPostRequest,
+    base_model: Type[BaseModel] = BaseSearchPostRequest,
 ) -> Type[BaseModel]:
     """Wrap create_request_model to create the POST request model."""
-    return create_request_model(  # type: ignore
+    model = create_request_model(
         "SearchPostRequest",
         base_model=base_model,
         extensions=extensions,
         request_type="POST",
     )
+    return cast(Type[BaseModel], model)
 
 
 @attr.s
@@ -121,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/stac_fastapi/api/version.py

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

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

@@ -1,7 +1,7 @@
 """Collection-Search extension."""
 
 from enum import Enum
-from typing import List, Optional, Type, Union
+from typing import List, Optional, Type, Union, cast
 
 import attr
 from fastapi import APIRouter, FastAPI
@@ -87,11 +87,14 @@ def from_extensions(
         for ext in extensions:
             conformance_classes.extend(ext.conformance_classes)
 
-        get_request_model = create_request_model(
-            model_name="CollectionsGetRequest",
-            base_model=BaseCollectionSearchGetRequest,
-            extensions=extensions,
-            request_type="GET",
+        get_request_model = cast(
+            Type[APIRequest],
+            create_request_model(
+                model_name="CollectionsGetRequest",
+                base_model=BaseCollectionSearchGetRequest,
+                extensions=extensions,
+                request_type="GET",
+            ),
         )
 
         return cls(
@@ -164,7 +167,7 @@ def register(self, app: FastAPI) -> None:
         app.include_router(self.router)
 
     @classmethod
-    def from_extensions(  # type: ignore
+    def from_extensions(  # type: ignore [override]
         cls,
         extensions: List[ApiExtension],
         *,
@@ -181,18 +184,24 @@ def from_extensions(  # type: ignore
         for ext in extensions:
             conformance_classes.extend(ext.conformance_classes)
 
-        get_request_model = create_request_model(
-            model_name="CollectionsGetRequest",
-            base_model=BaseCollectionSearchGetRequest,
-            extensions=extensions,
-            request_type="GET",
+        get_request_model = cast(
+            Type[APIRequest],
+            create_request_model(
+                model_name="CollectionsGetRequest",
+                base_model=BaseCollectionSearchGetRequest,
+                extensions=extensions,
+                request_type="GET",
+            ),
         )
 
-        post_request_model = create_request_model(
-            model_name="CollectionsPostRequest",
-            base_model=BaseCollectionSearchPostRequest,
-            extensions=extensions,
-            request_type="POST",
+        post_request_model = cast(
+            Type[BaseModel],
+            create_request_model(
+                model_name="CollectionsPostRequest",
+                base_model=BaseCollectionSearchPostRequest,
+                extensions=extensions,
+                request_type="POST",
+            ),
         )
 
         return cls(

stac_fastapi/extensions/stac_fastapi/extensions/third_party/bulk_transactions.py

@@ -31,7 +31,7 @@ def __iter__(self):
         return iter(self.items.values())
 
 
-@attr.s  # type: ignore
+@attr.s
 class BaseBulkTransactionsClient(abc.ABC):
     """BulkTransactionsClient."""
 
@@ -63,7 +63,7 @@ def bulk_item_insert(
         raise NotImplementedError
 
 
-@attr.s  # type: ignore
+@attr.s
 class AsyncBaseBulkTransactionsClient(abc.ABC):
     """BulkTransactionsClient."""