eodash_catalog 0.0.15__py3-none-any.whl → 0.0.17__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.15"
+__version__ = "0.0.17"

eodash_catalog/endpoints.py

@@ -4,7 +4,7 @@ import os
 import sys
 import uuid
 from collections.abc import Callable
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from itertools import groupby
 from operator import itemgetter
 
@@ -27,6 +27,7 @@ from eodash_catalog.utils import (
     create_geojson_from_bbox,
     create_geojson_point,
     generate_veda_cog_link,
+    replace_with_env_variables,
     retrieveExtentFromWMSWMTS,
 )
 
@@ -293,7 +294,7 @@ def handle_collection_only(
         catalog, collection_config["Name"], collection_config, catalog_config, endpoint_config
     )
     times = get_collection_times_from_config(endpoint_config)
-    if len(times) > 0 and not endpoint_config.get("Disable_Items"):
+    if len(times) > 0:
         for t in times:
             item = Item(
                 id=t,
@@ -473,7 +474,7 @@ def handle_SH_endpoint(
     catalog: Catalog,
     options: Options,
 ) -> Collection:
-    token = get_SH_token()
+    token = get_SH_token(endpoint_config)
     headers = {"Authorization": f"Bearer {token}"}
     endpoint_config["EndPoint"] = "https://services.sentinel-hub.com/api/v1/catalog/1.0.0/"
     # Overwrite collection id with type, such as ZARR or BYOC
@@ -509,8 +510,21 @@ def handle_WMS_endpoint(
             version=endpoint_config.get("Version", "1.1.1"),
             wmts=wmts,
         )
+    # optionally filter time results
+    if query := endpoint_config.get("Query"):
+        datetime_query = [times[0], times[-1]]
+        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]
+        ]
     # Create an item per time to allow visualization in stac clients
