eodash_catalog 0.0.28__py3-none-any.whl → 0.0.30__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.28"
+__version__ = "0.0.30"

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,
@@ -322,10 +327,10 @@ def handle_SH_WMS_endpoint(
     catalog_config: dict, endpoint_config: dict, collection_config: dict, catalog: Catalog
 ) -> Collection:
     # create collection and subcollections (based on locations)
+    root_collection = get_or_create_collection(
+        catalog, collection_config["Name"], collection_config, catalog_config, endpoint_config
+    )
     if "Locations" in collection_config:
-        root_collection = get_or_create_collection(
-            catalog, collection_config["Name"], collection_config, catalog_config, endpoint_config
-        )
         for location in collection_config["Locations"]:
             # create  and populate location collections based on times
             # TODO: Should we add some new description per location?
@@ -368,6 +373,26 @@ def handle_SH_WMS_endpoint(
         for c_child in root_collection.get_children():
             if isinstance(c_child, Collection):
                 root_collection.extent.spatial.bboxes.append(c_child.extent.spatial.bboxes[0])
+    else:
+        # if locations are not provided, treat the collection as a
+        # general proxy to the sentinel hub layer
+        times = get_collection_times_from_config(endpoint_config)
+        bbox = endpoint_config.get("Bbox", [-180, -85, 180, 85])
+        for time in times:
+            item = Item(
+                id=time,
+                bbox=bbox,
+                properties={},
+                geometry=None,
+                datetime=parser.isoparse(time),
+                stac_extensions=[
+                    "https://stac-extensions.github.io/web-map-links/v1.1.0/schema.json",
+                ],
+            )
+            add_projection_info(endpoint_config, item)
+            add_visualization_info(item, collection_config, endpoint_config, time=time)
+            item_link = root_collection.add_item(item)
+            item_link.extra_fields["datetime"] = time
     # eodash v4 compatibility
     add_collection_information(catalog_config, root_collection, collection_config)
     add_visualization_info(root_collection, collection_config, endpoint_config)
@@ -527,20 +552,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:
@@ -614,16 +626,22 @@ def add_visualization_info(
                 "role": ["data"],
             }
         )
+        dimensions = {}
+        if dimensions_config := endpoint_config.get("Dimensions", {}):
+            for key, value in dimensions_config.items():
+                dimensions[key] = value
         if time is not None:
             if endpoint_config["Name"] == "Sentinel Hub WMS":
                 # SH WMS for public collections needs time interval, we use full day here
-                datetime_object = datetime.strptime(time, "%Y-%m-%d")
+                datetime_object = datetime.fromisoformat(time)
                 start = datetime_object.isoformat()
                 end = (datetime_object + timedelta(days=1) - timedelta(milliseconds=1)).isoformat()
                 time_interval = f"{start}/{end}"
-                extra_fields["wms:dimensions"] = {"TIME": time_interval}
+                dimensions["TIME"] = time_interval
             if endpoint_config["Name"] == "Sentinel Hub":
