eodash_catalog 0.0.14__py3-none-any.whl → 0.0.16__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.0.14"
+__version__ = "0.0.16"

eodash_catalog/endpoints.py

@@ -106,29 +106,17 @@ def handle_STAC_based_endpoint(
             catalog, collection_config["Name"], collection_config, catalog_config, endpoint_config
         )
         for location in collection_config["Locations"]:
-            if "FilterDates" in location:
-                collection = process_STACAPI_Endpoint(
-                    catalog_config=catalog_config,
-                    endpoint_config=endpoint_config,
-                    collection_config=collection_config,
-                    catalog=catalog,
-                    options=options,
-                    headers=headers,
-                    bbox=",".join(map(str, location["Bbox"])),
-                    filter_dates=location["FilterDates"],
-                    root_collection=root_collection,
-                )
-            else:
-                collection = process_STACAPI_Endpoint(
-                    catalog_config=catalog_config,
-                    endpoint_config=endpoint_config,
-                    collection_config=collection_config,
-                    catalog=catalog,
-                    options=options,
-                    headers=headers,
-                    bbox=",".join(map(str, location["Bbox"])),
-                    root_collection=root_collection,
-                )
+            collection = process_STACAPI_Endpoint(
+                catalog_config=catalog_config,
+                endpoint_config=endpoint_config,
+                collection_config=collection_config,
+                catalog=catalog,
+                options=options,
+                headers=headers,
+                filter_dates=location.get("FilterDates"),
+                bbox=",".join(map(str, location["Bbox"])),
+                root_collection=root_collection,
+            )
             # Update identifier to use location as well as title
             # TODO: should we use the name as id? it provides much more
             # information in the clients
