stac-fastapi.types 6.3.0__tar.gz → 6.3.2__tar.gz

{stac_fastapi_types-6.3.0 → stac_fastapi_types-6.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: stac-fastapi-types
-Version: 6.3.0
+Version: 6.3.2
 Summary: Core API for stac-fastapi modules.
 Project-URL: Homepage, https://github.com/stac-utils/stac-fastapi
 Author-email: ArturoAI <engineering@arturo.ai>

{stac_fastapi_types-6.3.0 → stac_fastapi_types-6.3.2}/stac_fastapi/types/config.py

@@ -1,10 +1,9 @@
 """stac_fastapi.types.config module."""
 
-from typing import Optional
+from typing import Self
 
 from pydantic import model_validator
 from pydantic_settings import BaseSettings, SettingsConfigDict
-from typing_extensions import Self
 
 
 class ApiSettings(BaseSettings):
@@ -56,7 +55,7 @@ class ApiSettings(BaseSettings):
 class Settings:
     """Holds the global instance of settings."""
 
-    _instance: Optional[ApiSettings] = None
+    _instance: ApiSettings | None = None
 
     @classmethod
     def set(cls, base_settings: ApiSettings):

{stac_fastapi_types-6.3.0 → stac_fastapi_types-6.3.2}/stac_fastapi/types/conformance.py

@@ -1,9 +1,9 @@
 """Conformance Classes."""
 
-from enum import Enum
+from enum import StrEnum
 
 
-class STACConformanceClasses(str, Enum):
+class STACConformanceClasses(StrEnum):
     """Conformance classes for the STAC API spec."""
 
     CORE = "https://api.stacspec.org/v1.0.0/core"
@@ -12,7 +12,7 @@ class STACConformanceClasses(str, Enum):
     ITEM_SEARCH = "https://api.stacspec.org/v1.0.0/item-search"
 
 
-class OAFConformanceClasses(str, Enum):
+class OAFConformanceClasses(StrEnum):
     """Conformance classes for OGC API - Features."""
 
     CORE = "http://www.opengis.net/spec/ogcapi-features-1/1.0/conf/core"

{stac_fastapi_types-6.3.0 → stac_fastapi_types-6.3.2}/stac_fastapi/types/core.py

@@ -1,8 +1,8 @@
 """Base clients."""
 
 import abc
-from typing import Any, Dict, List, Optional, Union
-from urllib.parse import urljoin
+from typing import Any
+from urllib.parse import urljoin, urlsplit
 
 import attr
 from fastapi import Request
@@ -26,8 +26,8 @@ __all__ = [
     "AsyncBaseCoreClient",
 ]
 
-NumType = Union[float, int]
-StacType = Dict[str, Any]
+NumType = float | int
+StacType = dict[str, Any]
 
 api_settings = ApiSettings()
 
@@ -44,9 +44,10 @@ class LandingPageMixin(abc.ABC):
     def _landing_page(
         self,
         base_url: str,
-        conformance_classes: List[str],
-        extension_schemas: List[str],
+        conformance_classes: list[str],
+        extension_schemas: list[str],
     ) -> stac.LandingPage:
+        path = urlsplit(base_url).path.rstrip("/")
         landing_page = stac.LandingPage(
             type="Catalog",
             id=self.landing_page_id,
@@ -71,26 +72,26 @@ class LandingPageMixin(abc.ABC):
                     "rel": Relations.data.value,
                     "type": MimeTypes.json.value,
                     "title": "Collections available for this Catalog",
-                    "href": urljoin(base_url, "collections"),
+                    "href": urljoin(base_url, f"{path}/collections"),
                 },
                 {
                     "rel": Relations.conformance.value,
                     "type": MimeTypes.json.value,
                     "title": "STAC/OGC conformance classes implemented by this server",
-                    "href": urljoin(base_url, "conformance"),
+                    "href": urljoin(base_url, f"{path}/conformance"),
                 },
                 {
                     "rel": Relations.search.value,
                     "type": MimeTypes.geojson.value,
                     "title": "STAC search [GET]",
-                    "href": urljoin(base_url, "search"),
+                    "href": urljoin(base_url, f"{path}/search"),
                     "method": "GET",
                 },
                 {
                     "rel": Relations.search.value,
                     "type": MimeTypes.geojson.value,
                     "title": "STAC search [POST]",
-                    "href": urljoin(base_url, "search"),
+                    "href": urljoin(base_url, f"{path}/search"),
                     "method": "POST",
                 },
             ],
