eodash_catalog 0.3.6__py3-none-any.whl → 0.3.8__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.3.6"
+__version__ = "0.3.8"

eodash_catalog/endpoints.py

@@ -1,3 +1,4 @@
+import copy
 import importlib
 import io
 import json
@@ -538,6 +539,7 @@ def handle_rasdaman_endpoint(
     # add_example_info(collection, collection_config, endpoint_config, catalog_config)
     return collection
 
+
 def handle_GeoDB_Features_endpoint(
     catalog_config: dict,
     endpoint_config: dict,
@@ -546,7 +548,6 @@ def handle_GeoDB_Features_endpoint(
     catalog: Catalog,
     options: Options,
 ) -> Collection:
-
     # ID of collection is data["Name"] instead of CollectionId to be able to
     # create more STAC collections from one geoDB table
     collection = get_or_create_collection(
@@ -581,13 +582,9 @@ def handle_GeoDB_Features_endpoint(
                     datetime(time_object.year, time_object.month, time_object.day).date()
                 )
             case "month":
-                unique_datetimes.add(
-                    datetime(time_object.year, time_object.month, 1).date()
-                )
+                unique_datetimes.add(datetime(time_object.year, time_object.month, 1).date())
             case "year":
-                unique_datetimes.add(
-                    datetime(time_object.year, 1, 1).date()
-                )
+                unique_datetimes.add(datetime(time_object.year, 1, 1).date())
             case _:
                 # default to day
                 unique_datetimes.add(
@@ -610,10 +607,11 @@ def handle_GeoDB_Features_endpoint(
         updated_query = endpoint_config["Query"].replace("{{date_time}}", matching_string)
         assets = {
             "geodbfeatures": Asset(
-            href=f"{endpoint_config['EndPoint']}{endpoint_config['Database']}_{endpoint_config['CollectionId']}?{updated_query}",
-            media_type="application/geodb+json",
-            roles=["data"],
-        )}
+                href=f"{endpoint_config['EndPoint']}{endpoint_config['Database']}_{endpoint_config['CollectionId']}?{updated_query}",
+                media_type="application/geodb+json",
+                roles=["data"],
+            )
+        }
         item = Item(
             id=format_datetime_to_isostring_zulu(item_datetime),
             bbox=endpoint_config.get("OverwriteBBox", [-180, -90, 180, 90]),
@@ -724,7 +722,33 @@ def handle_GeoDB_endpoint(
             input_data = []
         if len(input_data) > 0 or endpoint_config.get("FeatureCollection"):
             items = []
-            for v in values:
+            content_for_individual_datetimes = values
+            if endpoint_config.get("MapTimesCollection"):
+                # extract datetimes from another table if configured so and match it based on aoi_id
+                # special for E13d
+                select = f"?select=time&aoi_id=eq.{key}"
+                url = (
+                    endpoint_config["EndPoint"]
+                    + endpoint_config["Database"]
+                    + "_{}".format(endpoint_config["MapTimesCollection"])
+                    + select
+                )
+                response = json.loads(requests.get(url).text)
+                content_for_individual_datetimes = []
+                for response_obj in response:
+                    time_object = datetime.fromisoformat(response_obj["time"])
+                    for searched_row in values:
+                        search_datetime = datetime.fromisoformat(searched_row["time"])
+                        if (
+                            search_datetime.month == time_object.month
+                            and search_datetime.year == time_object.year
+                        ):
+                            break
+                    insert_row = copy.deepcopy(searched_row)
+                    # overwrite time with one from another collection and save
+                    insert_row["time"] = response_obj["time"]
+                    content_for_individual_datetimes.append(insert_row)
+            for v in content_for_individual_datetimes:
                 # add items based on inputData fields for each time step available in values
                 first_match: dict = next(
                     (item for item in input_data if item.get("Identifier") == v["input_data"]), None

eodash_catalog/stac_handling.py

@@ -307,18 +307,21 @@ def add_collection_information(
             ),
         )
     if collection_config.get("Image"):
+        # Check if absolute URL or relative path
+        if collection_config["Image"].startswith("http"):
+            image_url = collection_config["Image"]
+        else:
+            image_url = f'{catalog_config["assets_endpoint"]}/{collection_config["Image"]}'
         collection.add_asset(
             "thumbnail",
             Asset(
-                href=f'{catalog_config["assets_endpoint"]}/{collection_config["Image"]}',
+                href=image_url,
                 media_type="image/png",
                 roles=["thumbnail"],
             ),
         )
         # Bubble up thumbnail to extra fields
-        collection.extra_fields["thumbnail"] = (
-            f'{catalog_config["assets_endpoint"]}/' f'{collection_config["Image"]}'
-        )
+        collection.extra_fields["thumbnail"] = (image_url)
     # Add extra fields to collection if available
     add_extra_fields(collection, collection_config, is_root_collection)
 

{eodash_catalog-0.3.6.dist-info → eodash_catalog-0.3.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eodash_catalog
-Version: 0.3.6
+Version: 0.3.8
 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.6.dist-info → eodash_catalog-0.3.8.dist-info}/RECORD

@@ -1,14 +1,14 @@
-eodash_catalog/__about__.py,sha256=ZgTfCkB5CFXJOR6yus54qxEb1akzdZxdToBFRWatiOU,137
+eodash_catalog/__about__.py,sha256=uyon-G635Vi1osZVVTkD59AUqEeBubsU0833nzclrvA,137
 eodash_catalog/__init__.py,sha256=_W_9emPYf6FUqc0P8L2SmADx6hGSd7PlQV3yRmCk5uM,115
 eodash_catalog/duration.py,sha256=TBG7v1lCpbYowADK5uJ2M8kPxsvQneFAFi1NIE26dy4,10754
-eodash_catalog/endpoints.py,sha256=HOpFeNG962EcveIho8P0SUM303bxO1IPoLA6HfQAxeM,59817
+eodash_catalog/endpoints.py,sha256=lxSy9Ai9UNPt5y3qdFzkOUxhU9JnfGLs50CsTNAZjo8,61236
 eodash_catalog/generate_indicators.py,sha256=BoCOtBZYbJA_vRjkwyUYWuIJH91Ddo9RP7Jwzzf4xhU,22334
 eodash_catalog/sh_endpoint.py,sha256=XjZsZJ5jfJZLQenSTqUhiUZ5YAu9M9nv2KL1Qv3Be-I,1219
-eodash_catalog/stac_handling.py,sha256=xMhUK_gvijs6tL-1ecg28DtWBo4msd5NTYZpYtt7FHo,25877
+eodash_catalog/stac_handling.py,sha256=ZBk4AXtBNZ0Trr_oszhFGo8ypbGu3ox3KqfIVpc7ZuQ,25999
 eodash_catalog/thumbnails.py,sha256=oNbWdRC8KTLUC4PbSMlSaiOeLXfkIpa0j-sOZdn1RGU,2262
 eodash_catalog/utils.py,sha256=X40eQNRq8kh7ZATofX12V9EtUpMRdTTfkozBdqkKMJU,23746
-eodash_catalog-0.3.6.dist-info/METADATA,sha256=n-FeCxtwnpALjqGveWjKCCFf9_RRaxOjKHXzYhVa0Pw,3019
-eodash_catalog-0.3.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-eodash_catalog-0.3.6.dist-info/entry_points.txt,sha256=kuUQrDG1PtYd8kPjf5XM6H_NtQd9Ozwl0jjiGtAvZSM,87
-eodash_catalog-0.3.6.dist-info/licenses/LICENSE.txt,sha256=oJCW5zQxnFD-J0hGz6Zh5Lkpdk1oAndmWhseTmV224E,1107
-eodash_catalog-0.3.6.dist-info/RECORD,,
+eodash_catalog-0.3.8.dist-info/METADATA,sha256=uJ2tsCynZliVkLmaUj7TgQuyMccup-Dc4hdnSvYSHh0,3019
+eodash_catalog-0.3.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+eodash_catalog-0.3.8.dist-info/entry_points.txt,sha256=kuUQrDG1PtYd8kPjf5XM6H_NtQd9Ozwl0jjiGtAvZSM,87
+eodash_catalog-0.3.8.dist-info/licenses/LICENSE.txt,sha256=oJCW5zQxnFD-J0hGz6Zh5Lkpdk1oAndmWhseTmV224E,1107
+eodash_catalog-0.3.8.dist-info/RECORD,,