eodash_catalog 0.0.9__tar.gz → 0.0.11__tar.gz

{eodash_catalog-0.0.9 → eodash_catalog-0.0.11}/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.0.9
+current_version = 0.0.11
 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.9 → eodash_catalog-0.0.11}/.github/workflows/python-publish.yml

@@ -9,7 +9,9 @@ on:
       - '*'
 jobs:
   deploy:
+
     runs-on: ubuntu-latest
+
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python

{eodash_catalog-0.0.9 → eodash_catalog-0.0.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: eodash_catalog
-Version: 0.0.9
+Version: 0.0.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

{eodash_catalog-0.0.9 → eodash_catalog-0.0.11}/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.9"
+__version__ = "0.0.11"

{eodash_catalog-0.0.9 → eodash_catalog-0.0.11}/src/eodash_catalog/endpoints.py

@@ -1,17 +1,13 @@
 import json
 import os
+import uuid
 from datetime import datetime, timedelta
 from itertools import groupby
 from operator import itemgetter
 
 import requests
 from dateutil import parser
-from pystac import (
-    Item,
-    Link,
-    SpatialExtent,
-    Summaries,
-)
+from pystac import Catalog, Collection, Item, Link, SpatialExtent, Summaries
 from pystac_client import Client
 
 from eodash_catalog.sh_endpoint import get_SH_token
@@ -22,13 +18,16 @@ from eodash_catalog.stac_handling import (
 )
 from eodash_catalog.thumbnails import generate_thumbnail
 from eodash_catalog.utils import (
+    Options,
     create_geojson_point,
     generate_veda_cog_link,
     retrieveExtentFromWMSWMTS,
 )
 
 
-def process_STAC_Datacube_Endpoint(config, endpoint, data, catalog):
+def process_STAC_Datacube_Endpoint(
+    config: dict, endpoint: dict, data: dict, catalog: Catalog
+) -> Collection:
     collection, _ = get_or_create_collection_and_times(
         catalog, data["Name"], data, config, endpoint
     )
@@ -39,11 +38,17 @@ def process_STAC_Datacube_Endpoint(config, endpoint, data, catalog):
         stac_endpoint_url = stac_endpoint_url + endpoint.get("StacEndpoint", "")
     # assuming /search not implemented
     api = Client.open(stac_endpoint_url)
-    coll = api.get_collection(endpoint.get("CollectionId", "datacubes"))
-    item = coll.get_item(endpoint.get("DatacubeId"))
+    collection_id = endpoint.get("CollectionId", "datacubes")
+    coll = api.get_collection(collection_id)
+    if not coll:
+        raise ValueError(f"Collection {collection_id} not found in endpoint {endpoint}")
+    item_id = endpoint.get("DatacubeId", "")
+    item = coll.get_item(item_id)
+    if not item:
+        raise ValueError(f"Item  {item_id} not found in collection {coll}")
     # slice a datacube along temporal axis to individual items, selectively adding properties
     dimensions = item.properties.get("cube:dimensions", {})
-    variables = item.properties.get("cube:variables")
+    variables = item.properties.get("cube:variables", {})
     if endpoint.get("Variable") not in variables:
         raise Exception(f'Variable {endpoint.get("Variable")} not found in datacube {variables}')
     time_dimension = "time"
@@ -80,7 +85,9 @@ def process_STAC_Datacube_Endpoint(config, endpoint, data, catalog):
     return collection
 
 
-def handle_STAC_based_endpoint(config, endpoint, data, catalog, options, headers=None):
+def handle_STAC_based_endpoint(
+    config: dict, endpoint: dict, data: dict, catalog: Catalog, options: Options, headers=None
+) -> Collection:
     if "Locations" in data:
         root_collection, _ = get_or_create_collection_and_times(
             catalog, data["Name"], data, config, endpoint
@@ -112,8 +119,8 @@ def handle_STAC_based_endpoint(config, endpoint, data, catalog, options, headers
             # 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
-            collection.id = location["Identifier"]
-            collection.title = (location["Name"],)
+            collection.id = location.get("Identifier", uuid.uuid4())
+            collection.title = location.get("Name")
             # See if description should be overwritten
             if "Description" in location:
                 collection.description = location["Description"]
@@ -136,7 +143,8 @@ def handle_STAC_based_endpoint(config, endpoint, data, catalog, options, headers
         root_collection.update_extent_from_items()
         # Add bbox extents from children
         for c_child in root_collection.get_children():
-            root_collection.extent.spatial.bboxes.append(c_child.extent.spatial.bboxes[0])
+            if isinstance(c_child, Collection):
+                root_collection.extent.spatial.bboxes.append(c_child.extent.spatial.bboxes[0])
     else:
         if "Bbox" in endpoint:
             root_collection = process_STACAPI_Endpoint(
@@ -163,26 +171,25 @@ def handle_STAC_based_endpoint(config, endpoint, data, catalog, options, headers
 
 
 def process_STACAPI_Endpoint(
-    config,
-    endpoint,
-    data,
-    catalog,
-    options,
-    headers=None,
+    config: dict,
+    endpoint: dict,
+    data: dict,
+    catalog: Catalog,
+    options: Options,
+    headers: dict[str, str] | None = None,
     bbox=None,
-    root_collection=None,
-    filter_dates=None,
-):
+    root_collection: Collection | None = None,
+    filter_dates: list[str] | None = None,
+) -> Collection:
     if headers is None:
         headers = {}
     collection, _ = get_or_create_collection_and_times(
         catalog, endpoint["CollectionId"], data, config, endpoint
     )
-    # add_visualization_info(collection, data, endpoint)
 
     api = Client.open(endpoint["EndPoint"], headers=headers)
     if bbox is None:
-        bbox = "-180,-90,180,90"
+        bbox = [-180, -90, 180, 90]
     results = api.search(
         collections=[endpoint["CollectionId"]],
         bbox=bbox,
@@ -226,7 +233,7 @@ def process_STACAPI_Endpoint(
                 ),
             )
         # If a root collection exists we point back to it from the item
-        if root_collection is not None:
+        if root_collection:
             item.set_collection(root_collection)
 
         # bubble up information we want to the link
@@ -259,12 +266,16 @@ def process_STACAPI_Endpoint(
     return collection
 
 
-def handle_VEDA_endpoint(config, endpoint, data, catalog, options):
+def handle_VEDA_endpoint(
+    config: dict, endpoint: dict, data: dict, catalog: Catalog, options: Options
+) -> Collection:
     collection = handle_STAC_based_endpoint(config, endpoint, data, catalog, options)
     return collection
 
 
-def handle_collection_only(config, endpoint, data, catalog):
+def handle_collection_only(
+    config: dict, endpoint: dict, data: dict, catalog: Catalog
+) -> Collection:
     collection, times = get_or_create_collection_and_times(
         catalog, data["Name"], data, config, endpoint
     )
@@ -283,7 +294,9 @@ def handle_collection_only(config, endpoint, data, catalog):
     return collection
 
 
-def handle_SH_WMS_endpoint(config, endpoint, data, catalog):
+def handle_SH_WMS_endpoint(
+    config: dict, endpoint: dict, data: dict, catalog: Catalog
+) -> Collection:
     # create collection and subcollections (based on locations)
     if "Locations" in data:
         root_collection, _ = get_or_create_collection_and_times(
@@ -328,23 +341,24 @@ def handle_SH_WMS_endpoint(config, endpoint, data, catalog):
         root_collection.update_extent_from_items()
         # Add bbox extents from children
         for c_child in root_collection.get_children():
-            root_collection.extent.spatial.bboxes.append(c_child.extent.spatial.bboxes[0])
+            if isinstance(c_child, Collection):
+                root_collection.extent.spatial.bboxes.append(c_child.extent.spatial.bboxes[0])
     return root_collection
 
 
-def handle_xcube_endpoint(config, endpoint, data: dict, catalog):
-    root_collection = process_STAC_Datacube_Endpoint(
+def handle_xcube_endpoint(config: dict, endpoint: dict, data: dict, catalog: Catalog) -> Collection:
+    collection = process_STAC_Datacube_Endpoint(
         config=config,
         endpoint=endpoint,
         data=data,
         catalog=catalog,
     )
 
-    add_example_info(root_collection, data, endpoint, config)
-    return root_collection
+    add_example_info(collection, data, endpoint, config)
+    return collection
 
 
-def handle_GeoDB_endpoint(config, endpoint, data: dict, catalog):
+def handle_GeoDB_endpoint(config: dict, endpoint: dict, data: dict, catalog: Catalog) -> Collection:
     collection, _ = get_or_create_collection_and_times(
         catalog, endpoint["CollectionId"], data, config, endpoint
     )
@@ -433,7 +447,9 @@ def handle_GeoDB_endpoint(config, endpoint, data: dict, catalog):
     return collection
 
 
-def handle_SH_endpoint(config, endpoint, data, catalog, options):
+def handle_SH_endpoint(
+    config: dict, endpoint: dict, data: dict, catalog: Catalog, options: Options
+) -> Collection:
     token = get_SH_token()
     headers = {"Authorization": f"Bearer {token}"}
     endpoint["EndPoint"] = "https://services.sentinel-hub.com/api/v1/catalog/1.0.0/"
@@ -444,7 +460,9 @@ def handle_SH_endpoint(config, endpoint, data, catalog, options):
     return collection
 
 
-def handle_WMS_endpoint(config, endpoint, data, catalog, wmts=False):
+def handle_WMS_endpoint(
+    config: dict, endpoint: dict, data: dict, catalog: Catalog, wmts: bool = False
+) -> Collection:
     collection, times = get_or_create_collection_and_times(
         catalog, data["Name"], data, config, endpoint
     )
@@ -488,11 +506,7 @@ def handle_WMS_endpoint(config, endpoint, data, catalog, wmts=False):
     return collection
 
 
-def handle_GeoDB_Tiles_endpoint(config, endpoint, data, catalog):
-    raise NotImplementedError
-
-
-def generate_veda_tiles_link(endpoint, item):
+def generate_veda_tiles_link(endpoint: dict, item: str | None) -> str:
     collection = "collection={}".format(endpoint["CollectionId"])
     assets = ""
     for asset in endpoint["Assets"]:
@@ -508,13 +522,19 @@ def generate_veda_tiles_link(endpoint, item):
     return target_url
 
 
-def add_visualization_info(stac_object, data, endpoint, file_url=None, time=None):
+def add_visualization_info(
+    stac_object: Collection | Item,
+    data: dict,
+    endpoint: dict,
+    file_url: str | None = None,
+    time: str | None = None,
+) -> None:
     # add extension reference
     if endpoint["Name"] == "Sentinel Hub" or endpoint["Name"] == "Sentinel Hub WMS":
         instanceId = os.getenv("SH_INSTANCE_ID")
         if "InstanceId" in endpoint:
             instanceId = endpoint["InstanceId"]
-        extra_fields = {
+        extra_fields: dict[str, list[str] | dict[str, str]] = {
             "wms:layers": [endpoint["LayerId"]],
             "role": ["data"],
         }
@@ -563,7 +583,7 @@ def add_visualization_info(stac_object, data, endpoint, file_url=None, time=None
     elif endpoint["Name"] == "JAXA_WMTS_PALSAR":
         target_url = "{}".format(endpoint.get("EndPoint"))
         # custom time just for this special case as a default for collection wmts
-        extra_fields = {"wmts:layer": endpoint.get("LayerId").replace("{time}", time or "2017")}
+        extra_fields = {"wmts:layer": endpoint.get("LayerId", "").replace("{time}", time or "2017")}
         stac_object.add_link(
             Link(
                 rel="wmts",
@@ -606,7 +626,7 @@ def add_visualization_info(stac_object, data, endpoint, file_url=None, time=None
     elif endpoint["Type"] == "WMTSCapabilities":
         target_url = "{}".format(endpoint.get("EndPoint"))
         extra_fields = {
-            "wmts:layer": endpoint.get("LayerId"),
+            "wmts:layer": endpoint.get("LayerId", ""),
             "role": ["data"],
         }
         dimensions = {}

{eodash_catalog-0.0.9 → eodash_catalog-0.0.11}/src/eodash_catalog/generate_indicators.py

@@ -6,17 +6,12 @@ Indicator generator to harvest information from endpoints and generate catalog
 
 import os
 import time
-from dataclasses import dataclass
+from typing import Any
 
 import click
 import yaml
 from dotenv import load_dotenv
-from pystac import (
-    Catalog,
-    CatalogType,
-    Collection,
-    Summaries,
-)
+from pystac import Catalog, CatalogType, Collection, Link, Summaries
 from pystac.layout import TemplateLayoutStrategy
 from pystac.validation import validate_all
 from yaml.loader import SafeLoader
@@ -24,7 +19,6 @@ from yaml.loader import SafeLoader
 from eodash_catalog.endpoints import (
     handle_collection_only,
     handle_GeoDB_endpoint,
-    handle_GeoDB_Tiles_endpoint,
     handle_SH_endpoint,
     handle_SH_WMS_endpoint,
     handle_VEDA_endpoint,
@@ -38,7 +32,9 @@ from eodash_catalog.stac_handling import (
     get_or_create_collection_and_times,
 )
 from eodash_catalog.utils import (
+    Options,
     RaisingThread,
+    add_single_item_if_collection_empty,
     iter_len_at_least,
     recursive_save,
 )
@@ -47,18 +43,6 @@ from eodash_catalog.utils import (
 load_dotenv()
 
 
-@dataclass
-class Options:
-    catalogspath: str
-    collectionspath: str
-    indicatorspath: str
-    outputpath: str
-    vd: bool
-    ni: bool
-    tn: bool
-    collections: list[str]
-
-
 def process_catalog_file(file_path: str, options: Options):
     print("Processing catalog:", file_path)
     with open(file_path) as f:
@@ -129,7 +113,7 @@ def process_catalog_file(file_path: str, options: Options):
                 print(f"Issue validation collection: {e}")
 
 
-def extract_indicator_info(parent_collection):
+def extract_indicator_info(parent_collection: Collection):
     to_extract = [
         "subcode",
         "themes",
@@ -139,7 +123,7 @@ def extract_indicator_info(parent_collection):
         "cities",
         "countries",
     ]
-    summaries = {}
+    summaries: dict[str, Any] = {}
     for key in to_extract:
         summaries[key] = set()
 
@@ -189,12 +173,13 @@ def process_indicator_file(config: dict, file_path: str, catalog: Catalog, optio
             parent_indicator.update_extent_from_items()
         # Add bbox extents from children
         for c_child in parent_indicator.get_children():
-            parent_indicator.extent.spatial.bboxes.append(c_child.extent.spatial.bboxes[0])
+            if isinstance(c_child, Collection):  # typing reason
+                parent_indicator.extent.spatial.bboxes.append(c_child.extent.spatial.bboxes[0])
         # extract collection information and add it to summary indicator level
         extract_indicator_info(parent_indicator)
         # add baselayer and overview information to indicator collection
         add_base_overlay_info(parent_indicator, config, data)
-        add_to_catalog(parent_indicator, catalog, None, data)
+        add_to_catalog(parent_indicator, catalog, {}, data)
 
 
 def process_collection_file(
@@ -221,8 +206,6 @@ def process_collection_file(
                         collection = handle_xcube_endpoint(config, resource, data, catalog)
                     elif resource["Name"] == "WMS":
                         collection = handle_WMS_endpoint(config, resource, data, catalog)
-                    elif resource["Name"] == "GeoDB Vector Tiles":
-                        collection = handle_GeoDB_Tiles_endpoint(config, resource, data, catalog)
                     elif resource["Name"] == "JAXA_WMTS_PALSAR":
                         # somewhat one off creation of individual WMTS layers as individual items
                         collection = handle_WMS_endpoint(config, resource, data, catalog, wmts=True)
@@ -231,6 +214,7 @@ def process_collection_file(
                     else:
                         raise ValueError("Type of Resource is not supported")
                     if collection is not None:
+                        add_single_item_if_collection_empty(collection)
                         add_to_catalog(collection, catalog, resource, data)
                     else:
                         raise Exception("No collection generated")
@@ -303,7 +287,8 @@ def process_collection_file(
             parent_collection.update_extent_from_items()
             # Add bbox extents from children
             for c_child in parent_collection.get_children():
-                parent_collection.extent.spatial.bboxes.append(c_child.extent.spatial.bboxes[0])
+                if isinstance(c_child, Collection):
+                    parent_collection.extent.spatial.bboxes.append(c_child.extent.spatial.bboxes[0])
             # Fill summaries for locations
             parent_collection.summaries = Summaries(
                 {
@@ -311,17 +296,17 @@ def process_collection_file(
                     "countries": list(set(countries)),
                 }
             )
-            add_to_catalog(parent_collection, catalog, None, data)
+            add_to_catalog(parent_collection, catalog, {}, data)
 
 
-def add_to_catalog(collection, catalog, endpoint, data):
+def add_to_catalog(collection: Collection, catalog: Catalog, endpoint: dict, data: dict):
     # check if already in catalog, if it is do not re-add it
     # TODO: probably we should add to the catalog only when creating
     for cat_coll in catalog.get_collections():
         if cat_coll.id == collection.id:
             return
 
-    link = catalog.add_child(collection)
+    link: Link = catalog.add_child(collection)
     # bubble fields we want to have up to collection link and add them to collection
     if endpoint and "Type" in endpoint:
         collection.extra_fields["endpointtype"] = "{}_{}".format(

{eodash_catalog-0.0.9 → eodash_catalog-0.0.11}/src/eodash_catalog/sh_endpoint.py

@@ -4,7 +4,7 @@ from oauthlib.oauth2 import BackendApplicationClient
 from requests_oauthlib import OAuth2Session
 
 
-def get_SH_token():
+def get_SH_token() -> str:
     # Your client credentials
     client_id = os.getenv("SH_CLIENT_ID")
     client_secret = os.getenv("SH_CLIENT_SECRET")

{eodash_catalog-0.0.9 → eodash_catalog-0.0.11}/src/eodash_catalog/stac_handling.py

@@ -6,6 +6,7 @@ import yaml
 from dateutil import parser
 from pystac import (
     Asset,
+    Catalog,
     Collection,
     Extent,
     Link,
@@ -18,7 +19,9 @@ from yaml.loader import SafeLoader
 from eodash_catalog.utils import generateDateIsostringsFromInterval
 
 
-def get_or_create_collection_and_times(catalog, collection_id, data, config, endpoint=None):
+def get_or_create_collection_and_times(
+    catalog: Catalog, collection_id: str, data: dict, config: dict, endpoint: dict
+) -> tuple[Collection, list[str]]:
     # Check if collection already in catalog
     for collection in catalog.get_collections():
         if collection.id == collection_id:
@@ -31,11 +34,11 @@ def get_or_create_collection_and_times(catalog, collection_id, data, config, end
             spatial_extent,
         ]
     )
-    times = []
+    times: list[str] = []
     temporal_extent = TemporalExtent([[datetime.now(), None]])
     if endpoint and endpoint.get("Type") == "OverwriteTimes":
         if endpoint.get("Times"):
-            times = endpoint.get("Times")
+            times = list(endpoint.get("Times", []))
             times_datetimes = sorted([parser.isoparse(time) for time in times])
             temporal_extent = TemporalExtent([[times_datetimes[0], times_datetimes[-1]]])
         elif endpoint.get("DateTimeInterval"):
@@ -80,7 +83,7 @@ def get_or_create_collection_and_times(catalog, collection_id, data, config, end
     return (collection, times)
 
 
-def create_web_map_link(layer, role):
+def create_web_map_link(layer: dict, role: str) -> Link:
     extra_fields = {
         "roles": [role],
         "id": layer["id"],
@@ -113,7 +116,9 @@ def create_web_map_link(layer, role):
     return wml
 
 
-def add_example_info(stac_object, data, endpoint, config):
+def add_example_info(
+    stac_object: Collection | Catalog, data: dict, endpoint: dict, config: dict
+) -> None:
     if "Services" in data:
         for service in data["Services"]:
             if service["Name"] == "Statistical API":
@@ -178,7 +183,7 @@ def add_example_info(stac_object, data, endpoint, config):
                 )
 
 
-def add_collection_information(config, collection, data):
+def add_collection_information(config: dict, collection: Collection, data: dict) -> None:
     # Add metadata information
     # Check license identifier
     if "License" in data:
@@ -304,7 +309,7 @@ def add_collection_information(config, collection, data):
             )
 
 
-def add_base_overlay_info(collection, config, data):
+def add_base_overlay_info(collection: Collection, config: dict, data: dict) -> None:
     # check if default base layers defined
     if "default_base_layers" in config:
         with open(f"{config["default_base_layers"]}.yaml") as f:
@@ -326,7 +331,7 @@ def add_base_overlay_info(collection, config, data):
     # TODO: possibility to overwrite default base and overlay layers
 
 
-def add_extra_fields(stac_object, data):
+def add_extra_fields(stac_object: Collection | Catalog | Link, data: dict) -> None:
     if "yAxis" in data:
         stac_object.extra_fields["yAxis"] = data["yAxis"]
     if "Themes" in data:

{eodash_catalog-0.0.9 → eodash_catalog-0.0.11}/src/eodash_catalog/thumbnails.py

@@ -3,21 +3,30 @@ import re
 from pathlib import Path
 
 import requests
+from pystac import (
+    Item,
+)
 
 from eodash_catalog.utils import generate_veda_cog_link
 
 
-def fetch_and_save_thumbnail(data, url):
+def fetch_and_save_thumbnail(data: dict, url: str) -> None:
     collection_path = "../thumbnails/{}_{}/".format(data["EodashIdentifier"], data["Name"])
     Path(collection_path).mkdir(parents=True, exist_ok=True)
     image_path = f"{collection_path}/thumbnail.png"
     if not os.path.exists(image_path):
-        data = requests.get(url).content
+        dd = requests.get(url).content
         with open(image_path, "wb") as f:
-            f.write(data)
+            f.write(dd)
 
 
-def generate_thumbnail(stac_object, data, endpoint, file_url=None, time=None, styles=None):
+def generate_thumbnail(
+    stac_object: Item,
+    data: dict,
+    endpoint: dict,
+    file_url: str = "",
+    time: str | None = None,
+) -> None:
     if endpoint["Name"] == "Sentinel Hub" or endpoint["Name"] == "WMS":
         instanceId = os.getenv("SH_INSTANCE_ID")
         if "InstanceId" in endpoint:
@@ -26,8 +35,9 @@ def generate_thumbnail(stac_object, data, endpoint, file_url=None, time=None, st
         wms_config = (
             "REQUEST=GetMap&SERVICE=WMS&VERSION=1.3.0&FORMAT=image/png&STYLES=&TRANSPARENT=true"
         )
-        bbox_s = stac_object.bbox
-        bbox = f"{bbox_s[1]},{bbox_s[0]},{bbox_s[3]},{bbox_s[2]}"
+        bbox = [-180, -85, 180, 85]
+        if bbox_s := stac_object.bbox:
+            bbox = f"{bbox_s[1]},{bbox_s[0]},{bbox_s[3]},{bbox_s[2]}"  # type: ignore
         output_format = f"format=image/png&WIDTH=256&HEIGHT=128&CRS=EPSG:4326&BBOX={bbox}"
         item_datetime = stac_object.get_datetime()
         # it is possible for datetime to be null,

{eodash_catalog-0.0.9 → eodash_catalog-0.0.11}/src/eodash_catalog/utils.py

@@ -1,6 +1,8 @@
 import re
 import threading
+import uuid
 from collections.abc import Iterator
+from dataclasses import dataclass
 from datetime import datetime, timedelta
 from decimal import Decimal
 from functools import reduce
@@ -9,7 +11,7 @@ from typing import Any
 from dateutil import parser
 from owslib.wms import WebMapService
 from owslib.wmts import WebMapTileService
-from pystac import Catalog
+from pystac import Catalog, Collection, Item, RelType
 from six import string_types
 
 from eodash_catalog.duration import Duration
@@ -35,7 +37,7 @@ def create_geojson_point(lon: int | float, lat: int | float) -> dict[str, Any]:
 
 def retrieveExtentFromWMSWMTS(
     capabilities_url: str, layer: str, version: str = "1.1.1", wmts: bool = False
-):
+) -> tuple[list[float], list[str]]:
     times = []
     try:
         if not wmts:
@@ -91,7 +93,9 @@ def parse_duration(datestring):
     if not isinstance(datestring, string_types):
         raise TypeError(f"Expecting a string {datestring}")
     match = ISO8601_PERIOD_REGEX.match(datestring)
-    groups = match.groupdict()
+    groups = {}
+    if match:
+        groups = match.groupdict()
     for key, val in groups.items():
         if key not in ("separator", "sign"):
             if val is None:
@@ -128,7 +132,9 @@ def parse_duration(datestring):
     return ret
 
 
-def generateDateIsostringsFromInterval(start: str, end: str, timedelta_config: dict | None = None):
+def generateDateIsostringsFromInterval(
+    start: str, end: str, timedelta_config: dict | None = None
+) -> list[str]:
     if timedelta_config is None:
         timedelta_config = {}
     start_dt = datetime.fromisoformat(start)
@@ -171,7 +177,7 @@ def iter_len_at_least(i, n: int) -> int:
     return sum(1 for _ in zip(range(n), i, strict=False)) == n
 
 
-def generate_veda_cog_link(endpoint, file_url):
+def generate_veda_cog_link(endpoint: dict, file_url: str | None) -> str:
     bidx = ""
     if "Bidx" in endpoint:
         # Check if an array was provided
@@ -200,3 +206,32 @@ def generate_veda_cog_link(endpoint, file_url):
 
     target_url = f"https://staging-raster.delta-backend.com/cog/tiles/WebMercatorQuad/{{z}}/{{x}}/{{y}}?{file_url}resampling_method=nearest{bidx}{colormap}{colormap_name}{rescale}"
     return target_url
+
+
+@dataclass
+class Options:
+    catalogspath: str
+    collectionspath: str
+    indicatorspath: str
+    outputpath: str
+    vd: bool
+    ni: bool
+    tn: bool
+    collections: list[str]
+
+
+def add_single_item_if_collection_empty(collection: Collection) -> None:
+    for link in collection.links:
+        if link.rel == RelType.ITEM:
+            break
+    else:
+        item = Item(
+            id=str(uuid.uuid4()),
+            bbox=[-180, -85, 180, 85],
+            properties={},
+            geometry=None,
+            datetime=datetime(1970, 1, 1, 0, 0, 0),
+            start_datetime=datetime(1970, 1, 1, 0, 0, 0),
+            end_datetime=datetime.now(),
+        )
+        collection.add_item(item)