@@ -108,12 +109,12 @@ class BaseCoreClient(LandingPageMixin, abc.ABC):
         extensions: list of registered api extensions.
     """
 
-    base_conformance_classes: List[str] = attr.ib(
+    base_conformance_classes: list[str] = attr.ib(
         factory=lambda: BASE_CONFORMANCE_CLASSES
     )
-    extensions: List[ApiExtension] = attr.ib(default=attr.Factory(list))
+    extensions: list[ApiExtension] = attr.ib(default=attr.Factory(list))
 
-    def conformance_classes(self) -> List[str]:
+    def conformance_classes(self) -> list[str]:
         """Generate conformance classes by adding extension conformance to base
         conformance classes."""
         base_conformance_classes = self.base_conformance_classes.copy()
@@ -155,6 +156,8 @@ class BaseCoreClient(LandingPageMixin, abc.ABC):
             extension_schemas=[],
         )
 
+        path = urlsplit(base_url).path.rstrip("/")
+
         # Add Queryables link
         if self.extension_is_enabled("FilterExtension") or self.extension_is_enabled(
             "SearchFilterExtension"
@@ -164,7 +167,7 @@ class BaseCoreClient(LandingPageMixin, abc.ABC):
                     "rel": Relations.queryables.value,
                     "type": MimeTypes.jsonschema.value,
                     "title": "Queryables available for this Catalog",
-                    "href": urljoin(base_url, "queryables"),
+                    "href": urljoin(base_url, f"{path}/queryables"),
                 }
             )
 
@@ -176,13 +179,13 @@ class BaseCoreClient(LandingPageMixin, abc.ABC):
                         "rel": "aggregate",
                         "type": "application/json",
                         "title": "Aggregate",
-                        "href": urljoin(base_url, "aggregate"),
+                        "href": urljoin(base_url, f"{path}/aggregate"),
                     },
                     {
                         "rel": "aggregations",
                         "type": "application/json",
                         "title": "Aggregations",
-                        "href": urljoin(base_url, "aggregations"),
+                        "href": urljoin(base_url, f"{path}/aggregations"),
                     },
                 ]
             )
@@ -238,12 +241,12 @@ class BaseCoreClient(LandingPageMixin, abc.ABC):
     @abc.abstractmethod
     def get_search(
         self,
-        collections: Optional[List[str]] = None,
-        ids: Optional[List[str]] = None,
-        bbox: Optional[BBox] = None,
-        intersects: Optional[Geometry] = None,
-        datetime: Optional[str] = None,
-        limit: Optional[int] = 10,
+        collections: list[str] | None = None,
+        ids: list[str] | None = None,
+        bbox: BBox | None = None,
+        intersects: Geometry | None = None,
+        datetime: str | None = None,
+        limit: int | None = 10,
         **kwargs,
     ) -> stac.ItemCollection:
         """Cross catalog search (GET).
@@ -299,10 +302,10 @@ class BaseCoreClient(LandingPageMixin, abc.ABC):
     def item_collection(
         self,
         collection_id: str,
-        bbox: Optional[BBox] = None,
-        datetime: Optional[str] = None,
+        bbox: BBox | None = None,
+        datetime: str | None = None,
         limit: int = 10,
-        token: Optional[str] = None,
+        token: str | None = None,
         **kwargs,
     ) -> stac.ItemCollection:
         """Get all items from a specific collection.
@@ -328,12 +331,12 @@ class AsyncBaseCoreClient(LandingPageMixin, abc.ABC):
         extensions: list of registered api extensions.
     """
 
-    base_conformance_classes: List[str] = attr.ib(
+    base_conformance_classes: list[str] = attr.ib(
         factory=lambda: BASE_CONFORMANCE_CLASSES
     )
-    extensions: List[ApiExtension] = attr.ib(default=attr.Factory(list))
+    extensions: list[ApiExtension] = attr.ib(default=attr.Factory(list))
 
-    def conformance_classes(self) -> List[str]:
+    def conformance_classes(self) -> list[str]:
         """Generate conformance classes by adding extension conformance to base
         conformance classes."""
         conformance_classes = self.base_conformance_classes.copy()
@@ -364,6 +367,7 @@ class AsyncBaseCoreClient(LandingPageMixin, abc.ABC):
             conformance_classes=self.conformance_classes(),
             extension_schemas=[],
         )