-    if len(times) > 0 and not endpoint_config.get("Disable_Items"):
+    if len(times) > 0:
         for t in times:
             item = Item(
                 id=t,
@@ -551,7 +565,7 @@ def generate_veda_tiles_link(endpoint_config: dict, item: str | None) -> str:
     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/stac/tiles/WebMercatorQuad/{{z}}/{{x}}/{{y}}?{collection}{item}{assets}{color_formula}{no_data}"
+    target_url = f"https://openveda.cloud/api/raster/stac/tiles/WebMercatorQuad/{{z}}/{{x}}/{{y}}?{collection}{item}{assets}{color_formula}{no_data}"
     return target_url
 
 
@@ -567,6 +581,10 @@ def add_visualization_info(
         instanceId = os.getenv("SH_INSTANCE_ID")
         if "InstanceId" in endpoint_config:
             instanceId = endpoint_config["InstanceId"]
+        if env_id := endpoint_config.get("CustomSHEnvId"):
+            # special handling for custom environment
+            # (will take SH_INSTANCE_ID_{env_id}) as ENV VAR
+            instanceId = os.getenv(f"SH_INSTANCE_ID_{env_id}")
         extra_fields: dict[str, list[str] | dict[str, str]] = {
             "wms:layers": [endpoint_config["LayerId"]],
             "role": ["data"],
@@ -604,10 +622,13 @@ def add_visualization_info(
         media_type = "image/jpeg"
         if "MediaType" in endpoint_config:
             media_type = endpoint_config["MediaType"]
+        endpoint_url = endpoint_config["EndPoint"]
+        # custom replacing of all ENV VARS present as template in URL as {VAR}
+        endpoint_url = replace_with_env_variables(endpoint_url)
         stac_object.add_link(
             Link(
                 rel="wms",
-                target=endpoint_config["EndPoint"],
+                target=endpoint_url,
                 media_type=media_type,
                 title=collection_config["Name"],
                 extra_fields=extra_fields,

eodash_catalog/sh_endpoint.py

@@ -4,12 +4,18 @@ from oauthlib.oauth2 import BackendApplicationClient
 from requests_oauthlib import OAuth2Session
 
 SH_TOKEN_URL = "https://services.sentinel-hub.com/oauth/token"
+_token_cache: dict[str, str] = {}
 
 
-def get_SH_token() -> str:
+def get_SH_token(endpoint_config: dict) -> str:
     # Your client credentials
-    client_id = os.getenv("SH_CLIENT_ID")
-    client_secret = os.getenv("SH_CLIENT_SECRET")
+    client_id = os.getenv("SH_CLIENT_ID", "")
+    client_secret = os.getenv("SH_CLIENT_SECRET", "")
+    if env_id := endpoint_config.get("CustomSHEnvId"):
+        client_id = os.getenv(f"SH_CLIENT_ID_{env_id}", "")
+        client_secret = os.getenv(f"SH_CLIENT_SECRET_{env_id}", "")
+    if client_id in _token_cache:
+        return _token_cache[client_id]
     # Create a session
     client = BackendApplicationClient(client_id=client_id)
     oauth = OAuth2Session(client=client)
@@ -18,5 +24,7 @@ def get_SH_token() -> str:
         token_url=SH_TOKEN_URL,
         client_secret=client_secret,
     )
+    access_token = token["access_token"]
+    _token_cache[client_id] = access_token
 
-    return token["access_token"]
+    return access_token

eodash_catalog/utils.py

@@ -1,3 +1,4 @@
+import os
 import re
 import threading
 import uuid
@@ -221,7 +222,7 @@ def generate_veda_cog_link(endpoint_config: dict, file_url: str | None) -> str:
 
     file_url = f"url={file_url}&" if file_url else ""
 
-    target_url = f"https://openveda.cloud/cog/tiles/WebMercatorQuad/{{z}}/{{x}}/{{y}}?{file_url}resampling_method=nearest{bidx}{colormap}{colormap_name}{rescale}"
+    target_url = f"https://openveda.cloud/api/raster/cog/tiles/WebMercatorQuad/{{z}}/{{x}}/{{y}}?{file_url}resampling_method=nearest{bidx}{colormap}{colormap_name}{rescale}"
     return target_url
 
 
@@ -252,3 +253,18 @@ def add_single_item_if_collection_empty(collection: Collection) -> None:
             end_datetime=datetime.now(),
         )
         collection.add_item(item)
+
+
+def replace_with_env_variables(s: str) -> str:
+    # Define the regex pattern to find text within curly brackets
+    pattern = r"\{(\w+)\}"
+
+    # Define the replacement function
+    def replacer(match):
+        # Extract the variable name from the match
+        var_name = match.group(1)
+        # Get the environment variable value, if it doesn't exist, keep the original placeholder
+        return os.getenv(var_name, match.group(0))
+
+    # Use re.sub with the replacement function
+    return re.sub(pattern, replacer, s)

{eodash_catalog-0.0.15.dist-info → eodash_catalog-0.0.17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: eodash_catalog
-Version: 0.0.15
+Version: 0.0.17
 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
@@ -31,7 +31,7 @@ Requires-Dist: pyyaml<7
 Requires-Dist: redis<4
 Requires-Dist: requests-oauthlib<1.3.2
 Requires-Dist: requests<3
-Requires-Dist: setuptools<68
+Requires-Dist: setuptools<71
 Requires-Dist: spdx-lookup<=0.3.3
 Requires-Dist: structlog<22.0
 Requires-Dist: swiftspec==0.0.2

eodash_catalog-0.0.17.dist-info/RECORD

@@ -0,0 +1,14 @@
+eodash_catalog/__about__.py,sha256=uMeWZM9Lctkvy8uGfWbPMcPv8IzBMt6rC3w9hmLXsKI,138
+eodash_catalog/__init__.py,sha256=_W_9emPYf6FUqc0P8L2SmADx6hGSd7PlQV3yRmCk5uM,115
+eodash_catalog/duration.py,sha256=B6XOZfvNU7SuqpxuVtT1kNKODoOQJXDI6mocvA_U1ik,10816
+eodash_catalog/endpoints.py,sha256=hL9rxeGcBpRr6wj6lcKxX7NtkLjP1auzwnt7zJjYVUo,33714
+eodash_catalog/generate_indicators.py,sha256=DlbgMuNVPGdg8roYO7raXIeTmsMRpsyN71DYnRATATI,18790
+eodash_catalog/sh_endpoint.py,sha256=F99LpYT-MGhPiwdSSysm3xBTjaQBXRUkieh-q-vhTvE,1012
+eodash_catalog/stac_handling.py,sha256=BKFFhM2JhrBnEd6EbEESAIUcFncDaAb5N4aHx0uZBv4,18197
+eodash_catalog/thumbnails.py,sha256=31Wk38oNQDxfhSUbMLBpHuZFhsR8v_7luYr65XQtDf0,2213
+eodash_catalog/utils.py,sha256=44V-Pm9tl70nWahMPE4vl-9FzZbRkMVRQPdINdG_8F8,8975
+eodash_catalog-0.0.17.dist-info/METADATA,sha256=PsfxySNapzSDipxns08iDq7vBcDw7M0ZTzmwYtswSwM,3203
+eodash_catalog-0.0.17.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+eodash_catalog-0.0.17.dist-info/entry_points.txt,sha256=kuUQrDG1PtYd8kPjf5XM6H_NtQd9Ozwl0jjiGtAvZSM,87
+eodash_catalog-0.0.17.dist-info/licenses/LICENSE.txt,sha256=oJCW5zQxnFD-J0hGz6Zh5Lkpdk1oAndmWhseTmV224E,1107
+eodash_catalog-0.0.17.dist-info/RECORD,,

eodash_catalog-0.0.15.dist-info/RECORD

@@ -1,14 +0,0 @@
-eodash_catalog/__about__.py,sha256=IVDENoZTPvh5evYDrfWrEHJJnzkDZ1pH3Gf9Il5ZGjg,138
-eodash_catalog/__init__.py,sha256=_W_9emPYf6FUqc0P8L2SmADx6hGSd7PlQV3yRmCk5uM,115
-eodash_catalog/duration.py,sha256=B6XOZfvNU7SuqpxuVtT1kNKODoOQJXDI6mocvA_U1ik,10816
-eodash_catalog/endpoints.py,sha256=UQtrhtxl5jNd_5SXBQrtRopLphX4mkro7tcpnOY3Ny8,32723
-eodash_catalog/generate_indicators.py,sha256=DlbgMuNVPGdg8roYO7raXIeTmsMRpsyN71DYnRATATI,18790
-eodash_catalog/sh_endpoint.py,sha256=vELooJwk269v1DNnOzb32vil96vL_SRCio8UBlx10N0,618
-eodash_catalog/stac_handling.py,sha256=BKFFhM2JhrBnEd6EbEESAIUcFncDaAb5N4aHx0uZBv4,18197
-eodash_catalog/thumbnails.py,sha256=31Wk38oNQDxfhSUbMLBpHuZFhsR8v_7luYr65XQtDf0,2213
-eodash_catalog/utils.py,sha256=FZIn3iwMNjdaGAlbaIHPffYkAhlIHpNU2vkMJmEcYRQ,8427
-eodash_catalog-0.0.15.dist-info/METADATA,sha256=AKHmY9ssYxP9hqIxVy4WY0w8VETzC7K_8aaCkjc8ZzQ,3203
-eodash_catalog-0.0.15.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-eodash_catalog-0.0.15.dist-info/entry_points.txt,sha256=kuUQrDG1PtYd8kPjf5XM6H_NtQd9Ozwl0jjiGtAvZSM,87
-eodash_catalog-0.0.15.dist-info/licenses/LICENSE.txt,sha256=oJCW5zQxnFD-J0hGz6Zh5Lkpdk1oAndmWhseTmV224E,1107
-eodash_catalog-0.0.15.dist-info/RECORD,,