eodash_catalog 0.0.28__tar.gz → 0.0.29__tar.gz

{eodash_catalog-0.0.28 → eodash_catalog-0.0.29}/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.0.28
+current_version = 0.0.29
 commit = True
 tag = True
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+)\.(?P<build>\d+))?

{eodash_catalog-0.0.28 → eodash_catalog-0.0.29}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: eodash_catalog
-Version: 0.0.28
+Version: 0.0.29
 Summary: This package is intended to help create a compatible STAC catalog for the eodash dashboard client. It supports configuration of multiple endpoint types for information extraction.
 Project-URL: Documentation, https://github.com/eodash/eodash_catalog#readme
 Project-URL: Issues, https://github.com/eodash/eodash_catalog/issues

{eodash_catalog-0.0.28 → eodash_catalog-0.0.29}/src/eodash_catalog/__about__.py

@@ -1,4 +1,4 @@
 # SPDX-FileCopyrightText: 2024-present Daniel Santillan <daniel.santillan@eox.at>
 #
 # SPDX-License-Identifier: MIT
-__version__ = "0.0.28"
+__version__ = "0.0.29"

{eodash_catalog-0.0.28 → eodash_catalog-0.0.29}/src/eodash_catalog/endpoints.py

@@ -4,7 +4,7 @@ import os
 import sys
 import uuid
 from collections.abc import Callable
-from datetime import datetime, timedelta, timezone
+from datetime import datetime, timedelta
 from itertools import groupby
 from operator import itemgetter
 
@@ -27,6 +27,7 @@ from eodash_catalog.utils import (
     Options,
     create_geojson_from_bbox,
     create_geojson_point,
+    filter_time_entries,
     generate_veda_cog_link,
     replace_with_env_variables,
     retrieveExtentFromWMSWMTS,
@@ -69,6 +70,10 @@ def process_STAC_Datacube_Endpoint(
             time_dimension = k
             break
     time_entries = dimensions.get(time_dimension).get("values")
+    # optionally subset time results based on config
+    if query := endpoint_config.get("Query"):
+        time_entries = filter_time_entries(time_entries, query)
+
     for t in time_entries:
         item = Item(
             id=t,
@@ -527,20 +532,7 @@ def handle_WMS_endpoint(
         )
     # optionally filter time results
     if query := endpoint_config.get("Query"):
-        datetime_query = [
-            parser.isoparse(times[0]).replace(tzinfo=timezone.utc),
-            parser.isoparse(times[-1]).replace(tzinfo=timezone.utc),
-        ]
-        if start := query.get("Start"):
-            datetime_query[0] = parser.isoparse(start).replace(tzinfo=timezone.utc)
-        if end := query.get("End"):
-            datetime_query[1] = parser.isoparse(end).replace(tzinfo=timezone.utc)
-        # filter times based on query Start/End
-        times = [
-            datetime_str
-            for datetime_str in times
-            if datetime_query[0] <= parser.isoparse(datetime_str) < datetime_query[1]
-        ]
+        times = filter_time_entries(times, query)
     # Create an item per time to allow visualization in stac clients
     if len(times) > 0:
         for t in times:

{eodash_catalog-0.0.28 → eodash_catalog-0.0.29}/src/eodash_catalog/utils.py

@@ -5,7 +5,7 @@ import time
 import uuid
 from collections.abc import Iterator
 from dataclasses import dataclass
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from decimal import Decimal
 from functools import reduce, wraps
 from typing import Any
@@ -307,3 +307,21 @@ def retry(exceptions, tries=3, delay=2, backoff=1, logger=None):
         return wrapper
 
     return decorator
+
+
+def filter_time_entries(time_entries: list[str], query: dict[str, str]) -> list[str]:
+    datetime_query = [
+        parser.isoparse(time_entries[0]).replace(tzinfo=timezone.utc),
+        parser.isoparse(time_entries[-1]).replace(tzinfo=timezone.utc),
+    ]
+    if start := query.get("Start"):
+        datetime_query[0] = parser.isoparse(start).replace(tzinfo=timezone.utc)
+    if end := query.get("End"):
+        datetime_query[1] = parser.isoparse(end).replace(tzinfo=timezone.utc)
+    # filter times based on query Start/End
+    time_entries = [
+        datetime_str
+        for datetime_str in time_entries
+        if datetime_query[0] <= parser.isoparse(datetime_str) < datetime_query[1]
+    ]
+    return time_entries