+        path = urlsplit(base_url).path.rstrip("/")
 
         # Add Queryables link
         if self.extension_is_enabled("FilterExtension") or self.extension_is_enabled(
@@ -374,7 +378,7 @@ class AsyncBaseCoreClient(LandingPageMixin, abc.ABC):
                     "rel": Relations.queryables.value,
                     "type": MimeTypes.jsonschema.value,
                     "title": "Queryables available for this Catalog",
-                    "href": urljoin(base_url, "queryables"),
+                    "href": urljoin(base_url, f"{path}/queryables"),
                     "method": "GET",
                 }
             )
@@ -387,13 +391,13 @@ class AsyncBaseCoreClient(LandingPageMixin, abc.ABC):
                         "rel": "aggregate",
                         "type": "application/json",
                         "title": "Aggregate",
-                        "href": urljoin(base_url, "aggregate"),
+                        "href": urljoin(base_url, f"{path}/aggregate"),
                     },
                     {
                         "rel": "aggregations",
                         "type": "application/json",
                         "title": "Aggregations",
-                        "href": urljoin(base_url, "aggregations"),
+                        "href": urljoin(base_url, f"{path}/aggregations"),
                     },
                 ]
             )
@@ -449,12 +453,12 @@ class AsyncBaseCoreClient(LandingPageMixin, abc.ABC):
     @abc.abstractmethod
     async def get_search(
         self,
-        collections: Optional[List[str]] = None,
-        ids: Optional[List[str]] = None,
-        bbox: Optional[BBox] = None,
-        intersects: Optional[Geometry] = None,
-        datetime: Optional[str] = None,
-        limit: Optional[int] = 10,
+        collections: list[str] | None = None,
+        ids: list[str] | None = None,
+        bbox: BBox | None = None,
+        intersects: Geometry | None = None,
+        datetime: str | None = None,
+        limit: int | None = 10,
         **kwargs,
     ) -> stac.ItemCollection:
         """Cross catalog search (GET).
@@ -510,10 +514,10 @@ class AsyncBaseCoreClient(LandingPageMixin, abc.ABC):
     async def item_collection(
         self,
         collection_id: str,
-        bbox: Optional[BBox] = None,
-        datetime: Optional[str] = None,
+        bbox: BBox | None = None,
+        datetime: str | None = None,
         limit: int = 10,
-        token: Optional[str] = None,
+        token: str | None = None,
         **kwargs,
     ) -> stac.ItemCollection:
         """Get all items from a specific collection.

{stac_fastapi_types-6.3.0 → stac_fastapi_types-6.3.2}/stac_fastapi/types/extension.py

@@ -1,7 +1,6 @@
 """Base api extension."""
 
 import abc
-from typing import List, Optional, Type, Union
 
 import attr
 from fastapi import FastAPI
@@ -14,20 +13,20 @@ from stac_fastapi.types.search import APIRequest
 class ApiExtension(abc.ABC):
     """Abstract base class for defining API extensions."""
 
-    GET: Optional[Type[APIRequest]] = None
-    POST: Optional[Type[BaseModel]] = None
+    GET: type[APIRequest] | None = None
+    POST: type[BaseModel] | None = None
 
     def get_request_model(
         self, verb: str = "GET"
-    ) -> Optional[Union[Type[BaseModel], Type[APIRequest]]]:
+    ) -> type[BaseModel] | type[APIRequest] | None:
         """Return the request model for the extension.method.
 
         The model can differ based on HTTP verb
         """
         return getattr(self, verb)
 
-    conformance_classes: List[str] = attr.ib(factory=list)
-    schema_href: Optional[str] = attr.ib(default=None)
+    conformance_classes: list[str] = attr.ib(factory=list)
+    schema_href: str | None = attr.ib(default=None)
 
     @abc.abstractmethod
     def register(self, app: FastAPI) -> None:

{stac_fastapi_types-6.3.0 → stac_fastapi_types-6.3.2}/stac_fastapi/types/links.py

@@ -1,7 +1,7 @@
 """Link helpers."""
 
-from typing import Any, Dict, List
-from urllib.parse import urljoin
+from typing import Any
+from urllib.parse import urljoin, urlsplit
 
 import attr
 from stac_pydantic.links import Relations
