eodash_catalog 0.3.7__tar.gz → 0.3.17__tar.gz

{eodash_catalog-0.3.7 → eodash_catalog-0.3.17}/.bumpversion.cfg

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

{eodash_catalog-0.3.7 → eodash_catalog-0.3.17}/Dockerfile

@@ -29,4 +29,4 @@ RUN eodash_catalog --help
 
 CMD ["eodash_catalog"]
 
-LABEL version="0.3.7"
+LABEL version="0.3.17"

{eodash_catalog-0.3.7 → eodash_catalog-0.3.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eodash_catalog
-Version: 0.3.7
+Version: 0.3.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

{eodash_catalog-0.3.7 → eodash_catalog-0.3.17}/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.3.7"
+__version__ = "0.3.17"

{eodash_catalog-0.3.7 → eodash_catalog-0.3.17}/src/eodash_catalog/endpoints.py

@@ -9,6 +9,7 @@ from collections.abc import Callable
 from datetime import datetime, timedelta
 from itertools import groupby
 from operator import itemgetter
+from urllib.parse import urlparse
 
 import pyarrow.parquet as pq
 import requests
@@ -20,6 +21,8 @@ from structlog import get_logger
 
 from eodash_catalog.sh_endpoint import get_SH_token
 from eodash_catalog.stac_handling import (
+    add_authentication,
+    add_base_overlay_info,
     add_collection_information,
     add_example_info,
     add_process_info_child_collection,
@@ -173,7 +176,7 @@ def handle_STAC_based_endpoint(
             catalog, collection_config["Name"], collection_config, catalog_config, endpoint_config
         )
         for location in collection_config["Locations"]:
-            identifier = location.get("Identifier", uuid.uuid4())
+            identifier = location.get("Identifier", str(uuid.uuid4()))
             collection = process_STACAPI_Endpoint(
                 catalog_config=catalog_config,
                 endpoint_config=endpoint_config,
@@ -213,11 +216,13 @@ def handle_STAC_based_endpoint(
                         location["OverwriteBBox"],
                     ]
                 )
+            add_collection_information(catalog_config, collection, collection_config)
+            add_base_overlay_info(collection, catalog_config, collection_config)
         update_extents_from_collection_children(root_collection)
     else:
         bbox = None
-        if endpoint_config.get("Bbox"):
-            bbox = ",".join(map(str, endpoint_config["Bbox"]))
+        if endpoint_config.get("OverwriteBBox"):
+            bbox = ",".join(map(str, endpoint_config["OverwriteBBox"]))
         root_collection = process_STACAPI_Endpoint(
             catalog_config=catalog_config,
             endpoint_config=endpoint_config,
@@ -392,6 +397,7 @@ def handle_collection_only(
                 properties={},
                 geometry=None,
                 datetime=dt,
+                assets={"dummy_asset": Asset(href="")},
             )
             link = collection.add_item(item)
             link.extra_fields["datetime"] = format_datetime_to_isostring_zulu(dt)
@@ -464,12 +470,14 @@ def handle_SH_WMS_endpoint(
                 LOGGER.warn(f"NO datetimes configured for collection: {collection_config['Name']}!")
             add_visualization_info(collection, collection_config, endpoint_config)
             add_process_info_child_collection(collection, catalog_config, collection_config)
+            add_collection_information(catalog_config, collection, collection_config)
+            add_base_overlay_info(collection, catalog_config, collection_config)
         update_extents_from_collection_children(root_collection)
     else:
         # if locations are not provided, treat the collection as a
         # general proxy to the sentinel hub layer
         datetimes = get_collection_datetimes_from_config(endpoint_config)
-        bbox = endpoint_config.get("Bbox", [-180, -85, 180, 85])
+        bbox = endpoint_config.get("OverwriteBBox", [-180, -85, 180, 85])
         items = []
         for dt in datetimes:
             item = Item(
@@ -910,6 +918,7 @@ def handle_GeoDB_endpoint(
         link.extra_fields["country"] = country
         link.extra_fields["name"] = city
         add_collection_information(catalog_config, locations_collection, collection_config)
+        add_base_overlay_info(locations_collection, catalog_config, collection_config)
 
     if "yAxis" not in collection_config:
         # fetch yAxis and store it to data, preventing need to save it per dataset in yml
@@ -948,7 +957,8 @@ def handle_SH_endpoint(
 ) -> Collection:
     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/"
+    endpoint_url_parts = urlparse(endpoint_config["EndPoint"])
+    endpoint_config["EndPoint"] = f"https://{endpoint_url_parts.netloc}/api/v1/catalog/1.0.0/"
     # Overwrite collection id with type, such as ZARR or BYOC
     if endpoint_config.get("Type"):
         endpoint_config["CollectionId"] = (
@@ -985,12 +995,14 @@ def handle_WMS_endpoint(
         # some endpoints allow "narrowed-down" capabilities per-layer, which we utilize to not
         # have to process full service capabilities XML
         capabilities_url = endpoint_config["EndPoint"]
-        spatial_extent, datetimes = retrieveExtentFromWMSWMTS(
+        spatial_extent, datetimes_retrieved = retrieveExtentFromWMSWMTS(
             capabilities_url,
             endpoint_config["LayerId"],
             version=endpoint_config.get("Version", "1.1.1"),
             wmts=wmts,
         )
+        if datetimes_retrieved:
+            datetimes = datetimes_retrieved
     # optionally filter time results
     if query := endpoint_config.get("Query"):
         datetimes = filter_time_entries(datetimes, query)
@@ -1054,6 +1066,10 @@ def generate_veda_tiles_link(endpoint_config: dict, item: str | None) -> str:
     color_formula = ""
     if endpoint_config.get("ColorFormula"):
         color_formula = "&color_formula={}".format(endpoint_config["ColorFormula"])
+    rescale = ""
+    if endpoint_config.get("Rescale"):
+        for rescale in endpoint_config["Rescale"]:
+            rescale += f"&rescale={rescale}"
     no_data = ""
     if endpoint_config.get("NoData"):
         no_data = "&no_data={}".format(endpoint_config["NoData"])
@@ -1061,7 +1077,7 @@ def generate_veda_tiles_link(endpoint_config: dict, item: str | None) -> str:
     target_url_base = endpoint_config["EndPoint"].replace("/stac/", "")
     target_url = (
         f"{target_url_base}/raster/collections/{collection}/items/{item}"
-        f"/tiles/WebMercatorQuad/{{z}}/{{x}}/{{y}}?{assets}{color_formula}{no_data}"
+        f"/tiles/WebMercatorQuad/{{z}}/{{x}}/{{y}}?{assets}{color_formula}{no_data}{rescale}"
     )
     return target_url
 
@@ -1111,9 +1127,10 @@ def add_visualization_info(
 
         if dimensions != {}:
             extra_fields["wms:dimensions"] = dimensions
+        endpoint_url_parts = urlparse(endpoint_config["EndPoint"])
         link = Link(
             rel="wms",
-            target=f"https://services.sentinel-hub.com/ogc/wms/{instanceId}",
+            target=f"https://{endpoint_url_parts.netloc}/ogc/wms/{instanceId}",
             media_type=(endpoint_config.get("MimeType", "image/png")),
             title=collection_config["Name"],
             extra_fields=extra_fields,
@@ -1130,6 +1147,14 @@ def add_visualization_info(
                 "role": ["data"],
             }
         )
+        if collection_config.get("EodashIdentifier") == "FNF":
+            extra_fields.update(
+                {
+                    "wms:layers": endpoint_config.get("LayerId", "").replace(
+                        "{time}", (datetimes is not None and str(datetimes[0].year)) or "2020"
+                    ),
+                }
+            )
         dimensions = {}
         if dimensions_config := endpoint_config.get("Dimensions", {}):
             for key, value in dimensions_config.items():
@@ -1203,28 +1228,6 @@ def add_visualization_info(
             link,
         )
         stac_object.add_link(link)
-    elif endpoint_config["Name"] == "JAXA_WMTS_PALSAR":
-        target_url = "{}".format(endpoint_config.get("EndPoint"))
-        # custom time just for this special case as a default for collection wmts
-        time = None
-        if datetimes is not None:
-            time = datetimes[0]
-        extra_fields.update(
-            {
-                "wmts:layer": endpoint_config.get("LayerId", "").replace(
-                    "{time}", (time and str(time.year)) or "2017"
-                )
-            }
-        )
-        stac_object.add_link(
-            Link(
-                rel="wmts",
-                target=target_url,
-                media_type="image/png",
-                title="wmts capabilities",
-                extra_fields=extra_fields,
-            )
-        )
     elif endpoint_config["Name"] == "xcube":
         if endpoint_config["Type"] == "zarr":
             # either preset ColormapName of left as a template
@@ -1483,3 +1486,91 @@ def handle_raw_source(
 
     add_collection_information(catalog_config, collection, collection_config)
     return collection
+
+
+def handle_vector_tile_source(
+    catalog_config: dict,
+    endpoint_config: dict,
+    collection_config: dict,
+    coll_path_rel_to_root_catalog: str,
+    catalog: Catalog,
+    options: Options,
+) -> Collection:
+    collection = get_or_create_collection(
+        catalog, collection_config["Name"], collection_config, catalog_config, endpoint_config
+    )
+    coll_path_rel_to_root_catalog = f'{coll_path_rel_to_root_catalog}/{collection_config["Name"]}'
+    if len(endpoint_config.get("TimeEntries", [])) > 0:
+        items = []
+        style_link = None
+        for time_entry in endpoint_config["TimeEntries"]:
+            # create Item for each time entry
+            media_type = "application/vnd.mapbox-vector-tile"
+            style_type = "text/vector-styles"
+            bbox = endpoint_config.get("Bbox", [-180, -85, 180, 85])
+            dt = parse_datestring_to_tz_aware_datetime(time_entry["Time"])
+
+            item = Item(
+                id=format_datetime_to_isostring_zulu(dt),
+                bbox=bbox,
+                properties={},
+                geometry=create_geometry_from_bbox(bbox),
+                datetime=dt,
+                extra_fields={},
+                assets={"dummy_asset": Asset(href="")},
+            )
+            extra_fields_link = {}
+            add_authentication(item, time_entry["Url"], extra_fields_link)
+            # add mapbox vector tile link
+            identifier = str(uuid.uuid4())
+            extra_fields_link["key"] = identifier
+            if vector_tile_id_property := endpoint_config.get("idProperty"):
+                extra_fields_link["idProperty"] = vector_tile_id_property
+            link = Link(
+                rel="vector-tile",
+                target=time_entry["Url"],
+                media_type=media_type,
+                title=collection_config["Name"],
+                extra_fields=extra_fields_link,
+            )
+            add_projection_info(
+                endpoint_config,
+                link,
+            )
+            item.add_link(link)
+            add_projection_info(
+                endpoint_config,
+                item,
+            )
+            if endpoint_config.get("Attribution"):
+                item.stac_extensions.append(
+                    "https://stac-extensions.github.io/attribution/v0.1.0/schema.json"
+                )
+                item.extra_fields["attribution"] = endpoint_config["Attribution"]
+            # add style
+            if ep_st := endpoint_config.get("Style"):
+                style_link = Link(
+                    rel="style",
+                    target=ep_st
+                    if ep_st.startswith("http")
+                    else f"{catalog_config['assets_endpoint']}/{ep_st}",
+                    media_type=style_type,
+                    extra_fields={"links:keys": [identifier]},
+                )
+                item.add_link(style_link)
+            items.append(item)
+
+        save_items(
+            collection,
+            items,
+            options.outputpath,
+            catalog_config["id"],
+            coll_path_rel_to_root_catalog,
+            options.gp,
+        )
+
+    else:
+        LOGGER.warn(f"NO datetimes configured for collection: {collection_config['Name']}!")
+
+    add_collection_information(catalog_config, collection, collection_config)
+    return collection

{eodash_catalog-0.3.7 → eodash_catalog-0.3.17}/src/eodash_catalog/generate_indicators.py

@@ -24,6 +24,7 @@ from eodash_catalog.endpoints import (
     handle_raw_source,
     handle_SH_endpoint,
     handle_SH_WMS_endpoint,
+    handle_vector_tile_source,
     handle_VEDA_endpoint,
     handle_WMS_endpoint,
     handle_xcube_endpoint,
@@ -292,16 +293,14 @@ def process_collection_file(
                         catalog,
                         options,
                     )
-                elif endpoint_config["Name"] == "JAXA_WMTS_PALSAR":
-                    # somewhat one off creation of individual WMTS layers as individual items
-                    collection = handle_WMS_endpoint(
+                elif endpoint_config["Name"] == "VectorTile source":
+                    collection = handle_vector_tile_source(
                         catalog_config,
                         endpoint_config,
                         collection_config,
                         coll_path_rel_to_root_catalog,
                         catalog,
                         options,
-                        wmts=True,
                     )
                 elif endpoint_config["Name"] == "Collection-only":
                     collection = handle_collection_only(
@@ -360,9 +359,11 @@ def process_collection_file(
                     countries.extend(sub_coll_def["Country"])
                 else:
                     countries.append(sub_coll_def["Country"])
-                coll_path_rel_to_root_catalog = (
-                    f"{coll_path_rel_to_root_catalog}/{sub_coll_def['Collection']}"
-                )
+                # commented out intentionally, because otherwise paths further down did
+                # not match, parquet file was one level deeper
+                # coll_path_rel_to_root_catalog = (
+                #     f"{coll_path_rel_to_root_catalog}/{sub_coll_def['Collection']}"
+                # )
                 process_collection_file(
                     catalog_config,
                     "{}/{}".format(options.collectionspath, sub_coll_def["Collection"]),
@@ -421,6 +422,7 @@ def process_collection_file(
         add_collection_information(catalog_config, parent_collection, collection_config, True)
         add_process_info(parent_collection, catalog_config, collection_config)
         update_extents_from_collection_children(parent_collection)
+        add_base_overlay_info(parent_collection, catalog_config, collection_config)
         # Fill summaries for locations
         parent_collection.summaries = Summaries(
             {

{eodash_catalog-0.3.7 → eodash_catalog-0.3.17}/src/eodash_catalog/sh_endpoint.py

@@ -1,10 +1,10 @@
 import os
 import time
+from urllib.parse import urlparse
 
 from oauthlib.oauth2 import BackendApplicationClient
 from requests_oauthlib import OAuth2Session
 
-SH_TOKEN_URL = "https://services.sentinel-hub.com/oauth/token"
 _token_cache: dict[str, dict] = {}
 
 
@@ -24,6 +24,8 @@ def get_SH_token(endpoint_config: dict) -> str:
     client = BackendApplicationClient(client_id=client_id)
     oauth = OAuth2Session(client=client)
     # Get token for the session
+    endpoint_url_parts = urlparse(endpoint_config["EndPoint"])
+    SH_TOKEN_URL = f"https://{endpoint_url_parts.netloc}/oauth/token"
     token = oauth.fetch_token(
         token_url=SH_TOKEN_URL,
         client_secret=client_secret,

{eodash_catalog-0.3.7 → eodash_catalog-0.3.17}/src/eodash_catalog/stac_handling.py

@@ -1,3 +1,4 @@
+import uuid
 from datetime import datetime, timezone
 
 import requests
@@ -122,11 +123,14 @@ def create_service_link(endpoint_config: dict, catalog_config: dict) -> Link:
     return sl
 
 
-def create_web_map_link(layer_config: dict, role: str) -> Link:
+def create_web_map_link(
+    collection: Collection, catalog_config: dict, layer_config: dict, role: str
+) -> Link:
     extra_fields = {
         "roles": [role],
         "id": layer_config["id"],
     }
+    media_type = (layer_config.get("media_type", "image/png"),)
     if layer_config.get("default"):
         extra_fields["roles"].append("default")
     if layer_config.get("visible"):
@@ -146,12 +150,32 @@ def create_web_map_link(layer_config: dict, role: str) -> Link:
             extra_fields["wmts:layer"] = layer_config["layer"]
             if layer_config.get("dimensions"):
                 extra_fields["wmts:dimensions"] = layer_config["dimensions"]
+        case "vector-tile":
+            identifier = str(uuid.uuid4())
+            extra_fields["key"] = identifier
+            media_type = "application/vnd.mapbox-vector-tile"
+            if vector_tile_id_property := layer_config.get("idProperty"):
+                extra_fields["idProperty"] = vector_tile_id_property
+            if ep_st := layer_config.get("Style"):
+                style_link = Link(
+                    rel="style",
+                    target=ep_st
+                    if ep_st.startswith("http")
+                    else f"{catalog_config['assets_endpoint']}/{ep_st}",
+                    media_type="text/vector-styles",
+                    extra_fields={"links:keys": [identifier]},
+                )
+                collection.add_link(style_link)
+            add_authentication(collection, layer_config["url"], extra_fields)
+
     if layer_config.get("Attribution"):
         extra_fields["attribution"] = layer_config["Attribution"]
+    if layer_config.get("Colorlegend"):
+        extra_fields["eox:colorlegend"] = layer_config["Colorlegend"]
     wml = Link(
         rel=layer_config["protocol"],
         target=layer_config["url"],
-        media_type=layer_config.get("media_type", "image/png"),
+        media_type=media_type,
         title=layer_config["name"],
         extra_fields=extra_fields,
     )
@@ -307,18 +331,21 @@ def add_collection_information(
             ),
         )
     if collection_config.get("Image"):
+        # Check if absolute URL or relative path
+        if collection_config["Image"].startswith("http"):
+            image_url = collection_config["Image"]
+        else:
+            image_url = f'{catalog_config["assets_endpoint"]}/{collection_config["Image"]}'
         collection.add_asset(
             "thumbnail",
             Asset(
-                href=f'{catalog_config["assets_endpoint"]}/{collection_config["Image"]}',
+                href=image_url,
                 media_type="image/png",
                 roles=["thumbnail"],
             ),
         )
         # Bubble up thumbnail to extra fields
-        collection.extra_fields["thumbnail"] = (
-            f'{catalog_config["assets_endpoint"]}/' f'{collection_config["Image"]}'
-        )
+        collection.extra_fields["thumbnail"] = image_url
     # Add extra fields to collection if available
     add_extra_fields(collection, collection_config, is_root_collection)
 
@@ -473,23 +500,31 @@ def add_base_overlay_info(
     collection: Collection, catalog_config: dict, collection_config: dict
 ) -> None:
     # add custom baselayers specially for this indicator
-    if collection_config.get("BaseLayers"):
+    if "BaseLayers" in collection_config:
         for layer in collection_config["BaseLayers"]:
-            collection.add_link(create_web_map_link(layer, role="baselayer"))
+            collection.add_link(
+                create_web_map_link(collection, catalog_config, layer, role="baselayer")
+            )
     # alternatively use default base layers defined
     elif catalog_config.get("default_base_layers"):
         base_layers = read_config_file(catalog_config["default_base_layers"])
         for layer in base_layers:
-            collection.add_link(create_web_map_link(layer, role="baselayer"))
+            collection.add_link(
+                create_web_map_link(collection, catalog_config, layer, role="baselayer")
+            )
     # add custom overlays just for this indicator
-    if collection_config.get("OverlayLayers"):
+    if "OverlayLayers" in collection_config:
         for layer in collection_config["OverlayLayers"]:
-            collection.add_link(create_web_map_link(layer, role="overlay"))
+            collection.add_link(
+                create_web_map_link(collection, catalog_config, layer, role="overlay")
+            )
     # check if default overlay layers defined
     elif catalog_config.get("default_overlay_layers"):
         overlay_layers = read_config_file(catalog_config["default_overlay_layers"])
         for layer in overlay_layers:
-            collection.add_link(create_web_map_link(layer, role="overlay"))
+            collection.add_link(
+                create_web_map_link(collection, catalog_config, layer, role="overlay")
+            )
 
 
 def add_extra_fields(
@@ -579,3 +614,20 @@ def add_projection_info(
             stac_object.extra_fields["eodash:proj4_def"] = proj
         else:
             raise Exception(f"Incorrect type of proj definition {proj}")
+
+
+def add_authentication(stac_object: Item | Collection | Catalog, url: str, extra_fields_link: dict):
+    if "api.mapbox" in url:
+        # add authentication info
+        auth_extension = "https://stac-extensions.github.io/authentication/v1.1.0/schema.json"
+        if auth_extension not in stac_object.stac_extensions:
+            stac_object.stac_extensions.append(auth_extension)
+        stac_object.extra_fields["auth:schemes"] = {
+            "mapboxauth": {
+                "type": "apiKey",
+                "name": "access_token",
+                "in": "query",
+            }
+        }
+        extra_fields_link["auth:refs"] = ["mapboxauth"]
+    pass

{eodash_catalog-0.3.7 → eodash_catalog-0.3.17}/src/eodash_catalog/thumbnails.py

@@ -1,6 +1,7 @@
 import os
 import re
 from pathlib import Path
+from urllib.parse import urlparse
 
 import requests
 from pystac import (
@@ -46,7 +47,9 @@ def generate_thumbnail(
         # if it is start and end datetime have to exist
         if item_datetime:
             time = format_datetime_to_isostring_zulu(item_datetime)
-        url = "https://services.sentinel-hub.com/ogc/wms/{}?{}&layers={}&time={}&{}".format(
+        endpoint_url_parts = urlparse(endpoint_config["EndPoint"])
+        url = "https://{}/ogc/wms/{}?{}&layers={}&time={}&{}".format(
+            endpoint_url_parts,
             instanceId,
             wms_config,
             endpoint_config["LayerId"],

{eodash_catalog-0.3.7 → eodash_catalog-0.3.17}/src/eodash_catalog/utils.py

@@ -328,6 +328,7 @@ def add_single_item_if_collection_empty(endpoint_config: dict, collection: Colle
             datetime=datetime(1970, 1, 1, 0, 0, 0, tzinfo=pytztimezone("UTC")),
             start_datetime=datetime(1970, 1, 1, 0, 0, 0, tzinfo=pytztimezone("UTC")),
             end_datetime=datetime.now(tz=pytztimezone("UTC")),
+            assets={"dummy_asset": Asset(href="")},
         )
         collection.add_item(item)
         if not endpoint_config.get("OverwriteBBox"):
@@ -468,6 +469,11 @@ def extract_extent_from_geoparquet(table) -> tuple[TemporalExtent, SpatialExtent
         # fallback to start_datetime
         min_datetime = pc.min(table["start_datetime"]).as_py()
         max_datetime = pc.max(table["start_datetime"]).as_py()
+    # Making sure time extent is timezone aware
+    if min_datetime and min_datetime.tzinfo is None:
+        min_datetime = min_datetime.replace(tzinfo=timezone.utc)
+    if max_datetime and max_datetime.tzinfo is None:
+        max_datetime = max_datetime.replace(tzinfo=timezone.utc)
     temporal = TemporalExtent([min_datetime, max_datetime])
     geoms = [wkb.loads(g.as_py()) for g in table["geometry"] if g is not None]
     bbox = sgeom.MultiPolygon(geoms).bounds

{eodash_catalog-0.3.7 → eodash_catalog-0.3.17}/tests/testing-collections/test_sh_wms.json

@@ -33,7 +33,7 @@
       "Name": "Sentinel Hub WMS",
       "CollectionId": "sentinel-1-grd",
       "LayerId": "SENTINEL_1_IW_VV",
-      "Bbox": [
+      "OverwriteBBox": [
         101.938,
         11.945,
         106.37,
@@ -65,4 +65,4 @@
       "Url": "https://www.copernicus.eu/en/access-data/conventional-data-access-hubs"
     }
   ]
-}
+}