fix: use storage provider in retrieve_tyndp_bundle

Author: coroa

rules/sb.smk

@@ -30,6 +30,8 @@ if config["enable"]["retrieve"] and config["enable"].get("retrieve_cutout", True
 if config["enable"]["retrieve"]:
 
     rule retrieve_tyndp_bundle:
+        input:
+            zip_file=storage("https://zenodo.org/records/14230568/files/TYNDP_2024_data_bundle.zip")
         output:
             dir=directory("data/tyndp_2024_bundle"),
             elec_reference_grid="data/tyndp_2024_bundle/Line data/ReferenceGrid_Electricity.xlsx",

scripts/sb/retrieve_tyndp_bundle.py

@@ -19,16 +19,12 @@
 """
 
 import logging
-import os
 import zipfile
 
-from scripts._helpers import configure_logging, progress_retrieve, set_scenario_config
+from scripts._helpers import configure_logging, set_scenario_config
 
 logger = logging.getLogger(__name__)
 
-# Define the base URL
-url = "https://zenodo.org/records/14230568/files/TYNDP_2024_data_bundle.zip"
-
 if __name__ == "__main__":
     if "snakemake" not in globals():
         from scripts._helpers import mock_snakemake
@@ -37,21 +33,10 @@
 
     configure_logging(snakemake)
     set_scenario_config(snakemake)
-    disable_progress = snakemake.config["run"].get("disable_progressbar", False)
-
-    to_fn = snakemake.output.dir
-    to_fn_zp = to_fn + ".zip"
-
-    # download .zip file
-    logger.info(f"Downloading TYNDP data bundle from '{url}'.")
-    progress_retrieve(url, to_fn_zp, disable=disable_progress)
 
     # extract
     logger.info("Extracting TYNDP data bundle.")
-    with zipfile.ZipFile(to_fn_zp, "r") as zip_ref:
-        zip_ref.extractall(to_fn)
-
-    # remove .zip file
-    os.remove(to_fn_zp)
+    with zipfile.ZipFile(snakemake.input.zip_file, "r") as zip_ref:
+        zip_ref.extractall(snakemake.output.dir)
 
-    logger.info(f"TYNDP data bundle available in '{to_fn}'.")
+    logger.info(f"TYNDP data bundle available in '{snakemake.output.dir}'.")