eodash_catalog 0.1.2__tar.gz → 0.1.4__tar.gz

{eodash_catalog-0.1.2 → eodash_catalog-0.1.4}/.bumpversion.cfg

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

{eodash_catalog-0.1.2 → eodash_catalog-0.1.4}/PKG-INFO

@@ -1,11 +1,13 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: eodash_catalog
-Version: 0.1.2
+Version: 0.1.4
 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
 Project-URL: Source, https://github.com/eodash/eodash_catalog
 Author-email: Daniel Santillan <daniel.santillan@eox.at>
+License-Expression: MIT
+License-File: LICENSE.txt
 Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.10

{eodash_catalog-0.1.2 → eodash_catalog-0.1.4}/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.1.2"
+__version__ = "0.1.4"

{eodash_catalog-0.1.2 → eodash_catalog-0.1.4}/src/eodash_catalog/generate_indicators.py

@@ -33,6 +33,7 @@ from eodash_catalog.stac_handling import (
     add_base_overlay_info,
     add_collection_information,
     add_extra_fields,
+    add_process_info,
     add_projection_info,
     get_or_create_collection,
 )
@@ -133,6 +134,7 @@ def extract_indicator_info(parent_collection: Collection):
         "sensor",
         "cities",
         "countries",
+        "thumbnail",
     ]
     summaries: dict[str, Any] = {}
     for key in to_extract:
@@ -190,6 +192,7 @@ def process_indicator_file(
                 parent_indicator.extent.spatial.bboxes.append(c_child.extent.spatial.bboxes[0])
         # extract collection information and add it to summary indicator level
         extract_indicator_info(parent_indicator)
+        add_process_info(parent_indicator, catalog_config, indicator_config)
         # add baselayer and overview information to indicator collection
         add_base_overlay_info(parent_indicator, catalog_config, indicator_config)
         add_to_catalog(parent_indicator, catalog, {}, indicator_config)
@@ -338,6 +341,7 @@ def process_collection_file(
                     parent_collection.add_links(links)
 
             add_collection_information(catalog_config, parent_collection, collection_config)
+            add_process_info(catalog_config, parent_collection, collection_config)
             parent_collection.update_extent_from_items()
             # Add bbox extents from children
             for c_child in parent_collection.get_children():

{eodash_catalog-0.1.2 → eodash_catalog-0.1.4}/src/eodash_catalog/stac_handling.py

@@ -19,6 +19,7 @@ from yaml.loader import SafeLoader
 
 from eodash_catalog.utils import (
     generateDatetimesFromInterval,
+    get_full_url,
     parse_datestring_to_tz_aware_datetime,
 )
 
@@ -85,6 +86,26 @@ def get_or_create_collection(
     return collection
 
 
+def create_service_link(endpoint_config: dict, catalog_config: dict) -> Link:
+    extra_fields = {
+        "id": endpoint_config["Identifier"],
+        "method": endpoint_config.get("Method", "GET"),
+    }
+    if "EndPoint" in endpoint_config:
+        extra_fields["endpoint"] = endpoint_config["EndPoint"]
+    if "Body" in endpoint_config:
+        extra_fields["body"] = get_full_url(endpoint_config["Body"], catalog_config)
+    if "Flatstyle" in endpoint_config:
+        extra_fields["eox:flatstyle"] = get_full_url(endpoint_config["Flatstyle"], catalog_config)
+    sl = Link(
+        rel="service",
+        target=endpoint_config["Url"],
+        media_type=endpoint_config["Type"],
+        extra_fields=extra_fields,
+    )
+    return sl
+
+
 def create_web_map_link(layer_config: dict, role: str) -> Link:
     extra_fields = {
         "roles": [role],
@@ -297,6 +318,10 @@ def add_collection_information(
                 roles=["thumbnail"],
             ),
         )
+        # Bubble up thumbnail to extra fields
+        collection.extra_fields["thumbnail"] = (
+            f'{catalog_config["assets_endpoint"]}/' f'{collection_config["Image"]}'
+        )
     # Add extra fields to collection if available
     add_extra_fields(collection, collection_config)
 
@@ -321,6 +346,47 @@ def add_collection_information(
         collection.extra_fields["eox:colorlegend"] = collection_config["Colorlegend"]
 
 
+def add_process_info(collection: Collection, catalog_config: dict, collection_config: dict) -> None:
+    if "Process" in collection_config:
+        if "EndPoints" in collection_config["Process"]:
+            for endpoint in collection_config["Process"]["EndPoints"]:
+                collection.add_link(create_service_link(endpoint, catalog_config))
+        if "JsonForm" in collection_config["Process"]:
+            collection.extra_fields["eodash:jsonform"] = get_full_url(
+                collection_config["Process"]["JsonForm"], catalog_config
+            )
+        if "VegaDefinition" in collection_config["Process"]:
+            collection.extra_fields["eodash:vegadefinition"] = get_full_url(
+                collection_config["Process"]["VegaDefinition"], catalog_config
+            )
+    elif "Resources" in collection_config:
+        # see if geodb resource configured use defaults if available
+        for resource in collection_config["Resources"]:
+            if resource["Name"] == "GeoDB":
+                if "geodb_default_form" in catalog_config:
+                    collection.extra_fields["eodash:jsonform"] = get_full_url(
+                        catalog_config["geodb_default_form"], catalog_config
+                    )
+                if "geodb_default_vega" in catalog_config:
+                    collection.extra_fields["eodash:vegadefinition"] = get_full_url(
+                        catalog_config["geodb_default_vega"], catalog_config
+                    )
+                query_string = "?aoi_id=eq.{{feature}}&select=site_name,city,color_code,time,aoi,measurement_value,indicator_value,reference_time,eo_sensor,reference_value,input_data"  # noqa: E501
+                collection.add_link(
+                    Link(
+                        rel="service",
+                        target="{}{}{}".format(
+                            resource["EndPoint"], resource["Database"], query_string
+                        ),
+                        media_type="application/json",
+                        extra_fields={
+                            "method": "GET",
+                            "id": resource["CollectionId"],
+                        },
+                    )
+                )
+
+
 def add_base_overlay_info(
     collection: Collection, catalog_config: dict, collection_config: dict
 ) -> None:

{eodash_catalog-0.1.2 → eodash_catalog-0.1.4}/src/eodash_catalog/utils.py

@@ -385,3 +385,10 @@ def format_datetime_to_isostring_zulu(datetime_obj: datetime) -> str:
     # we rather convert it to Zulu based string in order for various clients
     # to understand it better (WMS)
     return (datetime_obj.replace(microsecond=0).isoformat()).replace("+00:00", "Z")
+
+
+def get_full_url(url: str, catalog_config) -> str:
+    if url.startswith("http"):
+        return url
+    else:
+        return f'{catalog_config["assets_endpoint"]}{url}'