eodash_catalog 0.0.27__py3-none-any.whl → 0.0.29__py3-none-any.whl

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.27"
+__version__ = "0.0.29"

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:
@@ -574,7 +566,7 @@ def handle_WMS_endpoint(
 
 
 def generate_veda_tiles_link(endpoint_config: dict, item: str | None) -> str:
-    collection = "collection={}".format(endpoint_config["CollectionId"])
+    collection = endpoint_config["CollectionId"]
     assets = ""
     for asset in endpoint_config["Assets"]:
         assets += f"&assets={asset}"
@@ -584,8 +576,8 @@ def generate_veda_tiles_link(endpoint_config: dict, item: str | None) -> str:
     no_data = ""
     if "NoData" in endpoint_config:
         no_data = "&no_data={}".format(endpoint_config["NoData"])
-    item = f"&item={item}" if item else ""
-    target_url = f"https://openveda.cloud/api/raster/stac/tiles/WebMercatorQuad/{{z}}/{{x}}/{{y}}?{collection}{item}{assets}{color_formula}{no_data}"
+    item = item if item else "{item}"
+    target_url = f"https://openveda.cloud/api/raster/collections/{collection}/items/{item}/tiles/WebMercatorQuad/{{z}}/{{x}}/{{y}}?{assets}{color_formula}{no_data}"
     return target_url
 
 

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

{eodash_catalog-0.0.27.dist-info → eodash_catalog-0.0.29.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: eodash_catalog
-Version: 0.0.27
+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.27.dist-info → eodash_catalog-0.0.29.dist-info}/RECORD

@@ -1,14 +1,14 @@
-eodash_catalog/__about__.py,sha256=bsufHVYvcGAaEqZ-VbCVPXCXjTYF4YBFZ8XQRpAR5QQ,138
+eodash_catalog/__about__.py,sha256=b4oiVp9QoxhxuwZjnnNaBjZ7HyycZmuA6hHWdt8ZIXU,138
 eodash_catalog/__init__.py,sha256=_W_9emPYf6FUqc0P8L2SmADx6hGSd7PlQV3yRmCk5uM,115
 eodash_catalog/duration.py,sha256=B6XOZfvNU7SuqpxuVtT1kNKODoOQJXDI6mocvA_U1ik,10816
-eodash_catalog/endpoints.py,sha256=vldV3ojAQ9s_nsCM_ItFHIaHiELlhn4tvX-F3w0HbT4,35364
+eodash_catalog/endpoints.py,sha256=ijiOad7mdb1oFgTzAPWty9XVK2a4jjtKcJXEeH03UHY,34938
 eodash_catalog/generate_indicators.py,sha256=0IHhu_0yOUoUtLqiTsoYQ2IrTrq00yZme3UE6pC9PIU,19772
 eodash_catalog/sh_endpoint.py,sha256=F99LpYT-MGhPiwdSSysm3xBTjaQBXRUkieh-q-vhTvE,1012
 eodash_catalog/stac_handling.py,sha256=AHV9BLzYcHzUprX42b-yjVvN8TERymWF_iZQruFMQlY,18414
 eodash_catalog/thumbnails.py,sha256=31Wk38oNQDxfhSUbMLBpHuZFhsR8v_7luYr65XQtDf0,2213
-eodash_catalog/utils.py,sha256=GmRypfWP8XlYqldJJCRLXAYlF6ovRJcPs-Ms8M91llw,10309
-eodash_catalog-0.0.27.dist-info/METADATA,sha256=Q3kSlyimqUyfVifa4wQMc4rXPhi_qS72eNxX2iWJbU0,3203
-eodash_catalog-0.0.27.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-eodash_catalog-0.0.27.dist-info/entry_points.txt,sha256=kuUQrDG1PtYd8kPjf5XM6H_NtQd9Ozwl0jjiGtAvZSM,87
-eodash_catalog-0.0.27.dist-info/licenses/LICENSE.txt,sha256=oJCW5zQxnFD-J0hGz6Zh5Lkpdk1oAndmWhseTmV224E,1107
-eodash_catalog-0.0.27.dist-info/RECORD,,
+eodash_catalog/utils.py,sha256=sW1YKOaDBFM3rkx458NIG8KGq8kuwGKjTvWhb2-y808,11044
+eodash_catalog-0.0.29.dist-info/METADATA,sha256=37udKFOHd7Vao0V9C5KqQmmXPhi2mpj2Jy6HSjU9y8o,3203
+eodash_catalog-0.0.29.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+eodash_catalog-0.0.29.dist-info/entry_points.txt,sha256=kuUQrDG1PtYd8kPjf5XM6H_NtQd9Ozwl0jjiGtAvZSM,87
+eodash_catalog-0.0.29.dist-info/licenses/LICENSE.txt,sha256=oJCW5zQxnFD-J0hGz6Zh5Lkpdk1oAndmWhseTmV224E,1107
+eodash_catalog-0.0.29.dist-info/RECORD,,