psr-factory 5.0.0b21__py3-none-win_amd64.whl → 5.0.0b67__py3-none-win_amd64.whl

psr/runner/runner.py

@@ -10,7 +10,7 @@ import shutil
 import socket
 import subprocess
 from types import ModuleType
-from typing import Dict, List, Optional, Tuple, Union
+from typing import Any, Dict, List, Optional, Tuple, Union
 import warnings
 
 
@@ -90,18 +90,10 @@ def _get_nproc(specified: int, available: int) -> int:
     else:
         return available
 
-def _write_mpi_settings(mpi_file_path: Union[str, pathlib.Path], cluster_settings: Optional[Union[int, bool, Dict[str, int]]]):
+def _write_mpi_settings(mpi_file_path: Union[str, pathlib.Path, Any], cluster_settings: Optional[Union[int, bool, Dict[str, int]]]):
     if cluster_settings is not None:
-        mpi_file_path = str(mpi_file_path)
         available_cpu = _get_available_cpu()
-        if isinstance(cluster_settings, int):
-            computer_name = _get_host_name()
-            specified_cpu_number = cluster_settings
-            nproc = _get_nproc(specified_cpu_number, available_cpu)
-            cluster_settings = {computer_name: nproc}
-        elif isinstance(cluster_settings, dict):
-            pass
-        elif isinstance(cluster_settings, bool):
+        if isinstance(cluster_settings, bool):
             # Rewrite with default settings.
             if cluster_settings:
                 computer_name = _get_host_name()