@@ -159,25 +147,18 @@ def handle_STAC_based_endpoint(
             if isinstance(c_child, Collection):
                 root_collection.extent.spatial.bboxes.append(c_child.extent.spatial.bboxes[0])
     else:
+        bbox = None
         if "Bbox" in endpoint_config:
-            root_collection = process_STACAPI_Endpoint(
-                catalog_config=catalog_config,
-                endpoint_config=endpoint_config,
-                collection_config=collection_config,
-                catalog=catalog,
-                options=options,
-                headers=headers,
-                bbox=",".join(map(str, endpoint_config["Bbox"])),
-            )
-        else:
-            root_collection = process_STACAPI_Endpoint(
-                catalog_config=catalog_config,
-                endpoint_config=endpoint_config,
-                collection_config=collection_config,
-                catalog=catalog,
-                options=options,
-                headers=headers,
-            )
+            bbox = ",".join(map(str, endpoint_config["Bbox"]))
+        root_collection = process_STACAPI_Endpoint(
+            catalog_config=catalog_config,
+            endpoint_config=endpoint_config,
+            collection_config=collection_config,
+            catalog=catalog,
+            options=options,
+            headers=headers,
+            bbox=bbox,
+        )
 
     add_example_info(root_collection, collection_config, endpoint_config, catalog_config)
     return root_collection
@@ -199,6 +180,12 @@ def process_STACAPI_Endpoint(
     collection = get_or_create_collection(
         catalog, endpoint_config["CollectionId"], collection_config, catalog_config, endpoint_config
     )
+    datetime_query = ["1900-01-01T00:00:00Z", "3000-01-01T00:00:00Z"]
+    if query := endpoint_config.get("Query"):
+        if start := query.get("Start"):
+            datetime_query[0] = start
+        if end := query.get("End"):
+            datetime_query[1] = end
 
     api = Client.open(endpoint_config["EndPoint"], headers=headers)
     if bbox is None:
@@ -206,7 +193,7 @@ def process_STACAPI_Endpoint(
     results = api.search(
         collections=[endpoint_config["CollectionId"]],
         bbox=bbox,
-        datetime=["1900-01-01T00:00:00Z", "3000-01-01T00:00:00Z"],
+        datetime=datetime_query,  # type: ignore
     )
     # We keep track of potential duplicate times in this list
     added_times = {}
@@ -564,7 +551,7 @@ def generate_veda_tiles_link(endpoint_config: dict, item: str | None) -> str:
     if "NoData" in endpoint_config:
         no_data = "&no_data={}".format(endpoint_config["NoData"])
     item = f"&item={item}" if item else ""
-    target_url = f"https://openveda.cloud/stac/tiles/WebMercatorQuad/{{z}}/{{x}}/{{y}}?{collection}{item}{assets}{color_formula}{no_data}"
+    target_url = f"https://openveda.cloud/api/raster/stac/tiles/WebMercatorQuad/{{z}}/{{x}}/{{y}}?{collection}{item}{assets}{color_formula}{no_data}"
     return target_url
 
 
@@ -813,18 +800,18 @@ def handle_raw_source(
                 endpoint_config,
                 item,
             )
-            ep_st = endpoint_config["Style"]
-            style_link = Link(
-                rel="style",
-                target=ep_st
-                if ep_st.startswith("http")
-                else f"{catalog_config['assets_endpoint']}/{ep_st}",
-                media_type=style_type,
-                extra_fields={
-                    "asset:keys": list(assets),
-                },
-            )
-            item.add_link(style_link)
+            if ep_st := endpoint_config.get("Style"):
+                style_link = Link(
+                    rel="style",
+                    target=ep_st
+                    if ep_st.startswith("http")
+                    else f"{catalog_config['assets_endpoint']}/{ep_st}",
+                    media_type=style_type,
+                    extra_fields={
+                        "asset:keys": list(assets),
+                    },
+                )
+                item.add_link(style_link)
             link = collection.add_item(item)
             link.extra_fields["datetime"] = time_entry["Time"]
             link.extra_fields["assets"] = [a["File"] for a in time_entry["Assets"]]

eodash_catalog/utils.py

@@ -221,7 +221,7 @@ def generate_veda_cog_link(endpoint_config: dict, file_url: str | None) -> str:
 
     file_url = f"url={file_url}&" if file_url else ""
 
-    target_url = f"https://openveda.cloud/cog/tiles/WebMercatorQuad/{{z}}/{{x}}/{{y}}?{file_url}resampling_method=nearest{bidx}{colormap}{colormap_name}{rescale}"
+    target_url = f"https://openveda.cloud/api/raster/cog/tiles/WebMercatorQuad/{{z}}/{{x}}/{{y}}?{file_url}resampling_method=nearest{bidx}{colormap}{colormap_name}{rescale}"
     return target_url
 
 

{eodash_catalog-0.0.14.dist-info → eodash_catalog-0.0.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: eodash_catalog
-Version: 0.0.14
+Version: 0.0.16
 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
@@ -31,7 +31,7 @@ Requires-Dist: pyyaml<7
 Requires-Dist: redis<4
 Requires-Dist: requests-oauthlib<1.3.2
 Requires-Dist: requests<3
-Requires-Dist: setuptools<68
+Requires-Dist: setuptools<71
 Requires-Dist: spdx-lookup<=0.3.3
 Requires-Dist: structlog<22.0
 Requires-Dist: swiftspec==0.0.2

{eodash_catalog-0.0.14.dist-info → eodash_catalog-0.0.16.dist-info}/RECORD

@@ -1,14 +1,14 @@
-eodash_catalog/__about__.py,sha256=w0H7WN2arq5UEWqr5ssYyzDn4_yv6Mow9z2xHCP--Ng,138
+eodash_catalog/__about__.py,sha256=DufokORcq7HQve6GPFansFU8LMELcmOjGhPms7LOjFM,138
 eodash_catalog/__init__.py,sha256=_W_9emPYf6FUqc0P8L2SmADx6hGSd7PlQV3yRmCk5uM,115
 eodash_catalog/duration.py,sha256=B6XOZfvNU7SuqpxuVtT1kNKODoOQJXDI6mocvA_U1ik,10816
-eodash_catalog/endpoints.py,sha256=8D1mLSDwivK6_Ub3hHAtiVMtmtHatd1Ffxhw8rm_BqU,33307
+eodash_catalog/endpoints.py,sha256=0cCwNbQ1YqH8zKxdPY2LvXZWXqmqrAuW6ae_mUK4nTE,32734
 eodash_catalog/generate_indicators.py,sha256=DlbgMuNVPGdg8roYO7raXIeTmsMRpsyN71DYnRATATI,18790
 eodash_catalog/sh_endpoint.py,sha256=vELooJwk269v1DNnOzb32vil96vL_SRCio8UBlx10N0,618
 eodash_catalog/stac_handling.py,sha256=BKFFhM2JhrBnEd6EbEESAIUcFncDaAb5N4aHx0uZBv4,18197
 eodash_catalog/thumbnails.py,sha256=31Wk38oNQDxfhSUbMLBpHuZFhsR8v_7luYr65XQtDf0,2213
-eodash_catalog/utils.py,sha256=FZIn3iwMNjdaGAlbaIHPffYkAhlIHpNU2vkMJmEcYRQ,8427
-eodash_catalog-0.0.14.dist-info/METADATA,sha256=9uitoo4TTQi-DzVXTZpD3k81DCXQWKcVm9wbn6iI-eQ,3203
-eodash_catalog-0.0.14.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-eodash_catalog-0.0.14.dist-info/entry_points.txt,sha256=kuUQrDG1PtYd8kPjf5XM6H_NtQd9Ozwl0jjiGtAvZSM,87
-eodash_catalog-0.0.14.dist-info/licenses/LICENSE.txt,sha256=oJCW5zQxnFD-J0hGz6Zh5Lkpdk1oAndmWhseTmV224E,1107
-eodash_catalog-0.0.14.dist-info/RECORD,,
+eodash_catalog/utils.py,sha256=4qcCADoIs6woJoqd553j_qT5mLb7_wl6NAUN_BoJ3jE,8438
+eodash_catalog-0.0.16.dist-info/METADATA,sha256=PqIbwvI4nxwpPpXICYWWYhwti33D9NKu77nu0gjXXQU,3203
+eodash_catalog-0.0.16.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+eodash_catalog-0.0.16.dist-info/entry_points.txt,sha256=kuUQrDG1PtYd8kPjf5XM6H_NtQd9Ozwl0jjiGtAvZSM,87
+eodash_catalog-0.0.16.dist-info/licenses/LICENSE.txt,sha256=oJCW5zQxnFD-J0hGz6Zh5Lkpdk1oAndmWhseTmV224E,1107
+eodash_catalog-0.0.16.dist-info/RECORD,,