-                extra_fields["wms:dimensions"] = {"TIME": time}
+                dimensions["TIME"] = time
+        if dimensions != {}:
+            extra_fields["wms:dimensions"] = dimensions
         stac_object.add_link(
             Link(
                 rel="wms",
@@ -640,10 +658,14 @@ def add_visualization_info(
                 "role": ["data"],
             }
         )
+        dimensions = {}
+        if dimensions_config := endpoint_config.get("Dimensions", {}):
+            for key, value in dimensions_config.items():
+                dimensions[key] = value
         if time is not None:
-            extra_fields["wms:dimensions"] = {
-                "TIME": time,
-            }
+            dimensions["TIME"] = time
+        if dimensions != {}:
+            extra_fields["wms:dimensions"] = dimensions
         if "Styles" in endpoint_config:
             extra_fields["wms:styles"] = endpoint_config["Styles"]
         media_type = endpoint_config.get("MediaType", "image/jpeg")

eodash_catalog/stac_handling.py

@@ -44,7 +44,7 @@ def get_or_create_collection(
     )
     times: list[str] = []
     temporal_extent = TemporalExtent([[datetime.now(), None]])
-    if endpoint_config and endpoint_config.get("Type") == "OverwriteTimes":
+    if endpoint_config:
         if endpoint_config.get("Times"):
             times = list(endpoint_config.get("Times", []))
             times_datetimes = sorted([parser.isoparse(time) for time in times])
@@ -389,7 +389,7 @@ def add_extra_fields(stac_object: Collection | Link, collection_config: dict) ->
 
 def get_collection_times_from_config(endpoint_config: dict) -> list[str]:
     times: list[str] = []
-    if endpoint_config and endpoint_config.get("Type") == "OverwriteTimes":
+    if endpoint_config:
         if endpoint_config.get("Times"):
             times = list(endpoint_config.get("Times", []))
         elif endpoint_config.get("DateTimeInterval"):

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.28.dist-info → eodash_catalog-0.0.30.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: eodash_catalog
-Version: 0.0.28
+Version: 0.0.30
 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.30.dist-info/RECORD

@@ -0,0 +1,14 @@
+eodash_catalog/__about__.py,sha256=jhzZSQrCp7KQrReK8FJfif9ZfKLYZXTUzAui64xJkDs,138
+eodash_catalog/__init__.py,sha256=_W_9emPYf6FUqc0P8L2SmADx6hGSd7PlQV3yRmCk5uM,115
+eodash_catalog/duration.py,sha256=B6XOZfvNU7SuqpxuVtT1kNKODoOQJXDI6mocvA_U1ik,10816
+eodash_catalog/endpoints.py,sha256=ZMjPBPpSsgr-0PDfadD0TCkECxoua6kYCzOnTtfNG78,36257
+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=lipa0_zGdVeTe4eiVcUQKejz4iJ87z7bIyuyxCVwj50,18310
+eodash_catalog/thumbnails.py,sha256=31Wk38oNQDxfhSUbMLBpHuZFhsR8v_7luYr65XQtDf0,2213
+eodash_catalog/utils.py,sha256=sW1YKOaDBFM3rkx458NIG8KGq8kuwGKjTvWhb2-y808,11044
+eodash_catalog-0.0.30.dist-info/METADATA,sha256=UCh3ufTL0kTABl2aWGVWEtSvG3HxJVyszXQgp2xxB1U,3203
+eodash_catalog-0.0.30.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+eodash_catalog-0.0.30.dist-info/entry_points.txt,sha256=kuUQrDG1PtYd8kPjf5XM6H_NtQd9Ozwl0jjiGtAvZSM,87
+eodash_catalog-0.0.30.dist-info/licenses/LICENSE.txt,sha256=oJCW5zQxnFD-J0hGz6Zh5Lkpdk1oAndmWhseTmV224E,1107
+eodash_catalog-0.0.30.dist-info/RECORD,,

eodash_catalog-0.0.28.dist-info/RECORD

@@ -1,14 +0,0 @@
-eodash_catalog/__about__.py,sha256=eUPbOifB9Bv_vaPkbS7mfoJNKWtqw3Syp0TZbPe5RZk,138
-eodash_catalog/__init__.py,sha256=_W_9emPYf6FUqc0P8L2SmADx6hGSd7PlQV3yRmCk5uM,115
-eodash_catalog/duration.py,sha256=B6XOZfvNU7SuqpxuVtT1kNKODoOQJXDI6mocvA_U1ik,10816
-eodash_catalog/endpoints.py,sha256=y3g4uSmKI0-jixlqaeLPMRvfNDLn4xtJxMADhuT5aT0,35350
-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.28.dist-info/METADATA,sha256=b3qjQ4YFsBarXMrX-bVC4xqkT13QQij-uIsfuFk2KR0,3203
-eodash_catalog-0.0.28.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-eodash_catalog-0.0.28.dist-info/entry_points.txt,sha256=kuUQrDG1PtYd8kPjf5XM6H_NtQd9Ozwl0jjiGtAvZSM,87
-eodash_catalog-0.0.28.dist-info/licenses/LICENSE.txt,sha256=oJCW5zQxnFD-J0hGz6Zh5Lkpdk1oAndmWhseTmV224E,1107
-eodash_catalog-0.0.28.dist-info/RECORD,,