@@ -109,6 +101,13 @@ def _write_mpi_settings(mpi_file_path: Union[str, pathlib.Path], cluster_setting
                 cluster_settings = {computer_name: nproc}
             else:
                 cluster_settings = None
+        elif isinstance(cluster_settings, int):
+            computer_name = _get_host_name()
+            specified_cpu_number = cluster_settings
+            nproc = _get_nproc(specified_cpu_number, available_cpu)
+            cluster_settings = {computer_name: nproc}
+        elif isinstance(cluster_settings, dict):
+            pass
         else:
             raise ValueError("Invalid cluster settings type")
     else:
@@ -117,22 +116,29 @@ def _write_mpi_settings(mpi_file_path: Union[str, pathlib.Path], cluster_setting
         cluster_settings = {computer_name: nproc}
 
     if isinstance(cluster_settings, dict):
-        with open(mpi_file_path, 'w') as f:
-            for computer, nproc in cluster_settings.items():
-                f.write(f"{computer}:{nproc}\n")
-
+        if isinstance(mpi_file_path, (str, pathlib.Path)):
+            f = open(mpi_file_path, 'w')
+            must_close = True
+        else:
+            f = open(mpi_file_path.name, 'w')
+            must_close = False
+        for computer, nproc in cluster_settings.items():
+            f.write(f"{computer}:{nproc}\n")
+        if must_close:
+            f.close()
 
 
 def run_sddp(case_path: Union[str, pathlib.Path], sddp_path: Union[str, pathlib.Path], **kwargs):
     case_path = os.path.abspath(str(case_path))
     sddp_path = str(sddp_path)
     parallel_run = kwargs.get("parallel_run", True)
-    cluster_settings: Optional[Union[int, bool, Dict[str, int]]] = kwargs.get("cluster_settings", False)
+    cluster_settings: Optional[Union[int, bool, Dict[str, int]]] = kwargs.get("cluster_settings", None)
     dry_run = kwargs.get("dry_run", False)
     show_progress = kwargs.get("show_progress", False)
     extra_args = " ".join(kwargs.get("extra_args", ()))
     exec_mode = kwargs.get("_mode", None)
     mpi_path = kwargs.get("mpi_path", __default_mpi_path)
+    env = kwargs.get("env", {})
 
     sddp_path_full = _get_sddp_executable_parent_path(sddp_path)
     # Append last / if missing.
@@ -144,14 +150,26 @@ def run_sddp(case_path: Union[str, pathlib.Path], sddp_path: Union[str, pathlib.
 
     major, minor, patch, tag = _get_semver_version(get_sddp_version(sddp_path))
 
-    with change_cwd(sddp_path_full):
+    temp_folder = os.path.join(os.getenv("TEMP") or os.getenv("TMPDIR") or os.getenv("TMP") or "/tmp", "")
+    with (psr.psrfcommon.tempfile.CreateTempFile(temp_folder, "mpd_sddp", "", ".hosts", False) as mpi_temp_file,
+          change_cwd(sddp_path_full)):
+
         # Write MPI settings if required
         if parallel_run and cluster_settings is not None:
-            if major >= 18:
+            if major >= 18 and minor >= 0 and patch >= 7:
+                _write_mpi_settings(mpi_temp_file, cluster_settings)
+                extra_args = extra_args + f" --hostsfile=\"{mpi_temp_file.name}\""
+                if dry_run:
+                    print("Using temporary mpi settings file:", mpi_temp_file.name)
+                mpi_written = True
+            elif major >= 18:
                 mpi_file_path = os.path.join(sddp_path_full, "mpd_sddp.hosts")
+                mpi_written = False
             else:
                 mpi_file_path = os.path.join(sddp_path_full, "mpd.hosts")
-            _write_mpi_settings(mpi_file_path, cluster_settings)
+                mpi_written = False
+            if not mpi_written:
+                _write_mpi_settings(mpi_file_path, cluster_settings)
 
         if parallel_run:
             if os.name == 'nt':
@@ -173,7 +191,9 @@ def run_sddp(case_path: Union[str, pathlib.Path], sddp_path: Union[str, pathlib.
                 cmd = f'./sddp {mode_arg} -path "{case_path_last_slash}" {extra_args}'
 
         if os.name != "nt":
-            os.environ["LD_LIBRARY_PATH"] = os.path.abspath(sddp_path_full)
+            env["LD_LIBRARY_PATH"] = os.path.realpath(sddp_path_full)
+            env["MPI_PATH"] = os.path.realpath(mpi_path)
+            kwargs["env"] = env
         exec_cmd(cmd, **kwargs)
 
 
@@ -199,6 +219,9 @@ def _get_sddp_executable_parent_path(sddp_path: Union[str, pathlib.Path]) -> str
             return model_path
         else:
             return os.path.join(sddp_path, "Oper")
+    else:
+        # solve symlinks, if needed
+        sddp_path = os.path.realpath(sddp_path)
     return sddp_path
 
 def _get_optgen_executable_parent_path(optgen_path: Union[str, pathlib.Path]) -> str:
@@ -208,6 +231,9 @@ def _get_optgen_executable_parent_path(optgen_path: Union[str, pathlib.Path]) ->
             return model_path
         else:
             return os.path.join(optgen_path, "Model")
+    else:
+        # solve symlinks, if needed
+        optgen_path = os.path.realpath(optgen_path)
     return optgen_path
 
 
@@ -220,8 +246,13 @@ def get_sddp_version(sddp_path: Union[str, pathlib.Path]) -> str:
         command = [os.path.join(sddp_path_full, "sddp"), "ver"]
 
     if os.name != "nt":
-        os.environ["LD_LIBRARY_PATH"] = os.path.abspath(sddp_path_full)
-    sub = subprocess.run(command, stdout=subprocess.PIPE, check=False)
+        env = {
+            "LD_LIBRARY_PATH": os.path.realpath(sddp_path_full)
+        }
+    else:
+        env = {}
+
+    sub = subprocess.run(command, stdout=subprocess.PIPE, check=False, env=env)
     output = sub.stdout.decode("utf-8").strip()
     return output.split()[2]
 
@@ -595,6 +626,20 @@ def run_tslconsole(tsl_path: Union[str, pathlib.Path], script_path: Union[str, p
         cmd = f'TimeSeriesConsole.exe "{str(script_path)}"'
         exec_cmd(cmd, **kwargs)
 
+def run_tsl_generate_inflow_from_external_natural(case_path: Union[str, pathlib.Path], tsl_path: Union[str, pathlib.Path], **kwargs):
+    commands = ["generate_inflow_from_external_natural"]
+    case_path = os.path.abspath(str(case_path))
+    tsl_path = str(tsl_path)
+    _run_tslconsole_command(tsl_path, case_path, commands)
+
+
+def run_tsl_generate_inflow_from_external_incremental(case_path: Union[str, pathlib.Path], tsl_path: Union[str, pathlib.Path], **kwargs):
+    commands = ["generate_inflow_from_external_incremental"]
+    case_path = os.path.abspath(str(case_path))
+    tsl_path = str(tsl_path)
+    _run_tslconsole_command(tsl_path, case_path, commands)
+
+
 def run_tsl(case_path: Union[str, pathlib.Path], tsl_path: Union[str, pathlib.Path], base_type: str, **kwargs):
     if os.name != 'nt':
         raise NotImplementedError("Running TimeSeriesLab is only available on Windows")

{psr_factory-5.0.0b21.dist-info → psr_factory-5.0.0b67.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: psr-factory
-Version: 5.0.0b21
+Version: 5.0.0b67
 Summary: PSR database management module.
 Author-email: "PSR Inc." <psrfactory@psr-inc.com>
 License-Expression: MIT
@@ -15,6 +15,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development
 Classifier: Topic :: Scientific/Engineering
 Classifier: Operating System :: Microsoft :: Windows
@@ -28,11 +29,7 @@ Requires-Dist: pandas; extra == "pandas"
 Provides-Extra: polars
 Requires-Dist: polars; extra == "polars"
 Provides-Extra: cloud
-Requires-Dist: zeep; extra == "cloud"
-Requires-Dist: filelock; extra == "cloud"
-Requires-Dist: pefile; extra == "cloud"
-Requires-Dist: boto3; extra == "cloud"
-Requires-Dist: botocore; extra == "cloud"
+Requires-Dist: psr-cloud; extra == "cloud"
 Provides-Extra: execqueue-client
 Requires-Dist: requests; extra == "execqueue-client"
 Provides-Extra: execqueue-server
@@ -41,17 +38,10 @@ Requires-Dist: Flask; extra == "execqueue-server"
 Requires-Dist: python-ulid; extra == "execqueue-server"
 Requires-Dist: sqlalchemy; extra == "execqueue-server"
 Requires-Dist: python-dotenv; extra == "execqueue-server"
-Requires-Dist: pefile; extra == "execqueue-server"
-Requires-Dist: zeep; extra == "execqueue-server"
-Requires-Dist: filelock; extra == "execqueue-server"
-Requires-Dist: requests; extra == "execqueue-server"
+Requires-Dist: psr-cloud; extra == "execqueue-server"
 Provides-Extra: all
 Requires-Dist: pandas; extra == "all"
 Requires-Dist: polars; extra == "all"
 Requires-Dist: psutil; extra == "all"
-Requires-Dist: zeep; extra == "all"
-Requires-Dist: filelock; extra == "all"
-Requires-Dist: pefile; extra == "all"
-Requires-Dist: boto3; extra == "all"
-Requires-Dist: botocore; extra == "all"
+Requires-Dist: psr-cloud; extra == "all"
 Dynamic: license-file

psr_factory-5.0.0b67.dist-info/RECORD

@@ -0,0 +1,32 @@
+psr/apps/__init__.py,sha256=frSq1WIy5vIdU21xJIGX7U3XoAZRj0pcQmFb-R00b7I,228
+psr/apps/apps.py,sha256=V8Ewht7P1I-3sSkV3dnbxbLjF2slxPjcmtzmVaLjiNY,6746
+psr/apps/version.py,sha256=vs459L6JsatAkUxna7BNG-vMCaXpO1Ye8c1bmkEx4U4,194
+psr/execqueue/client.py,sha256=cQ2VK-jhalIiN4V6989jWpICnRhqaoFTl50SZNl92hw,5540
+psr/execqueue/config.py,sha256=F8sp-JGeoRspQRR63SjSKV5wDz0OVGnA-cNm1UDYHBY,1693
+psr/execqueue/db.py,sha256=T3EWiK_2USmgNKTiVaavbqnS-EklCCZKsScOtdD6FgM,10853
+psr/execqueue/server.py,sha256=0N5_ekXj1h5A1QyI4xPmTDpYlAo-qQfLWAa-TL0syWI,28781
+psr/execqueue/watcher.py,sha256=R1dyXJ-OYn_QjqdItBwbLJZQ2LcbtdHqnRaYkyphi4w,5637
+psr/factory/__init__.py,sha256=KSv5D-MDslXpdDYG_dS2AepstsHOHOrJvQftXoA9b5E,219
+psr/factory/api.py,sha256=7rk0qAs36xUQFKyct8CWHh5wfGct-Vi-MH4wsSDa330,113875
+psr/factory/factory.dll,sha256=TqrlyNj9edTZxMz3RmfD1yeAJ_RuktXLdF2SVW3v12k,20271952
+psr/factory/factory.pmd,sha256=wPTJucfpUxc7vyeldE-caD4TqJiT_dCbl-DY2zOkq8c,252791
+psr/factory/factory.pmk,sha256=WrSXrK3zR_7v4cOVppRGWehnLhnZFSFWHnjyA9OUe00,607612
+psr/factory/factorylib.py,sha256=VV8CtwH30k5YItDn6SVo1o5LFJ_IG2WZjs0F1eIimcs,30750
+psr/factory/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+psr/factory/samples/__init__.py,sha256=xxOch5Fokzjy571a6OHD87FWM17qKgvfcbr8xn-n36I,80
+psr/factory/samples/sddp_case01.py,sha256=h0iVqswPeOzauikiHjwUiPRQbmIQjECPcGkX54G1Clo,5060
+psr/factory/samples/sddp_case21.py,sha256=5DNIEu5aMhf8QOOJT-erdBmtozZukJA3k45C0nbfxYo,8791
+psr/outputs/__init__.py,sha256=Rs2MCBm2fUjwm9CAjZU-2Ll7KUsVEbW16mNY1Xnx-pI,193
+psr/outputs/outputs.py,sha256=gzmKl9Ma6K9gjpTTBc45p-IT7DgEX-PzRqtsQSWfja0,6727
+psr/outputs/resample.py,sha256=6fVBWOzxu3utkavGS5EIUd0QpSZm6kc-J1Qv8Bk0X6o,14276
+psr/psrfcommon/__init__.py,sha256=WXR560XQllIjtFpWd0jiJEbUAQIyh5-6lwj-42_J95c,200
+psr/psrfcommon/psrfcommon.py,sha256=LOuojeKX51eCMcPwpfDgRnGlK6WpS5UwDxQajbdRb5I,1571
+psr/psrfcommon/tempfile.py,sha256=5S13wa2DCLYTUdwbLm_KMBRnDRJ0WDlu8GO2BmZoNdg,3939
+psr/runner/__init__.py,sha256=kI9HDX-B_LMQJUHHylFHas2rNpWfNNa0pZXoIvX_Alw,230
+psr/runner/runner.py,sha256=DN5oEPaQo7_LtYjoQgyLiiMBcwrDCUzbjXfWql6bNEI,29484
+psr/runner/version.py,sha256=mch2Y8anSXGMn9w72Z78PhSRhOyn55EwaoLAYhY4McE,194
+psr_factory-5.0.0b67.dist-info/licenses/LICENSE.txt,sha256=N6mqZK2Ft3iXGHj-by_MHC_dJo9qwn0URjakEPys3H4,1089
+psr_factory-5.0.0b67.dist-info/METADATA,sha256=DYdTRa9suJAe0ffO9EZFjNZ0w8pwhWTaEVwXy4NzsDM,1914
+psr_factory-5.0.0b67.dist-info/WHEEL,sha256=ZjXRCNaQ9YSypEK2TE0LRB0sy2OVXSszb4Sx1XjM99k,97
+psr_factory-5.0.0b67.dist-info/top_level.txt,sha256=Jb393O96WQk3b5D1gMcrZBLKJJgZpzNjTPoldUi00ck,4
+psr_factory-5.0.0b67.dist-info/RECORD,,

psr/cloud/__init__.py

@@ -1,7 +0,0 @@
-# PSR Cloud. Copyright (C) PSR, Inc - All Rights Reserved
-# Unauthorized copying of this file, via any medium is strictly prohibited
-# Proprietary and confidential
-
-from .cloud import *
-from .data import *
-from .version import __version__

psr/cloud/aws.py

@@ -1,256 +0,0 @@
-import os
-import tempfile
-import zipfile
-from typing import Dict, List, Optional
-
-import boto3
-from botocore.exceptions import ClientError
-
-
-def _get_region(url):
-    """Extract the region from the S3 URL."""
-    if url:
-        parts = url.split(".")
-        return parts[0]
-    return None
-
-
-def upload_file_to_s3(
-    s3_client, bucket_name, file_path, object_name=None, extra_args=None
-):
-    """Upload a file to an S3 bucket using a provided S3 client.
-
-    :param s3_client: Initialized S3 client.
-    :param bucket_name: Name of the S3 bucket.
-    :param file_path: Path to the file to upload.
-    :param object_name: S3 object name. If not specified, file_path's basename is used.
-    :param extra_args: A dictionary of extra arguments to pass to S3's upload_file.
-    :return: True if file was uploaded, else False.
-    """
-    if object_name is None:
-        object_name = os.path.basename(file_path)
-
-    try:
-        s3_client.upload_file(file_path, bucket_name, object_name, ExtraArgs=extra_args)
-        return True
-    except ClientError as e:
-        print(f"Error uploading file: {e}")
-        return False
-
-
-def upload_case_to_s3(
-    files: List[str],
-    repository_id: str,
-    cluster_name: str,
-    checksums: Optional[Dict[str, str]] = None,
-    access: Optional[str] = None,
-    secret: Optional[str] = None,
-    session_token: Optional[str] = None,
-    bucket_name: Optional[str] = None,
-    url: Optional[str] = None,
-    zip_compress: bool = False,
-    compress_zip_name: str = None,
-):
-    """Upload files to an S3 bucket."""
-
-    region = _get_region(url)
-
-    if not region or not access or not secret or not session_token or not bucket_name:
-        raise ValueError("Unable to set up AWS connection.")
-
-    s3_client = boto3.client(
-        "s3",
-        aws_access_key_id=access,
-        aws_secret_access_key=secret,
-        aws_session_token=session_token,
-        region_name=region,
-    )
-
-    # Base metadata, common for both zip and individual files
-    base_metadata: Dict[str, str] = {
-        "upload": str(True).lower(),
-        "user-agent": "aws-fsx-lustre",
-        "file-owner": "537",
-        "file-group": "500",
-        "file-permissions": "100777",
-    }
-
-    if zip_compress and not compress_zip_name:
-        compress_zip_name = str(repository_id)
-
-    if zip_compress:
-        # Create a temporary zip file
-        with tempfile.NamedTemporaryFile(suffix=".zip", delete=False) as tmp_zip_file:
-            zip_path = tmp_zip_file.name
-            tmp_zip_file.close()  # Close the file handle so zipfile can open it
-
-        try:
-            with zipfile.ZipFile(zip_path, "w", zipfile.ZIP_DEFLATED) as zipf:
-                for file_path in files:
-                    # Add file to zip, using only the basename inside the zip
-                    zipf.write(file_path, arcname=os.path.basename(file_path))
-
-            # Construct object name for the zip file
-            object_name = f"{repository_id}/uploaded/{compress_zip_name}.zip"
-
-            # For zip files, we use the base metadata without a specific checksum
-            # (as checksums are per-file in the original design)
-            extra_args = {
-                "Metadata": base_metadata.copy()
-            }  # Use a copy to avoid modifying base_metadata
-
-            if not upload_file_to_s3(
-                s3_client, bucket_name, zip_path, object_name, extra_args=extra_args
-            ):
-                raise ValueError(
-                    f"Failed to upload zip file {zip_path} to S3 bucket {bucket_name}."
-                )
-
-        finally:
-            # Clean up the temporary zip file
-            if os.path.exists(zip_path):
-                os.unlink(zip_path)
-
-    else:
-        # Original logic: upload files individually
-        for file_path in files:
-            file_basename = os.path.basename(file_path)
-            object_name = f"{repository_id}/uploaded/{file_basename}"
-
-            current_file_metadata = base_metadata.copy()
-            if checksums:
-                current_file_metadata["checksum"] = checksums.get(file_basename, "")
-
-            extra_args = {"Metadata": current_file_metadata}
-
-            if not upload_file_to_s3(
-                s3_client, bucket_name, file_path, object_name, extra_args=extra_args
-            ):
-                raise ValueError(
-                    f"Failed to upload file {file_path} to S3 bucket {bucket_name}."
-                )
-
-    # Always upload .metadata files if the source 'files' list is provided
-    if files:
-        # Assuming all files in the 'files' list share the same parent directory,
-        # which is the case data directory.
-        data_directory = os.path.dirname(files[0])
-        metadata_dir_local_path = os.path.join(data_directory, ".metadata")
-
-        if os.path.isdir(metadata_dir_local_path):
-            # Iterate through the original list of files to find corresponding metadata files
-            for original_file_path in files:
-                original_file_basename = os.path.basename(original_file_path)
-                local_metadata_file_path = os.path.join(
-                    metadata_dir_local_path, original_file_basename
-                )
-
-                if os.path.isfile(local_metadata_file_path):
-                    # S3 object name for the metadata file (e.g., repository_id/.metadata/original_file_basename)
-                    s3_metadata_object_name = (
-                        f"{repository_id}/.metadata/{original_file_basename}"
-                    )
-                    extra_args = {"Metadata": base_metadata.copy()}
-                    if not upload_file_to_s3(
-                        s3_client,
-                        bucket_name,
-                        local_metadata_file_path,
-                        s3_metadata_object_name,
-                        extra_args=extra_args,
-                    ):
-                        raise ValueError(
-                            f"Failed to upload metadata file {local_metadata_file_path} to S3 bucket {bucket_name}."
-                        )
-
-
-def _download_s3_object(
-    s3_client, bucket_name: str, s3_object_key: str, local_file_path: str
-) -> bool:
-    """
-    Downloads a single object from S3 to a local file path.
-
-    :param s3_client: Initialized S3 client.
-    :param bucket_name: Name of the S3 bucket.
-    :param s3_object_key: The key of the object in S3.
-    :param local_file_path: The local path where the file should be saved.
-    :return: True if download was successful, False otherwise.
-    """
-
-    try:
-        s3_client.download_file(bucket_name, s3_object_key, local_file_path)
-        return True
-    except ClientError as e:
-        print(f"ERROR: Failed to download {s3_object_key} from S3: {e}")
-        return False
-
-
-def download_case_from_s3(
-    repository_id: str,
-    cluster_name: str,  # Kept for consistency with caller, though not used directly in S3 ops
-    access: str,
-    secret: str,
-    session_token: str,
-    bucket_name: str,
-    url: str,  # S3 endpoint URL, used by _get_region
-    output_path: str,
-    file_list: List[str],
-) -> List[str]:
-    """
-    Downloads files from an S3 bucket for a given case repository.
-
-    It iterates through the provided `file_list`, downloads each specified file
-    from the S3 path `{repository_id}/{file_in_list}`, preserving its relative path
-    under `output_path`. It then checks if each downloaded file is gzipped,
-    decompresses it if necessary, and returns a list of basenames of the
-    final downloaded (and potentially decompressed) files.
-
-    :param repository_id: The ID of the repository in S3.
-    :param cluster_name: Name of the cluster (for context, not used in S3 calls).
-    :param access: AWS access key ID.
-    :param secret: AWS secret access key.
-    :param session_token: AWS session token.
-    :param bucket_name: Name of the S3 bucket.
-    :param url: S3 service URL (used to determine region via _get_region).
-    :param output_path: Local directory where files will be downloaded.
-    :param file_list: A list of file names (basenames) to be downloaded.
-    :return: A list of basenames of the downloaded (and decompressed) files.
-    :raises ValueError: If S3 connection parameters are missing or filter is invalid.
-    :raises RuntimeError: If S3 operations fail.
-    """
-    region = _get_region(url)
-    if not all([region, access, secret, session_token, bucket_name]):
-        # TODO: Replace print with proper logging
-        print(
-            "ERROR: Missing S3 connection parameters (region, access, secret, token, or bucket name)."
-        )
-        raise ValueError("Missing S3 connection parameters.")
-
-    s3_client = boto3.client(
-        "s3",
-        aws_access_key_id=access,
-        aws_secret_access_key=secret,
-        aws_session_token=session_token,
-        region_name=region,
-    )
-
-    downloaded_files: List[str] = []
-
-    try:
-        for file_name in file_list:
-            # Construct the full S3 object key
-            s3_object_key = f"{repository_id}/{file_name}"
-
-            local_file_path = os.path.join(output_path, file_name)
-            if _download_s3_object(
-                s3_client, bucket_name, s3_object_key, local_file_path
-            ):
-                downloaded_files.append(os.path.basename(local_file_path))
-
-    except ClientError as e:
-        print(f"ERROR: S3 ClientError during download: {e}")
-        raise RuntimeError(f"Failed to download files from S3: {e}")
-    except Exception as e:
-        print(f"ERROR: An unexpected error occurred during download: {e}")
-        raise RuntimeError(f"An unexpected error occurred during S3 download: {e}")
-
-    return downloaded_files