eodash_catalog 0.0.32__tar.gz → 0.0.34__tar.gz

{eodash_catalog-0.0.32 → eodash_catalog-0.0.34}/.bumpversion.cfg

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

{eodash_catalog-0.0.32 → eodash_catalog-0.0.34}/.github/workflows/ci.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.10", "3.12"]
+        python-version: ["3.10", "3.11", "3.12"]
 
     steps:
       - uses: actions/checkout@v4

{eodash_catalog-0.0.32 → eodash_catalog-0.0.34}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: eodash_catalog
-Version: 0.0.32
+Version: 0.0.34
 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
@@ -23,8 +23,8 @@ Requires-Dist: mergedeep
 Requires-Dist: oauthlib<3.3
 Requires-Dist: owslib
 Requires-Dist: pygeofilter[backend-native]==0.2.0
-Requires-Dist: pystac-client<0.6
-Requires-Dist: pystac[validation]<=1.8.3
+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

{eodash_catalog-0.0.32 → eodash_catalog-0.0.34}/pyproject.toml

@@ -26,7 +26,7 @@ dependencies = [
   "oauthlib<3.3",
   "requests-oauthlib<1.3.2",
   "python-dotenv<1.1.0",
-  "pystac-client<0.6",
+  "pystac-client<1",
   "pyyaml<7",
   "redis<4",
   "pygeofilter[backend-native]==0.2.0",
@@ -39,7 +39,7 @@ dependencies = [
   "structlog<22.0",
   "OWSLib",
   "spdx-lookup<=0.3.3",
-  "pystac[validation]<=1.8.3",
+  "pystac[validation]<2",
 ]
 [project.scripts]
 eodash_catalog = "eodash_catalog.generate_indicators:process_catalogs"

{eodash_catalog-0.0.32 → eodash_catalog-0.0.34}/requirements.txt

@@ -3,7 +3,7 @@ setuptools<71
 oauthlib<3.3
 requests-oauthlib<1.3.2
 python-dotenv<1.1.0
-pystac-client<0.6
+pystac-client==0.8.3
 pyyaml<7
 redis<4
 pygeofilter[backend-native]==0.2.0
@@ -14,9 +14,9 @@ python-dateutil<3
 swiftspec==0.0.2
 mergedeep
 structlog<22.0
-OWSLib<1.0
+OWSLib==0.31
 spdx-lookup<=0.3.3
-pystac[validation]<=1.8.3
+pystac[validation]==1.10.1
 
 # dev tooling
 pytest==8.1.1

{eodash_catalog-0.0.32 → eodash_catalog-0.0.34}/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.0.32"
+__version__ = "0.0.34"

{eodash_catalog-0.0.32 → eodash_catalog-0.0.34}/src/eodash_catalog/endpoints.py

@@ -93,7 +93,10 @@ def process_STAC_Datacube_Endpoint(
     unit = variables.get(endpoint_config.get("Variable")).get("unit")
     if unit and "yAxis" not in collection_config:
         collection_config["yAxis"] = unit
-    collection.update_extent_from_items()
+    if datetimes:
+        collection.update_extent_from_items()
+    else:
+        LOGGER.warn(f"NO datetimes returned for collection: {collection_id}!")
 
     add_collection_information(catalog_config, collection, collection_config)
 
@@ -188,8 +191,9 @@ def process_STACAPI_Endpoint(
 ) -> Collection:
     if headers is None:
         headers = {}
+    collection_id = endpoint_config["CollectionId"]
     collection = get_or_create_collection(
-        catalog, endpoint_config["CollectionId"], collection_config, catalog_config, endpoint_config
+        catalog, collection_id, collection_config, catalog_config, endpoint_config
     )
     datetime_query = ["1900-01-01T00:00:00Z", "3000-01-01T00:00:00Z"]
     if query := endpoint_config.get("Query"):
@@ -202,13 +206,15 @@ def process_STACAPI_Endpoint(
     if bbox is None:
         bbox = [-180, -90, 180, 90]
     results = api.search(
-        collections=[endpoint_config["CollectionId"]],
+        collections=[collection_id],
         bbox=bbox,
         datetime=datetime_query,  # type: ignore
     )
     # We keep track of potential duplicate times in this list
     added_times = {}
+    any_item_added = False
     for item in results.items():
+        any_item_added = True
         item_datetime = item.get_datetime()
         if item_datetime is not None:
             iso_date = item_datetime.isoformat()[:10]
@@ -268,8 +274,13 @@ def process_STACAPI_Endpoint(
             endpoint_config,
             item,
         )
-    collection.update_extent_from_items()
-
+    if any_item_added:
+        collection.update_extent_from_items()
+    else:
+        LOGGER.warn(
+            f"""NO items returned for
+            bbox: {bbox}, datetime: {datetime_query}, collection: {collection_id}!"""
+        )
     # replace SH identifier with catalog identifier
     collection.id = collection_config["Name"]
     add_collection_information(catalog_config, collection, collection_config)
@@ -365,7 +376,10 @@ def handle_SH_WMS_endpoint(
             link.extra_fields["latlng"] = latlng
             link.extra_fields["country"] = location["Country"]
             link.extra_fields["city"] = location["Name"]
-            collection.update_extent_from_items()
+            if location["Times"]:
+                collection.update_extent_from_items()
+            else:
+                LOGGER.warn(f"NO datetimes configured for collection: {collection_config['Name']}!")
             add_visualization_info(collection, collection_config, endpoint_config)
 
         root_collection.update_extent_from_items()
@@ -571,6 +585,8 @@ def handle_WMS_endpoint(
             link = collection.add_item(item)
             link.extra_fields["datetime"] = format_datetime_to_isostring_zulu(dt)
         collection.update_extent_from_items()
+    else:
+        LOGGER.warn(f"NO datetimes returned for collection: {collection_config['Name']}!")
 
     # Check if we should overwrite bbox
     if "OverwriteBBox" in endpoint_config:
@@ -913,6 +929,9 @@ def handle_raw_source(
         # eodash v4 compatibility, adding last referenced style to collection
         if style_link:
             collection.add_link(style_link)
+        collection.update_extent_from_items()
+    else:
+        LOGGER.warn(f"NO datetimes configured for collection: {collection_config['Name']}!")
+
     add_collection_information(catalog_config, collection, collection_config)
-    collection.update_extent_from_items()
     return collection