eodash_catalog 0.1.9__py3-none-any.whl → 0.1.11__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.1.9"
+__version__ = "0.1.11"

eodash_catalog/endpoints.py

@@ -17,6 +17,7 @@ from eodash_catalog.sh_endpoint import get_SH_token
 from eodash_catalog.stac_handling import (
     add_collection_information,
     add_example_info,
+    add_process_info_child_collection,
     add_projection_info,
     get_collection_datetimes_from_config,
     get_or_create_collection,
@@ -174,7 +175,7 @@ def handle_STAC_based_endpoint(
                 collection.description = location["Name"]
             # TODO: should we remove all assets from sub collections?
             link = root_collection.add_child(collection)
-            latlng = f'{location["Point"][1]},{location["Point"][0]}'
+            latlng = f'{location["Point"][1]},{location["Point"][0]}'.strip()
             # Add extra properties we need
             link.extra_fields["id"] = location["Identifier"]
             link.extra_fields["latlng"] = latlng
@@ -182,6 +183,7 @@ def handle_STAC_based_endpoint(
             add_example_info(collection, collection_config, endpoint_config, catalog_config)
             # eodash v4 compatibility
             add_visualization_info(collection, collection_config, endpoint_config)
+            add_process_info_child_collection(collection, catalog_config, collection_config)
             if "OverwriteBBox" in location:
                 collection.extent.spatial = SpatialExtent(
                     [
@@ -208,7 +210,7 @@ def handle_STAC_based_endpoint(
         )
     # eodash v4 compatibility
     add_visualization_info(root_collection, collection_config, endpoint_config)
-    add_collection_information(catalog_config, root_collection, collection_config)
+    add_collection_information(catalog_config, root_collection, collection_config, True)
     add_example_info(root_collection, collection_config, endpoint_config, catalog_config)
     return root_collection
 
@@ -406,7 +408,7 @@ def handle_SH_WMS_endpoint(
 
             link = root_collection.add_child(collection)
             # bubble up information we want to the link
-            latlng = "{},{}".format(location["Point"][1], location["Point"][0])
+            latlng = "{},{}".format(location["Point"][1], location["Point"][0]).strip()
             link.extra_fields["id"] = location["Identifier"]
             link.extra_fields["latlng"] = latlng
             link.extra_fields["country"] = location["Country"]
@@ -416,6 +418,7 @@ def handle_SH_WMS_endpoint(
             else:
                 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)
 
         root_collection.update_extent_from_items()
         # Add bbox extents from children
@@ -443,7 +446,7 @@ def handle_SH_WMS_endpoint(
             item_link = root_collection.add_item(item)
             item_link.extra_fields["datetime"] = format_datetime_to_isostring_zulu(dt)
     # eodash v4 compatibility
-    add_collection_information(catalog_config, root_collection, collection_config)
+    add_collection_information(catalog_config, root_collection, collection_config, True)
     add_visualization_info(root_collection, collection_config, endpoint_config)
     return root_collection
 

eodash_catalog/generate_indicators.py

@@ -178,7 +178,7 @@ def process_indicator_file(
     else:
         # we assume that collection files can also be loaded directly
         process_collection_file(catalog_config, file_path, parent_indicator, options)
-    add_collection_information(catalog_config, parent_indicator, indicator_config)
+    add_collection_information(catalog_config, parent_indicator, indicator_config, True)
     if iter_len_at_least(parent_indicator.get_items(recursive=True), 1):
         parent_indicator.update_extent_from_items()
     # Add bbox extents from children

eodash_catalog/stac_handling.py

@@ -213,7 +213,10 @@ def add_example_info(
 
 
 def add_collection_information(
-    catalog_config: dict, collection: Collection, collection_config: dict
+    catalog_config: dict,
+    collection: Collection,
+    collection_config: dict,
+    is_root_collection: bool = False,
 ) -> None:
     # Add metadata information
     # Check license identifier
@@ -322,7 +325,7 @@ def add_collection_information(
             f'{catalog_config["assets_endpoint"]}/' f'{collection_config["Image"]}'
         )
     # Add extra fields to collection if available
-    add_extra_fields(collection, collection_config)
+    add_extra_fields(collection, collection_config, is_root_collection)
 
     if "References" in collection_config:
         generic_counter = 1
@@ -346,7 +349,29 @@ def add_collection_information(
 
 
 def add_process_info(collection: Collection, catalog_config: dict, collection_config: dict) -> None:
-    if "Process" in collection_config:
+    if any(key in collection_config for key in ["Locations", "Subcollections"]):
+        # add the generic geodb-like selection process on the root collection instead of Processes
+        if "geodb_default_form" in catalog_config:
+            # adding default geodb-like map handling for Locations
+            collection.extra_fields["eodash:jsonform"] = get_full_url(
+                catalog_config["geodb_default_form"], catalog_config
+            )
+        # link a process definition for getting a collection with {{feature}} placeholder
+        sl = Link(
+            rel="service",
+            target="./" + collection.id + "/{{feature}}/collection.json",
+            media_type="application/json; profile=collection",
+            extra_fields={
+                "id": "locations",
+                "method": "GET",
+                "type": "application/json; profile=collection",
+                "endpoint": "STAC",
+            },
+        )
+        collection.add_link(sl)
+    # elif is intentional for cases when Process is defined on collection with Locations
+    # then we want to only add it to the "children", not the root
+    elif "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))
@@ -389,6 +414,24 @@ def add_process_info(collection: Collection, catalog_config: dict, collection_co
                 )
 
 
+def add_process_info_child_collection(
+    collection: Collection, catalog_config: dict, collection_config: dict
+) -> None:
+    # in case of locations, we add the process itself on a child collection
+    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
+            )
+
+
 def add_base_overlay_info(
     collection: Collection, catalog_config: dict, collection_config: dict
 ) -> None:
@@ -412,12 +455,16 @@ def add_base_overlay_info(
             collection.add_link(create_web_map_link(layer, role="overlay"))
 
 
-def add_extra_fields(stac_object: Collection | Link, collection_config: dict) -> None:
+def add_extra_fields(
+    stac_object: Collection | Link, collection_config: dict, is_root_collection: bool = False
+) -> None:
     if "yAxis" in collection_config:
         stac_object.extra_fields["yAxis"] = collection_config["yAxis"]
     if "Themes" in collection_config:
         stac_object.extra_fields["themes"] = collection_config["Themes"]
-    if "Locations" in collection_config or "Subcollections" in collection_config:
+    if (
+        "Locations" in collection_config or "Subcollections" in collection_config
+    ) and is_root_collection:
         stac_object.extra_fields["locations"] = True
     if "Tags" in collection_config:
         stac_object.extra_fields["tags"] = collection_config["Tags"]

{eodash_catalog-0.1.9.dist-info → eodash_catalog-0.1.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eodash_catalog
-Version: 0.1.9
+Version: 0.1.11
 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
@@ -18,26 +18,19 @@ Classifier: Programming Language :: Python :: Implementation :: PyPy
 Requires-Python: >=3.10
 Requires-Dist: click
 Requires-Dist: click<9
-Requires-Dist: lxml<5
-Requires-Dist: mergedeep
 Requires-Dist: oauthlib<3.3
 Requires-Dist: owslib
-Requires-Dist: pygeofilter[backend-native]==0.2.0
 Requires-Dist: pystac-client<1
 Requires-Dist: pystac[validation]<2
 Requires-Dist: python-dateutil<3
 Requires-Dist: python-dotenv<1.1.0
 Requires-Dist: pyyaml<7
-Requires-Dist: redis<4
 Requires-Dist: requests-oauthlib<1.3.2
 Requires-Dist: requests<3
 Requires-Dist: setuptools<71
 Requires-Dist: spdx-lookup<=0.3.3
 Requires-Dist: stac-geoparquet<=0.6.0
 Requires-Dist: structlog<22.0
-Requires-Dist: swiftspec==0.0.2
-Provides-Extra: dev
-Requires-Dist: pre-commit; extra == 'dev'
 Description-Content-Type: text/markdown
 
 # eodash_catalog

eodash_catalog-0.1.11.dist-info/RECORD

@@ -0,0 +1,14 @@
+eodash_catalog/__about__.py,sha256=fI90LQc8z5n_qt4eI-DktK-SnSVpSxYIplfSQfDKvJ0,138
+eodash_catalog/__init__.py,sha256=_W_9emPYf6FUqc0P8L2SmADx6hGSd7PlQV3yRmCk5uM,115
+eodash_catalog/duration.py,sha256=B6XOZfvNU7SuqpxuVtT1kNKODoOQJXDI6mocvA_U1ik,10816
+eodash_catalog/endpoints.py,sha256=fQ3kaDCcdPypxrZzvAtWYqSt5nVq8cbCDOfH6BlbIc8,41835
+eodash_catalog/generate_indicators.py,sha256=V2a6r3lS_BoZvwoywHFaT-gBu3INRp4E4zLZioD6ang,19493
+eodash_catalog/sh_endpoint.py,sha256=XjZsZJ5jfJZLQenSTqUhiUZ5YAu9M9nv2KL1Qv3Be-I,1219
+eodash_catalog/stac_handling.py,sha256=TuwJ6AOA-1aJglAFtWZmtimZO5_wvIkpU64XHcKI7rk,23254
+eodash_catalog/thumbnails.py,sha256=qZDcpQe80ki6lEMKYdZtSnnHH0PUpcoXTvU9bYdPlzU,2260
+eodash_catalog/utils.py,sha256=zZ4PT1h1lWCMvEIfg5Xlw4re86pwR40BX8jEDweiTJ0,16115
+eodash_catalog-0.1.11.dist-info/METADATA,sha256=DKZxs6I-9CB0ASzmK_ypC8cKyLDSzhUmpsZ3fIjpCgg,3020
+eodash_catalog-0.1.11.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+eodash_catalog-0.1.11.dist-info/entry_points.txt,sha256=kuUQrDG1PtYd8kPjf5XM6H_NtQd9Ozwl0jjiGtAvZSM,87
+eodash_catalog-0.1.11.dist-info/licenses/LICENSE.txt,sha256=oJCW5zQxnFD-J0hGz6Zh5Lkpdk1oAndmWhseTmV224E,1107
+eodash_catalog-0.1.11.dist-info/RECORD,,

eodash_catalog-0.1.9.dist-info/RECORD

@@ -1,14 +0,0 @@
-eodash_catalog/__about__.py,sha256=dai3IEzZp1p1kyDUiY5z5uR4Wscdqp-fRUkdtOJesKM,137
-eodash_catalog/__init__.py,sha256=_W_9emPYf6FUqc0P8L2SmADx6hGSd7PlQV3yRmCk5uM,115
-eodash_catalog/duration.py,sha256=B6XOZfvNU7SuqpxuVtT1kNKODoOQJXDI6mocvA_U1ik,10816
-eodash_catalog/endpoints.py,sha256=kVD7pKo26wyuBaI457Z1IsDGLPd0IKKiYBE8d8h4RR4,41582
-eodash_catalog/generate_indicators.py,sha256=K3Jj7bsS6fd8y82fmHPYQ1j_4N72RGpeAIx6ZHuQ1AY,19487
-eodash_catalog/sh_endpoint.py,sha256=XjZsZJ5jfJZLQenSTqUhiUZ5YAu9M9nv2KL1Qv3Be-I,1219
-eodash_catalog/stac_handling.py,sha256=VWivB_bn9Qwh8GrDSpicCXzItroIHz4-w5SZTkueWLg,21079
-eodash_catalog/thumbnails.py,sha256=qZDcpQe80ki6lEMKYdZtSnnHH0PUpcoXTvU9bYdPlzU,2260
-eodash_catalog/utils.py,sha256=zZ4PT1h1lWCMvEIfg5Xlw4re86pwR40BX8jEDweiTJ0,16115
-eodash_catalog-0.1.9.dist-info/METADATA,sha256=q0NXSet4rVJG38MPU-yG0icHDaCxXl-douED8LTGkyE,3233
-eodash_catalog-0.1.9.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-eodash_catalog-0.1.9.dist-info/entry_points.txt,sha256=kuUQrDG1PtYd8kPjf5XM6H_NtQd9Ozwl0jjiGtAvZSM,87
-eodash_catalog-0.1.9.dist-info/licenses/LICENSE.txt,sha256=oJCW5zQxnFD-J0hGz6Zh5Lkpdk1oAndmWhseTmV224E,1107
-eodash_catalog-0.1.9.dist-info/RECORD,,