From 43cf7143242bfb2a4e90ef2ab7c6c9054f5ee1ea Mon Sep 17 00:00:00 2001 From: Lukas Bindreiter Date: Fri, 30 May 2025 11:27:22 +0200 Subject: [PATCH 1/2] Fix import for latest stac_pydantic version --- CHANGES.md | 1 + .../extensions/core/collection_search/request.py | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 6d4d1b73..6c6d2b25 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -10,6 +10,7 @@ - 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)) +- updated import of `SearchDatetime` to add support to `stac_pydantic` v3.3.0 ([#844](https://github.com/stac-utils/stac-fastapi/pull/844)) ## [5.2.1] - 2025-04-18 diff --git a/stac_fastapi/extensions/stac_fastapi/extensions/core/collection_search/request.py b/stac_fastapi/extensions/stac_fastapi/extensions/core/collection_search/request.py index 4b9f7f91..07f4606d 100644 --- a/stac_fastapi/extensions/stac_fastapi/extensions/core/collection_search/request.py +++ b/stac_fastapi/extensions/stac_fastapi/extensions/core/collection_search/request.py @@ -6,8 +6,15 @@ import attr from fastapi import Query from pydantic import BaseModel, Field, PrivateAttr, ValidationInfo, field_validator -from stac_pydantic.api.search import SearchDatetime from stac_pydantic.shared import BBox + +try: + # the import path changed recently in stac_pydantic v3.3.0 + # to make sure both older and newer versions are supported, we try both paths + from stac_pydantic.shared import SearchDatetime +except ImportError: + from stac_pydantic.api.search import SearchDatetime + from typing_extensions import Annotated from stac_fastapi.types.search import ( From 29e7c2582ee38d444263c2e227c94ad154eacdc0 Mon Sep 17 00:00:00 2001 From: Lukas Bindreiter Date: Mon, 2 Jun 2025 10:17:41 +0200 Subject: [PATCH 2/2] Pin to stac_pydantic>=3.3.0 --- CHANGES.md | 2 +- .../extensions/core/collection_search/request.py | 10 +--------- stac_fastapi/types/setup.py | 2 +- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 6c6d2b25..9c214108 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -10,7 +10,7 @@ - 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)) -- updated import of `SearchDatetime` to add support to `stac_pydantic` v3.3.0 ([#844](https://github.com/stac-utils/stac-fastapi/pull/844)) +- 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 diff --git a/stac_fastapi/extensions/stac_fastapi/extensions/core/collection_search/request.py b/stac_fastapi/extensions/stac_fastapi/extensions/core/collection_search/request.py index 07f4606d..f66f72c4 100644 --- a/stac_fastapi/extensions/stac_fastapi/extensions/core/collection_search/request.py +++ b/stac_fastapi/extensions/stac_fastapi/extensions/core/collection_search/request.py @@ -6,15 +6,7 @@ import attr from fastapi import Query from pydantic import BaseModel, Field, PrivateAttr, ValidationInfo, field_validator -from stac_pydantic.shared import BBox - -try: - # the import path changed recently in stac_pydantic v3.3.0 - # to make sure both older and newer versions are supported, we try both paths - from stac_pydantic.shared import SearchDatetime -except ImportError: - from stac_pydantic.api.search import SearchDatetime - +from stac_pydantic.shared import BBox, SearchDatetime from typing_extensions import Annotated from stac_fastapi.types.search import ( diff --git a/stac_fastapi/types/setup.py b/stac_fastapi/types/setup.py index 9fa5d92a..137a12e5 100644 --- a/stac_fastapi/types/setup.py +++ b/stac_fastapi/types/setup.py @@ -9,7 +9,7 @@ "fastapi>=0.109.0", "attrs>=23.2.0", "pydantic-settings>=2", - "stac_pydantic>=3.1.3,<4.0", + "stac_pydantic>=3.3.0,<4.0", "iso8601>=1.0.2,<2.2.0", ]