eodash_catalog 0.3.13__py3-none-any.whl → 0.3.20__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.3.13"
+__version__ = "0.3.20"

eodash_catalog/endpoints.py

@@ -176,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,
@@ -397,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)
@@ -713,13 +714,13 @@ def handle_GeoDB_endpoint(
         latlon = unique_values["aoi"]
         [lat, lon] = [float(x) for x in latlon.split(",")]
         # create item for unique locations
-        buff = 0.01
+        buff = 0.2
         bbox = [lon - buff, lat - buff, lon + buff, lat + buff]
 
         # create collection per available inputdata information
         sc_config = {
-            "Title": city,
-            "Description": f"{city} - {country}",
+            "Title": f"{city} - {collection_config['Name']}",
+            "Description": collection_config["Description"],
         }
         locations_collection = get_or_create_collection(
             collection, key, sc_config, catalog_config, endpoint_config
@@ -844,7 +845,7 @@ def handle_GeoDB_endpoint(
                                 rel="wms",
                                 target=url,
                                 media_type=(endpoint_config.get("MimeType", "image/png")),
-                                title=collection_config["Name"],
+                                title=first_match["Identifier"],
                                 extra_fields=extra_fields,
                             )
                             item.add_link(link)
@@ -994,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)
@@ -1144,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():
@@ -1217,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
@@ -1528,12 +1517,17 @@ def handle_vector_tile_source(
                 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 = uuid.uuid4()
+            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
+            if vector_tile_id_property := endpoint_config.get("layers"):
+                extra_fields_link["layers"] = vector_tile_id_property
             link = Link(
                 rel="vector-tile",
                 target=time_entry["Url"],

eodash_catalog/generate_indicators.py

@@ -302,17 +302,6 @@ 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(
-                        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(
                         catalog_config, endpoint_config, collection_config, catalog
@@ -469,12 +458,20 @@ def add_to_catalog(
         link.extra_fields["endpointtype"] = endpoint["Name"]
     if collection_config.get("Subtitle"):
         link.extra_fields["subtitle"] = collection_config["Subtitle"]
+    if collection_config.get("ShortDescription"):
+        link.extra_fields["shortdescription"] = collection_config["ShortDescription"]
     link.extra_fields["title"] = collection.title
     if collection_config.get("EodashIdentifier"):
         link.extra_fields["code"] = collection_config["EodashIdentifier"]
     link.extra_fields["id"] = collection_config["Name"]
     if collection_config.get("Themes"):
         link.extra_fields["themes"] = collection_config["Themes"]
+    if collection_config.get("Provider"):
+        # get all provider names
+        link.extra_fields["providers"] = [
+            provider.get("Name") or provider.get("Url")
+            for provider in collection_config["Provider"]
+        ]
     # Check for summaries and bubble up info
     if disable:
         link.extra_fields["roles"] = ["disable"]

eodash_catalog/stac_handling.py

@@ -1,5 +1,6 @@
 import uuid
 from datetime import datetime, timezone
+from urllib.parse import parse_qs, urlparse
 
 import requests
 import spdx_lookup as lookup
@@ -151,9 +152,13 @@ def create_web_map_link(
             if layer_config.get("dimensions"):
                 extra_fields["wmts:dimensions"] = layer_config["dimensions"]
         case "vector-tile":
-            identifier = uuid.uuid4()
+            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 vector_tile_id_property := layer_config.get("layers"):
+                layer_config["layers"] = vector_tile_id_property
             if ep_st := layer_config.get("Style"):
                 style_link = Link(
                     rel="style",
@@ -310,6 +315,10 @@ def add_collection_information(
 
     if collection_config.get("Subtitle"):
         collection.extra_fields["subtitle"] = collection_config["Subtitle"]
+
+    if collection_config.get("ShortDescription"):
+        collection.extra_fields["shortdescription"] = collection_config["ShortDescription"]
+
     if collection_config.get("Legend"):
         collection.add_asset(
             "legend",
@@ -319,15 +328,26 @@ def add_collection_information(
                 roles=["metadata"],
             ),
         )
-    if collection_config.get("Story"):
-        collection.add_asset(
-            "story",
-            Asset(
-                href=f'{catalog_config["assets_endpoint"]}/{collection_config["Story"]}',
-                media_type="text/markdown",
-                roles=["metadata"],
-            ),
-        )
+    if stories := collection_config.get("Stories"):
+        for story in stories:
+            story_url = story.get("Url")
+            if not story_url.startswith("http"):
+                story_url = f'{catalog_config.get("stories_endpoint")}/{story_url}'
+            parsed_url = urlparse(story_url)
+            # check if it is URL with a query parameter id=story-identifier
+            if parsed_url.query and len(parse_qs(parsed_url.query).get("id")) > 0:
+                story_id = parse_qs(parsed_url.query).get("id")[0]
+            else:
+                story_id = parsed_url.path.rsplit("/")[-1].replace(".md", "").replace(".MD", "")
+            collection.add_asset(
+                story_id,
+                Asset(
+                    title=story.get("Name"),
+                    href=story_url,
+                    media_type="text/markdown",
+                    roles=["metadata", "story"],
+                ),
+            )
     if collection_config.get("Image"):
         # Check if absolute URL or relative path
         if collection_config["Image"].startswith("http"):
@@ -615,7 +635,7 @@ def add_projection_info(
 
 
 def add_authentication(stac_object: Item | Collection | Catalog, url: str, extra_fields_link: dict):
-    if "api.mapbox" in url:
+    if "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:

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"):

{eodash_catalog-0.3.13.dist-info → eodash_catalog-0.3.20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eodash_catalog
-Version: 0.3.13
+Version: 0.3.20
 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.20.dist-info/RECORD

@@ -0,0 +1,14 @@
+eodash_catalog/__about__.py,sha256=btzIjHIy5zbLYBpkxUekQ8gMh9l-paHR_lzdzbCM8SI,138
+eodash_catalog/__init__.py,sha256=_W_9emPYf6FUqc0P8L2SmADx6hGSd7PlQV3yRmCk5uM,115
+eodash_catalog/duration.py,sha256=TBG7v1lCpbYowADK5uJ2M8kPxsvQneFAFi1NIE26dy4,10754
+eodash_catalog/endpoints.py,sha256=uaNtbv4cxMgdoTFyCfd625vTO9DayJxLFmyUtvGEyLU,65290
+eodash_catalog/generate_indicators.py,sha256=Lg_80KAIBuhxOhwORYCbRB5nZ1LoP894miWlNxiQKPs,22862
+eodash_catalog/sh_endpoint.py,sha256=l95NRh__AnpEZBhlzTaGVmBnyX00Sr7RRjwy114nroY,1323
+eodash_catalog/stac_handling.py,sha256=U5gsQH0mfb-9g2hrUMdNwpcyGjhrsGH7CqNEwV_NtfM,28896
+eodash_catalog/thumbnails.py,sha256=9tPnEdwDaScGCMHpDYXayCnAQYoG_E2oIiBFVGvqOz0,2372
+eodash_catalog/utils.py,sha256=2ov62y3OkYX4x2-XpH73FBZ71ulC0ie9m0rSGkuNw4g,24082
+eodash_catalog-0.3.20.dist-info/METADATA,sha256=Y4mcHut0Eb9XT_yIq_lmRRpi6Vh72ZAGb70i_gHbRxs,3020
+eodash_catalog-0.3.20.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+eodash_catalog-0.3.20.dist-info/entry_points.txt,sha256=kuUQrDG1PtYd8kPjf5XM6H_NtQd9Ozwl0jjiGtAvZSM,87
+eodash_catalog-0.3.20.dist-info/licenses/LICENSE.txt,sha256=oJCW5zQxnFD-J0hGz6Zh5Lkpdk1oAndmWhseTmV224E,1107
+eodash_catalog-0.3.20.dist-info/RECORD,,

eodash_catalog-0.3.13.dist-info/RECORD

@@ -1,14 +0,0 @@
-eodash_catalog/__about__.py,sha256=KH8aZKnX9omeGQR5vGzYS1G5xjoOtXnKNbSX5MLYiB0,138
-eodash_catalog/__init__.py,sha256=_W_9emPYf6FUqc0P8L2SmADx6hGSd7PlQV3yRmCk5uM,115
-eodash_catalog/duration.py,sha256=TBG7v1lCpbYowADK5uJ2M8kPxsvQneFAFi1NIE26dy4,10754
-eodash_catalog/endpoints.py,sha256=veVjrpE1hA6gF8kDKFifex5fNBohgh6_wgP8y5lKzFo,65177
-eodash_catalog/generate_indicators.py,sha256=djFmhrP_Nsnl1uC5Nd7CI4KbgRkDipUXAad0B2vC3lI,23002
-eodash_catalog/sh_endpoint.py,sha256=l95NRh__AnpEZBhlzTaGVmBnyX00Sr7RRjwy114nroY,1323
-eodash_catalog/stac_handling.py,sha256=lXMzAHT5L35cbVODQg141hDMRiswx6u6dWoEGy6s_T8,27797
-eodash_catalog/thumbnails.py,sha256=9tPnEdwDaScGCMHpDYXayCnAQYoG_E2oIiBFVGvqOz0,2372
-eodash_catalog/utils.py,sha256=Dv28AYksex7lcRi4f4N3UP5svpv_DIHcFOTRaxd5BKM,24030
-eodash_catalog-0.3.13.dist-info/METADATA,sha256=NCDeupYhXX168cy-HEns40KoBIXGFhUs3KG4dTZf5I4,3020
-eodash_catalog-0.3.13.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-eodash_catalog-0.3.13.dist-info/entry_points.txt,sha256=kuUQrDG1PtYd8kPjf5XM6H_NtQd9Ozwl0jjiGtAvZSM,87
-eodash_catalog-0.3.13.dist-info/licenses/LICENSE.txt,sha256=oJCW5zQxnFD-J0hGz6Zh5Lkpdk1oAndmWhseTmV224E,1107
-eodash_catalog-0.3.13.dist-info/RECORD,,