@@ -13,16 +13,33 @@ from stac_pydantic.shared import MimeTypes
 INFERRED_LINK_RELS = ["self", "item", "parent", "collection", "root", "items"]
 
 
-def filter_links(links: List[Dict]) -> List[Dict]:
+def filter_links(links: list[dict]) -> list[dict]:
     """Remove inferred links."""
     return [link for link in links if link["rel"] not in INFERRED_LINK_RELS]
 
 
-def resolve_links(links: list, base_url: str) -> List[Dict]:
-    """Convert relative links to absolute links."""
+def resolve_links(links: list, base_url: str) -> list[dict]:
+    """Convert relative links to absolute links while preserving existing absolute URLs.
+
+    This function processes links and applies the base_url and proxy path to relative URLs
+    However, it explicitly preserves absolute URLs (starting with http:// or https://) to
+    prevent mangling of external links stored in STAC items (e.g., license URLs, external
+    documentation links).
+    """
     filtered_links = filter_links(links)
+    path = urlsplit(base_url).path.rstrip("/")
     for link in filtered_links:
-        link.update({"href": urljoin(base_url, link["href"])})
+        href = str(link.get("href", ""))
+
+        # Do not mangle URLs that are already absolute
+        if href.startswith(("http://", "https://")):
+            continue
+
+        # Remove leading slash to prevent urljoin from replacing the entire path
+        href = href.lstrip("/")
+        # Construct the full path with proxy path preserved
+        full_path = f"{path}/{href}" if path else href
+        link.update({"href": urljoin(base_url, full_path)})
     return filtered_links
 
 
@@ -33,7 +50,7 @@ class BaseLinks:
     collection_id: str = attr.ib()
     base_url: str = attr.ib()
 
-    def root(self) -> Dict[str, Any]:
+    def root(self) -> dict[str, Any]:
         """Return the catalog root."""
         return dict(rel=Relations.root, type=MimeTypes.json, href=self.base_url)
 
@@ -42,27 +59,29 @@ class BaseLinks:
 class CollectionLinks(BaseLinks):
     """Create inferred links specific to collections."""
 
-    def self(self) -> Dict[str, Any]:
+    def self(self) -> dict[str, Any]:
         """Create the `self` link."""
+        path = urlsplit(self.base_url).path.rstrip("/")
         return dict(
             rel=Relations.self,
             type=MimeTypes.json,
-            href=urljoin(self.base_url, f"collections/{self.collection_id}"),
+            href=urljoin(self.base_url, f"{path}/collections/{self.collection_id}"),
         )
 
-    def parent(self) -> Dict[str, Any]:
+    def parent(self) -> dict[str, Any]:
         """Create the `parent` link."""
         return dict(rel=Relations.parent, type=MimeTypes.json, href=self.base_url)
 
-    def items(self) -> Dict[str, Any]:
+    def items(self) -> dict[str, Any]:
         """Create the `items` link."""
+        path = urlsplit(self.base_url).path.rstrip("/")
         return dict(
             rel="items",
             type=MimeTypes.geojson,
-            href=urljoin(self.base_url, f"collections/{self.collection_id}/items"),
+            href=urljoin(self.base_url, f"{path}/collections/{self.collection_id}/items"),
         )
 
-    def create_links(self) -> List[Dict[str, Any]]:
+    def create_links(self) -> list[dict[str, Any]]:
         """Return all inferred links."""
         return [self.self(), self.parent(), self.items(), self.root()]
 
@@ -73,34 +92,37 @@ class ItemLinks(BaseLinks):
 
     item_id: str = attr.ib()
 
-    def self(self) -> Dict[str, Any]:
+    def self(self) -> dict[str, Any]:
         """Create the `self` link."""
+        path = urlsplit(self.base_url).path.rstrip("/")
         return dict(
             rel=Relations.self,
             type=MimeTypes.geojson,
             href=urljoin(
                 self.base_url,
-                f"collections/{self.collection_id}/items/{self.item_id}",
+                f"{path}/collections/{self.collection_id}/items/{self.item_id}",
             ),
         )
 
-    def parent(self) -> Dict[str, Any]:
+    def parent(self) -> dict[str, Any]:
         """Create the `parent` link."""
