sfeos-helpers 6.7.4__py3-none-any.whl → 6.7.5__py3-none-any.whl

{sfeos_helpers-6.7.4.dist-info → sfeos_helpers-6.7.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sfeos_helpers
-Version: 6.7.4
+Version: 6.7.5
 Summary: Helper library for the Elasticsearch and Opensearch stac-fastapi backends.
 Project-URL: Homepage, https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch
 License: MIT
@@ -9,14 +9,12 @@ Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Information Technology
 Classifier: Intended Audience :: Science/Research
 Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
-Requires-Python: >=3.9
-Requires-Dist: stac-fastapi-core==6.7.4
+Requires-Python: >=3.11
+Requires-Dist: stac-fastapi-core==6.7.5
 Description-Content-Type: text/markdown
 
 # sfeos-helpers

{sfeos_helpers-6.7.4.dist-info → sfeos_helpers-6.7.5.dist-info}/RECORD

@@ -1,12 +1,12 @@
-stac_fastapi/sfeos_helpers/mappings.py,sha256=IqYd0tQUG-FnWVg6Fp1MU9audntF_-pMGm-BUTGbZMM,8596
-stac_fastapi/sfeos_helpers/version.py,sha256=Ao9na2IeAbio6N4Di9fhrhw069xIK8K8gKIrHf29u_Q,45
+stac_fastapi/sfeos_helpers/mappings.py,sha256=AikPY20F7cqbiHHkFEmWdMtxruhfNJbYK7hugKq7qTQ,8602
+stac_fastapi/sfeos_helpers/version.py,sha256=WRUWk2u8pozjztw-4p6a3fAkitIN0nGhe4tLZ6P6xUk,45
 stac_fastapi/sfeos_helpers/aggregation/README.md,sha256=SDlvCOpKyaJrlJvx84T2RzCnGALe_PK51zNeo3RP9ac,2122
 stac_fastapi/sfeos_helpers/aggregation/__init__.py,sha256=Mym17lFh90by1GnoQgMyIKAqRNJnvCgVSXDYzjBiPQk,1210
 stac_fastapi/sfeos_helpers/aggregation/client.py,sha256=PPUk0kAZnms46FlLGrR5w8wa52vG-dT6BG37896R5CY,17939
 stac_fastapi/sfeos_helpers/aggregation/format.py,sha256=qUW1jjh2EEjy-V7riliFR77grpi-AgsTmP76z60K5Lo,2011
 stac_fastapi/sfeos_helpers/database/README.md,sha256=TVYFDD4PqDD57ZsWBv4i4LawaL_DAEIOjM6OQuqwLAU,4049
 stac_fastapi/sfeos_helpers/database/__init__.py,sha256=Kvnz8hpXq_sSz8K5OW3PoPsvh9864Vv1zWhI5hxgd4o,2891
-stac_fastapi/sfeos_helpers/database/datetime.py,sha256=XMyi9Q09cuP_hj97qbGbHFtelq7WQVPdehUfzqNZFV4,4040
+stac_fastapi/sfeos_helpers/database/datetime.py,sha256=XHS5mg9NXUi2P0FtBpjTjy-g7nRzCtFgp3juq6Fr1_M,6831
 stac_fastapi/sfeos_helpers/database/document.py,sha256=LtjX15gvaOuZC_k2t_oQhys_c-zRTLN5rwX0hNJkHnM,1725
 stac_fastapi/sfeos_helpers/database/index.py,sha256=g7_sKfd5XUwq4IhdKRNiasejk045dKlullsdeDSZTq8,6585
 stac_fastapi/sfeos_helpers/database/mapping.py,sha256=4-MSd4xH5wg7yoC4aPjzYMDSEvP026bw4k2TfffMT5E,1387
@@ -29,6 +29,6 @@ stac_fastapi/sfeos_helpers/search_engine/selection/base.py,sha256=106c4FK50cgMmT
 stac_fastapi/sfeos_helpers/search_engine/selection/cache_manager.py,sha256=5yrgf9JA4mgRNMPDKih6xySF8mD724lEWnXhWud7m2c,4039
 stac_fastapi/sfeos_helpers/search_engine/selection/factory.py,sha256=vbgNVCUW2lviePqzpgsPLxp6IEqcX3GHiahqN2oVObA,1305
 stac_fastapi/sfeos_helpers/search_engine/selection/selectors.py,sha256=q83nfCfNfLUqtkHpORwNHNRU9Pa-heeaDIPO0RlHb-8,4779
-sfeos_helpers-6.7.4.dist-info/METADATA,sha256=lrYIM2qo_PLphU9WdCAeWsWfetifWGpX_RlPgn1vf7I,3214
-sfeos_helpers-6.7.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-sfeos_helpers-6.7.4.dist-info/RECORD,,
+sfeos_helpers-6.7.5.dist-info/METADATA,sha256=Uc87_remruIvFaSeGvZLSNhU-4RENX1f2E1DKK00ys8,3114
+sfeos_helpers-6.7.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+sfeos_helpers-6.7.5.dist-info/RECORD,,

stac_fastapi/sfeos_helpers/database/datetime.py

@@ -8,8 +8,10 @@ import logging
 import re
 from datetime import date
 from datetime import datetime as datetime_type
+from datetime import timezone
 from typing import Dict, Optional, Union
 
+from stac_fastapi.core.utilities import get_bool_env
 from stac_fastapi.types.rfc3339 import DateTimeType
 
 logger = logging.getLogger(__name__)
@@ -37,38 +39,103 @@ def return_date(
             always containing 'gte' and 'lte' keys.
     """
     result: Dict[str, Optional[str]] = {"gte": None, "lte": None}
-
+    use_datetime_nanos = get_bool_env("USE_DATETIME_NANOS", default=True)
     if interval is None:
         return result
 
-    if isinstance(interval, str):
-        if "/" in interval:
-            parts = interval.split("/")
-            result["gte"] = (
-                parts[0] if parts[0] != ".." else datetime_type.min.isoformat() + "Z"
-            )
-            result["lte"] = (
-                parts[1]
-                if len(parts) > 1 and parts[1] != ".."
-                else datetime_type.max.isoformat() + "Z"
+    if use_datetime_nanos:
+        MIN_DATE_NANOS = datetime_type(1970, 1, 1, tzinfo=timezone.utc)
+        MAX_DATE_NANOS = datetime_type(
+            2262, 4, 11, 23, 47, 16, 854775, tzinfo=timezone.utc
+        )
+
+        if isinstance(interval, str):
+            if "/" in interval:
+                parts = interval.split("/")
+                result["gte"] = (
+                    parts[0] if parts[0] != ".." else MIN_DATE_NANOS.isoformat() + "Z"
+                )
+                result["lte"] = (
+                    parts[1]
+                    if len(parts) > 1 and parts[1] != ".."
+                    else MAX_DATE_NANOS.isoformat() + "Z"
+                )
+            else:
+                converted_time = interval if interval != ".." else None
+                result["gte"] = result["lte"] = converted_time
+            return result
+
+        if isinstance(interval, datetime_type):
+            dt_utc = (
+                interval.astimezone(timezone.utc)
+                if interval.tzinfo
+                else interval.replace(tzinfo=timezone.utc)
             )
-        else:
-            converted_time = interval if interval != ".." else None
-            result["gte"] = result["lte"] = converted_time
+            if dt_utc < MIN_DATE_NANOS:
+                dt_utc = MIN_DATE_NANOS
+            elif dt_utc > MAX_DATE_NANOS:
+                dt_utc = MAX_DATE_NANOS
+            datetime_iso = dt_utc.isoformat()
+            result["gte"] = result["lte"] = datetime_iso
+        elif isinstance(interval, tuple):
+            start, end = interval
+            # Ensure datetimes are converted to UTC and formatted with 'Z'
+            if start:
+                start_utc = (
+                    start.astimezone(timezone.utc)
+                    if start.tzinfo
+                    else start.replace(tzinfo=timezone.utc)
+                )
+                if start_utc < MIN_DATE_NANOS:
+                    start_utc = MIN_DATE_NANOS
+                elif start_utc > MAX_DATE_NANOS:
+                    start_utc = MAX_DATE_NANOS
+                result["gte"] = start_utc.strftime("%Y-%m-%dT%H:%M:%S.%f")[:-3] + "Z"
+            if end:
+                end_utc = (
+                    end.astimezone(timezone.utc)
+                    if end.tzinfo
+                    else end.replace(tzinfo=timezone.utc)
+                )
+                if end_utc < MIN_DATE_NANOS:
+                    end_utc = MIN_DATE_NANOS
+                elif end_utc > MAX_DATE_NANOS:
+                    end_utc = MAX_DATE_NANOS
+                result["lte"] = end_utc.strftime("%Y-%m-%dT%H:%M:%S.%f")[:-3] + "Z"
+
         return result
 
-    if isinstance(interval, datetime_type):
-        datetime_iso = interval.isoformat()
-        result["gte"] = result["lte"] = datetime_iso
-    elif isinstance(interval, tuple):
-        start, end = interval
-        # Ensure datetimes are converted to UTC and formatted with 'Z'
-        if start:
-            result["gte"] = start.strftime("%Y-%m-%dT%H:%M:%S.%f")[:-3] + "Z"
-        if end:
-            result["lte"] = end.strftime("%Y-%m-%dT%H:%M:%S.%f")[:-3] + "Z"
-
-    return result
+    else:
+        if isinstance(interval, str):
+            if "/" in interval:
+                parts = interval.split("/")
+                result["gte"] = (
+                    parts[0]
+                    if parts[0] != ".."
+                    else datetime_type.min.isoformat() + "Z"
+                )
+                result["lte"] = (
+                    parts[1]
+                    if len(parts) > 1 and parts[1] != ".."
+                    else datetime_type.max.isoformat() + "Z"
+                )
+            else:
+                converted_time = interval if interval != ".." else None
+                result["gte"] = result["lte"] = converted_time
+            return result
+
+        if isinstance(interval, datetime_type):
+            datetime_iso = interval.isoformat()
+            result["gte"] = result["lte"] = datetime_iso
+        elif isinstance(interval, tuple):
+            start, end = interval
+            # Ensure datetimes are converted to UTC and formatted with 'Z'
+            if start:
+                result["gte"] = start.strftime("%Y-%m-%dT%H:%M:%S.%f")[:-3] + "Z"
+            if end:
+                result["lte"] = end.strftime("%Y-%m-%dT%H:%M:%S.%f")[:-3] + "Z"
+
+        return result
 
 
 def extract_date(date_str: str) -> date:

stac_fastapi/sfeos_helpers/mappings.py

@@ -142,7 +142,7 @@ ES_ITEMS_MAPPINGS = {
             "type": "object",
             "properties": {
                 # Common https://github.com/radiantearth/stac-spec/blob/master/item-spec/common-metadata.md
-                "datetime": {"type": "date"},
+                "datetime": {"type": "date_nanos"},
                 "start_datetime": {"type": "date"},
                 "end_datetime": {"type": "date"},
                 "created": {"type": "date"},

stac_fastapi/sfeos_helpers/version.py

@@ -1,2 +1,2 @@
 """library version."""
-__version__ = "6.7.4"
+__version__ = "6.7.5"