eodash_catalog 0.3.17__tar.gz → 0.3.18__tar.gz

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

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.3.17
+current_version = 0.3.18
 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.17 → eodash_catalog-0.3.18}/Dockerfile

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eodash_catalog
-Version: 0.3.17
+Version: 0.3.18
 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.17 → eodash_catalog-0.3.18}/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.17"
+__version__ = "0.3.18"

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

@@ -458,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-0.3.17 → eodash_catalog-0.3.18}/src/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
@@ -312,6 +313,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",
@@ -321,15 +326,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"):