+        path = urlsplit(self.base_url).path.rstrip("/")
         return dict(
             rel=Relations.parent,
             type=MimeTypes.json,
-            href=urljoin(self.base_url, f"collections/{self.collection_id}"),
+            href=urljoin(self.base_url, f"{path}/collections/{self.collection_id}"),
         )
 
-    def collection(self) -> Dict[str, Any]:
+    def collection(self) -> dict[str, Any]:
         """Create the `collection` link."""
+        path = urlsplit(self.base_url).path.rstrip("/")
         return dict(
             rel=Relations.collection,
             type=MimeTypes.json,
-            href=urljoin(self.base_url, f"collections/{self.collection_id}"),
+            href=urljoin(self.base_url, f"{path}/collections/{self.collection_id}"),
         )
 
-    def create_links(self) -> List[Dict[str, Any]]:
+    def create_links(self) -> list[dict[str, Any]]:
         """Return all inferred links."""
         links = [
             self.self(),

{stac_fastapi_types-6.3.0 → stac_fastapi_types-6.3.2}/stac_fastapi/types/rfc3339.py

@@ -1,8 +1,7 @@
 """rfc3339."""
 
 import re
-from datetime import datetime, timezone
-from typing import Optional, Tuple, Union
+from datetime import UTC, datetime
 
 import iso8601
 from fastapi import HTTPException
@@ -12,12 +11,9 @@ RFC33339_PATTERN = (
     r"(Z|([-+])(\d\d):(\d\d))$"
 )
 
-DateTimeType = Union[
-    datetime,
-    Tuple[datetime, datetime],
-    Tuple[datetime, None],
-    Tuple[None, datetime],
-]
+DateTimeType = (
+    datetime | tuple[datetime, datetime] | tuple[datetime, None] | tuple[None, datetime]
+)
 
 
 # Borrowed from pystac - https://github.com/stac-utils/pystac/blob/f5e4cf4a29b62e9ef675d4a4dac7977b09f53c8f/pystac/utils.py#L370-L394
@@ -38,7 +34,7 @@ def datetime_to_str(dt: datetime, timespec: str = "auto") -> str:
         str: The ISO8601 (RFC 3339) formatted string representing the datetime.
     """
     if dt.tzinfo is None:
-        dt = dt.replace(tzinfo=timezone.utc)
+        dt = dt.replace(tzinfo=UTC)
 
     timestamp = dt.isoformat(timespec=timespec)
     zulu = "+00:00"
@@ -92,7 +88,7 @@ def parse_single_date(date_str: str) -> datetime:
     return rfc3339_str_to_datetime(date_str)
 
 
-def str_to_interval(interval: Optional[str]) -> Optional[DateTimeType]:
+def str_to_interval(interval: str | None) -> DateTimeType | None:
     """
     Extract a single datetime object or a tuple of datetime objects from an
     interval string defined by the OGC API. The interval can either be a
@@ -151,7 +147,7 @@ def str_to_interval(interval: Optional[str]) -> Optional[DateTimeType]:
 
 def now_in_utc() -> datetime:
     """Return a datetime value of now with the UTC timezone applied."""
-    return datetime.now(timezone.utc)
+    return datetime.now(UTC)
 
 
 def now_to_rfc3339_str() -> str:

{stac_fastapi_types-6.3.0 → stac_fastapi_types-6.3.2}/stac_fastapi/types/search.py

@@ -1,7 +1,7 @@
 """stac_fastapi.types.search module."""
 
 from datetime import datetime as dt
-from typing import Dict, List, Optional, Union, cast
+from typing import Annotated, cast
 
 import attr
 from fastapi import HTTPException, Query
@@ -9,7 +9,6 @@ from pydantic import Field, PositiveInt
 from pydantic.functional_validators import AfterValidator
 from stac_pydantic.api import Search
 from stac_pydantic.shared import BBox
-from typing_extensions import Annotated
 
 from stac_fastapi.types.rfc3339 import DateTimeType, str_to_interval
 
@@ -22,7 +21,7 @@ def crop(v: PositiveInt) -> PositiveInt:
     return v
 
 
-def str2list(x: Optional[str]) -> Optional[List[str]]:
+def str2list(x: str | None) -> list[str] | None:
     """Convert string to list base on , delimiter."""
     if x:
         return x.split(",")
@@ -30,7 +29,7 @@ def str2list(x: Optional[str]) -> Optional[List[str]]:
     return None
 
 
-def str2bbox(x: str) -> Optional[BBox]:
+def str2bbox(x: str) -> BBox | None:
     """Convert string to BBox based on , delimiter."""
     if x:
         try:
@@ -50,7 +49,7 @@ def str2bbox(x: str) -> Optional[BBox]:
 
 def _collection_converter(
     val: Annotated[
-        Optional[str],
+        str | None,
         Query(
             description="Array of collection Ids to search for items.",
             openapi_examples={
@@ -60,7 +59,7 @@ def _collection_converter(
             },
         ),
     ] = None,
-) -> Optional[List[str]]:
+) -> list[str] | None:
     if val:
         return val.split(",")
     return None
@@ -68,7 +67,7 @@ def _collection_converter(
 
 def _ids_converter(
     val: Annotated[
-        Optional[str],
+        str | None,
         Query(
             description="Array of Item ids to return.",
             openapi_examples={
@@ -78,7 +77,7 @@ def _ids_converter(
             },
         ),
     ] = None,
-) -> Optional[List[str]]:
+) -> list[str] | None:
     if val:
         return val.split(",")
     return None
@@ -86,7 +85,7 @@ def _ids_converter(
 
 def _bbox_converter(
     val: Annotated[
-        Optional[str],
+        str | None,
         Query(
             description="Only return items intersecting this bounding box. Mutually exclusive with **intersects**.",  # noqa: E501
             openapi_examples={
@@ -95,7 +94,7 @@ def _bbox_converter(
             },
         ),
     ] = None,
-) -> Optional[BBox]:
+) -> BBox | None:
     if val:
         return str2bbox(val)
     return None
@@ -107,12 +106,12 @@ def _validate_datetime(instance, attribute, value):
 
 
 # Be careful: https://github.com/samuelcolvin/pydantic/issues/1423#issuecomment-642797287
-NumType = Union[float, int]
+NumType = float | int
 Limit = Annotated[PositiveInt, AfterValidator(crop)]
 
 
 DateTimeQueryType = Annotated[
-    Optional[str],
+    str | None,
     Query(
         description="""Only return items that have a temporal property that intersects this value.\n
 Either a date-time or an interval, open or closed. Date and time expressions adhere to RFC 3339. Open intervals are expressed using double-dots.""",  # noqa: E501
@@ -131,7 +130,7 @@ Either a date-time or an interval, open or closed. Date and time expressions adh
 class APIRequest:
     """Generic API Request base class."""
 
-    def kwargs(self) -> Dict:
+    def kwargs(self) -> dict:
         """Transform api request params into format which matches the signature of the
         endpoint."""
         return self.__dict__
@@ -143,12 +142,12 @@ class DatetimeMixin:
 
     datetime: DateTimeQueryType = attr.ib(default=None, validator=_validate_datetime)
 
-    def parse_datetime(self) -> Optional[DateTimeType]:
+    def parse_datetime(self) -> DateTimeType | None:
         """Return Datetime objects."""
         return str_to_interval(self.datetime)
 
     @property
-    def start_date(self) -> Optional[dt]:
+    def start_date(self) -> dt | None:
         """Start Date."""
         parsed = self.parse_datetime()
         if parsed is None:
@@ -157,7 +156,7 @@ class DatetimeMixin:
         return parsed[0] if isinstance(parsed, tuple) else parsed
 
     @property
-    def end_date(self) -> Optional[dt]:
+    def end_date(self) -> dt | None:
         """End Date."""
         parsed = self.parse_datetime()
         if parsed is None:
@@ -170,13 +169,11 @@ class DatetimeMixin:
 class BaseSearchGetRequest(APIRequest, DatetimeMixin):
     """Base arguments for GET Request."""
 
-    collections: Optional[List[str]] = attr.ib(
-        default=None, converter=_collection_converter
-    )
-    ids: Optional[List[str]] = attr.ib(default=None, converter=_ids_converter)
-    bbox: Optional[BBox] = attr.ib(default=None, converter=_bbox_converter)
+    collections: list[str] | None = attr.ib(default=None, converter=_collection_converter)
+    ids: list[str] | None = attr.ib(default=None, converter=_ids_converter)
+    bbox: BBox | None = attr.ib(default=None, converter=_bbox_converter)
     intersects: Annotated[
-        Optional[str],
+        str | None,
         Query(
             description="""Only return items intersecting this GeoJSON Geometry. Mutually exclusive with **bbox**. \n
 *Remember to URL encode the GeoJSON geometry when using GET request*.""",  # noqa: E501
@@ -223,7 +220,7 @@ class BaseSearchGetRequest(APIRequest, DatetimeMixin):
     ] = attr.ib(default=None)
     datetime: DateTimeQueryType = attr.ib(default=None, validator=_validate_datetime)
     limit: Annotated[
-        Optional[Limit],
+        Limit | None,
         Query(
             description="Limits the number of results that are included in each page of the response (capped to 10_000)."  # noqa: E501
         ),
@@ -233,7 +230,7 @@ class BaseSearchGetRequest(APIRequest, DatetimeMixin):
 class BaseSearchPostRequest(Search):
     """Base arguments for POST Request."""
 
-    limit: Optional[Limit] = Field(
+    limit: Limit | None = Field(
         10,
         description="Limits the number of results that are included in each page of the response (capped to 10_000).",  # noqa: E501
     )

{stac_fastapi_types-6.3.0 → stac_fastapi_types-6.3.2}/stac_fastapi/types/stac.py

@@ -1,11 +1,10 @@
 """STAC types."""
 
-from typing import Any, Dict, List, Literal, Union
+from typing import Any, Literal, NotRequired, TypedDict
 
 from stac_pydantic.shared import BBox
-from typing_extensions import NotRequired, TypedDict
 
-NumType = Union[float, int]
+NumType = float | int
 
 
 class Catalog(TypedDict):
@@ -13,34 +12,34 @@ class Catalog(TypedDict):
 
     type: str
     stac_version: str
-    stac_extensions: NotRequired[List[str]]
+    stac_extensions: NotRequired[list[str]]
     id: str
     title: NotRequired[str]
     description: str
-    links: List[Dict[str, Any]]
+    links: list[dict[str, Any]]
 
 
 class LandingPage(Catalog):
     """STAC Landing Page."""
 
-    conformsTo: List[str]
+    conformsTo: list[str]
 
 
 class Conformance(TypedDict):
     """STAC Conformance Classes."""
 
-    conformsTo: List[str]
+    conformsTo: list[str]
 
 
 class Collection(Catalog):
     """STAC Collection."""
 
-    keywords: List[str]
+    keywords: list[str]
     license: str
-    providers: List[Dict[str, Any]]
-    extent: Dict[str, Any]
-    summaries: Dict[str, Any]
-    assets: Dict[str, Any]
+    providers: list[dict[str, Any]]
+    extent: dict[str, Any]
+    summaries: dict[str, Any]
+    assets: dict[str, Any]
 
 
 class Item(TypedDict):
@@ -48,13 +47,13 @@ class Item(TypedDict):
 
     type: Literal["Feature"]
     stac_version: str
-    stac_extensions: NotRequired[List[str]]
+    stac_extensions: NotRequired[list[str]]
     id: str
-    geometry: Dict[str, Any]
+    geometry: dict[str, Any]
     bbox: BBox
-    properties: Dict[str, Any]
-    links: List[Dict[str, Any]]
-    assets: Dict[str, Any]
+    properties: dict[str, Any]
+    links: list[dict[str, Any]]
+    assets: dict[str, Any]
     collection: str
 
 
@@ -62,8 +61,8 @@ class ItemCollection(TypedDict):
     """STAC Item Collection."""
 
     type: Literal["FeatureCollection"]
-    features: List[Item]
-    links: List[Dict[str, Any]]
+    features: list[Item]
+    links: list[dict[str, Any]]
     numberMatched: NotRequired[int]
     numberReturned: NotRequired[int]
 
@@ -73,7 +72,7 @@ class Collections(TypedDict):
     https://github.com/radiantearth/stac-api-spec/tree/master/collections
     """
 
-    collections: List[Collection]
-    links: List[Dict[str, Any]]
+    collections: list[Collection]
+    links: list[dict[str, Any]]
     numberMatched: NotRequired[int]
     numberReturned: NotRequired[int]

{stac_fastapi_types-6.3.0 → stac_fastapi_types-6.3.2}/stac_fastapi/types/version.py

@@ -1,3 +1,3 @@
 """Library version."""
 
-__version__ = "6.3.0"
+__version__ = "6.3.2"