eodash_catalog 0.1.13__tar.gz → 0.2.0__tar.gz

{eodash_catalog-0.1.13 → eodash_catalog-0.2.0}/.bumpversion.cfg

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

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

{eodash_catalog-0.1.13 → eodash_catalog-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eodash_catalog
-Version: 0.1.13
+Version: 0.2.0
 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.1.13 → eodash_catalog-0.2.0}/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.13"
+__version__ = "0.2.0"

{eodash_catalog-0.1.13 → eodash_catalog-0.2.0}/src/eodash_catalog/endpoints.py

@@ -9,7 +9,7 @@ from itertools import groupby
 from operator import itemgetter
 
 import requests
-from pystac import Asset, Catalog, Collection, Item, Link, SpatialExtent, Summaries
+from pystac import Asset, Catalog, Collection, Item, Link, SpatialExtent, Summaries, TemporalExtent
 from pystac_client import Client
 from shapely import wkt
 from shapely.geometry import mapping
@@ -31,6 +31,7 @@ from eodash_catalog.utils import (
     filter_time_entries,
     format_datetime_to_isostring_zulu,
     generate_veda_cog_link,
+    merge_bboxes,
     parse_datestring_to_tz_aware_datetime,
     replace_with_env_variables,
     retrieveExtentFromWCS,
@@ -499,6 +500,7 @@ def handle_GeoDB_endpoint(
     sorted_locations = sorted(response, key=itemgetter("aoi_id"))
     cities = []
     countries = []
+    input_data = endpoint_config.get("InputData")
     for key, value in groupby(sorted_locations, key=itemgetter("aoi_id")):
         # Finding min and max values for date
         values = list(value)
@@ -535,7 +537,6 @@ def handle_GeoDB_endpoint(
         locations_collection = get_or_create_collection(
             collection, key, sc_config, catalog_config, endpoint_config
         )
-        input_data = endpoint_config.get("InputData")
         if input_data:
             for v in values:
                 # add items based on inputData fields for each time step available in values
@@ -598,9 +599,16 @@ def handle_GeoDB_endpoint(
             # add_visualization_info(
             #     item, collection_config, endpoint_config, file_url=first_match.get("FileUrl")
             # )
+            locations_collection.update_extent_from_items()
+        else:
+            # set spatial extent from geodb
+            locations_collection.extent.spatial.bboxes = [bbox]
+            # set time extent from geodb
+            individual_datetimes = [datetime.fromisoformat(v["time"]) for v in values]
+            time_extent = [min(individual_datetimes), max(individual_datetimes)]
+            locations_collection.extent.temporal = TemporalExtent([time_extent])
         locations_collection.extra_fields["subcode"] = key
         link = collection.add_child(locations_collection)
-        locations_collection.update_extent_from_items()
         # collection.update_extent_from_items()
         # bubble up information we want to the link
         link.extra_fields["id"] = key
@@ -623,8 +631,32 @@ def handle_GeoDB_endpoint(
     add_collection_information(catalog_config, collection, collection_config)
     add_example_info(collection, collection_config, endpoint_config, catalog_config)
     collection.extra_fields["locations"] = True
-
-    collection.update_extent_from_items()
+    if not input_data:
+        # we have no items, extents of collection need to be updated manually
+        merged_bbox = merge_bboxes(
+            [
+                c_child.extent.spatial.bboxes[0]
+                for c_child in collection.get_children()
+                if isinstance(c_child, Collection)
+            ]
+        )
+        collection.extent.spatial.bboxes = [merged_bbox]
+        # Add bbox extents from children
+        for c_child in collection.get_children():
+            if isinstance(c_child, Collection) and merged_bbox != c_child.extent.spatial.bboxes[0]:
+                collection.extent.spatial.bboxes.append(c_child.extent.spatial.bboxes[0])
+        # set time extent of collection
+        individual_datetimes = []
+        for c_child in collection.get_children():
+            if isinstance(c_child, Collection) and isinstance(
+                c_child.extent.temporal.intervals[0], list
+            ):
+                individual_datetimes.extend(c_child.extent.temporal.intervals[0])  # type: ignore
+        time_extent = [min(individual_datetimes), max(individual_datetimes)]
+        collection.extent.temporal = TemporalExtent([time_extent])
+    else:
+        # we can update from items
+        collection.update_extent_from_items()
     collection.summaries = Summaries(
         {
             "cities": cities,

{eodash_catalog-0.1.13 → eodash_catalog-0.2.0}/src/eodash_catalog/generate_indicators.py

@@ -6,11 +6,12 @@ Indicator generator to harvest information from endpoints and generate catalog
 
 import os
 import time
+from datetime import datetime
 from typing import Any
 
 import click
 from dotenv import load_dotenv
-from pystac import Catalog, CatalogType, Collection, Link, Summaries
+from pystac import Catalog, CatalogType, Collection, Link, Summaries, TemporalExtent
 from pystac.layout import TemplateLayoutStrategy
 from pystac.validation import validate_all
 from structlog import get_logger
@@ -39,6 +40,7 @@ from eodash_catalog.utils import (
     Options,
     RaisingThread,
     add_single_item_if_collection_empty,
+    iter_len_at_least,
     merge_bboxes,
     read_config_file,
     recursive_save,
@@ -180,8 +182,9 @@ def process_indicator_file(
         # 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, True)
+    if iter_len_at_least(parent_indicator.get_items(recursive=True), 1):
+        parent_indicator.update_extent_from_items()
     # get shared extent of all of the collections
-    # we do not want to use update_extent_from_items() because
     # they might have OverwriteBBox and that would discard it for indicator
     merged_bbox = merge_bboxes(
         [
@@ -195,6 +198,17 @@ def process_indicator_file(
     for c_child in parent_indicator.get_children():
         if isinstance(c_child, Collection) and merged_bbox != c_child.extent.spatial.bboxes[0]:
             parent_indicator.extent.spatial.bboxes.append(c_child.extent.spatial.bboxes[0])
+    # aggregate all time extents from the child collections and make it a indicator extent
+    individual_datetimes: list[datetime] = []
+    for c_child in parent_indicator.get_children():
+        if isinstance(c_child, Collection) and isinstance(
+            c_child.extent.temporal.intervals[0], list
+        ):
+            individual_datetimes.extend(c_child.extent.temporal.intervals[0])  # type: ignore
+    # filter out None
+    individual_datetimes = list(filter(lambda x: x is not None, individual_datetimes))
+    time_extent = [min(individual_datetimes), max(individual_datetimes)]
+    parent_indicator.extent.temporal = TemporalExtent([time_extent])
     # extract collection information and add it to summary indicator level
     extract_indicator_info(parent_indicator)
     add_process_info(parent_indicator, catalog_config, indicator_config)
@@ -276,7 +290,7 @@ def process_collection_file(
                 else:
                     raise ValueError("Type of Resource is not supported")
                 if collection:
-                    add_single_item_if_collection_empty(collection)
+                    add_single_item_if_collection_empty(endpoint_config, collection)
                     add_projection_info(endpoint_config, collection)
                     add_to_catalog(collection, catalog, endpoint_config, collection_config, disable)
                 else:

{eodash_catalog-0.1.13 → eodash_catalog-0.2.0}/src/eodash_catalog/stac_handling.py

@@ -106,8 +106,8 @@ def create_service_link(endpoint_config: dict, catalog_config: dict) -> Link:
             extra_fields["eox:flatstyle"] = []
             for flatstyle_config in endpoint_config["Flatstyle"]:
                 flatstyle_obj = {
-                    "Identifier": flatstyle_config.get("Identifier"),
-                    "Url": get_full_url(flatstyle_config.get("Url"), catalog_config),
+                    "id": flatstyle_config.get("Identifier"),
+                    "url": get_full_url(flatstyle_config.get("Url"), catalog_config),
                 }
                 extra_fields["eox:flatstyle"].append(flatstyle_obj)
         else:
@@ -363,18 +363,17 @@ def add_process_info(collection: Collection, catalog_config: dict, collection_co
             },
         )
         collection.add_link(sl)
+        has_geodb = any(
+            item.get("Name") == "GeoDB" for item in collection_config.get("Resources", [])
+        )
         # adding additional service links
-        if collection_config["Name"] == "GeoDB" and collection_config.get("Process", {}).get(
-            "EndPoints"
-        ):
+        if has_geodb and collection_config.get("Process", {}).get("EndPoints"):
             for endpoint in collection_config["Process"]["EndPoints"]:
                 collection.add_link(create_service_link(endpoint, catalog_config))
 
         # for geodb collections now based on locations, we want to make sure
         # also manually defined processes are added to the collection
-        if collection_config["Name"] == "GeoDB" and collection_config.get("Process", {}).get(
-            "VegaDefinition"
-        ):
+        if has_geodb and collection_config.get("Process", {}).get("VegaDefinition"):
             collection.extra_fields["eodash:vegadefinition"] = get_full_url(
                 collection_config["Process"]["VegaDefinition"], catalog_config
             )

{eodash_catalog-0.1.13 → eodash_catalog-0.2.0}/src/eodash_catalog/utils.py

@@ -335,14 +335,14 @@ class Options:
     collections: list[str]
 
 
-def add_single_item_if_collection_empty(collection: Collection) -> None:
+def add_single_item_if_collection_empty(endpoint_config: dict, collection: Collection) -> None:
     for link in collection.links:
         if link.rel in [RelType.CHILD, RelType.ITEM]:
             break
     else:
         item = Item(
             id=str(uuid.uuid4()),
-            bbox=[-180, -85, 180, 85],
+            bbox=[-180.0, -90.0, 180.0, 90.0],
             properties={},
             geometry=None,
             datetime=datetime(1970, 1, 1, 0, 0, 0, tzinfo=pytztimezone("UTC")),
@@ -350,6 +350,8 @@ def add_single_item_if_collection_empty(collection: Collection) -> None:
             end_datetime=datetime.now(tz=pytztimezone("UTC")),
         )
         collection.add_item(item)
+        if not endpoint_config.get("OverwriteBBox"):
+            collection.update_extent_from_items()
 
 
 def replace_with_env_variables(s: str) -> str:

{eodash_catalog-0.1.13 → eodash_catalog-0.2.0}/tests/test_generate.py

@@ -105,7 +105,7 @@ def test_collection_no_wms_has_a_single_item(catalog_output_folder):
     with open(os.path.join(root_collection_path, "collection.json")) as fp:
         collection_json = json.load(fp)
         # test that custom bbox is set
-        assert [-180, -85, 180, 85] in collection_json["extent"]["spatial"]["bbox"]
+        assert [-180.0, -90.0, 180.0, 90.0] in collection_json["extent"]["spatial"]["bbox"]
         # test that time interval is 1970-today
         assert collection_json["extent"]["temporal"]["interval"][0][0] == start_date
         assert (