CTADIRAC 2.2.80__tar.gz → 2.2.82__tar.gz

{ctadirac-2.2.80/src/CTADIRAC.egg-info → ctadirac-2.2.82}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: CTADIRAC
-Version: 2.2.80
+Version: 2.2.82
 Summary: CTADIRAC is an extension of the DIRAC interware for dedicated CTA usage.
 Author-email: Luisa Arrabito <arrabito@in2p3.fr>
 License: BSD 3-Clause License

{ctadirac-2.2.80 → ctadirac-2.2.82}/src/CTADIRAC/Core/scripts/cta_prod_get_file.py

@@ -60,34 +60,37 @@ def sigint_handler(signum, frame):
 
 
 def getfile(lfn):
-    voName = lfn.split("/")[1]
-    if voName not in ["ctao", "vo.cta.in2p3.fr"]:
-        message = (
-            f"Wrong lfn: path must start with vo name (ctao or vo.cta.in2p3.fr):\n{lfn}"
-        )
-        gLogger.error(message)
-        return
-
-    name = os.path.basename(lfn)
-    if config["skip_existing"] and os.path.isfile(name):
-        gLogger.notice("Skipping already downloaded file", lfn)
-        return
-
-    dm = DataManager(vo=voName)
-    gLogger.notice("Start downloading file", lfn)
-    res = dm.getFile(lfn)
-
-    if not res["OK"]:
-        message = res["Message"]
-        gLogger.error(f"Error downloading file {lfn}:\n{message}")
-        return
-    elif res["Value"]["Failed"]:
-        message = res["Value"]["Failed"][lfn]
-        gLogger.error(f"Error downloading file {lfn}:\n{message}")
-        return
-
-    gLogger.info(f"Successfully downloaded file {lfn}")
-    os.rename(os.path.join(".incomplete", name), name)
+    try:
+        voName = lfn.split("/")[1]
+        if voName not in ["ctao", "vo.cta.in2p3.fr"]:
+            message = f"Wrong lfn: path must start with vo name (ctao or vo.cta.in2p3.fr):\n{lfn}"
+            gLogger.error(message)
+            return
+
+        name = os.path.basename(lfn)
+        if config["skip_existing"] and os.path.isfile(name):
+            gLogger.notice("Skipping already downloaded file", lfn)
+            return
+
+        dm = DataManager(vo=voName)
+        gLogger.notice("Start downloading file", lfn)
+        res = dm.getFile(lfn, destinationDir=TEMPDIR)
+
+        if not res["OK"]:
+            message = res["Message"]
+            gLogger.error(f"Error downloading file {lfn}:\n{message}")
+            return
+        elif res["Value"]["Failed"]:
+            message = res["Value"]["Failed"][lfn]
+            gLogger.error(f"Error downloading file {lfn}:\n{message}")
+            return
+
+        gLogger.info(f"Successfully downloaded file {lfn}")
+        os.rename(os.path.join(".incomplete", name), name)
+
+    except Exception as e:
+        gLogger.error(f"Unexpected error while downloading {lfn}: {e}")
+        # Don't raise; just log so worker doesn't crash
 
 
 @Script()

{ctadirac-2.2.80 → ctadirac-2.2.82}/src/CTADIRAC/Interfaces/Utilities/CWL_utils.py

@@ -256,41 +256,6 @@ def evaluate_input_value_from(
     return updated_inputs
 
 
-def collect_outputs(cwl, inputs, requirements: list = []) -> list[str]:
-    """Collect evaluated output filenames.
-
-    Parameters
-    ----------
-    cwl: dict
-        The CWL definition
-    inputs: dict
-        user provided inputs.
-
-    Returns
-    -------
-    outputs: list[str]
-        The output filenames of this workflow given
-        the provided inputs and defaults.
-    """
-
-    outputs = []
-    if cwl.outputs is None:
-        return outputs
-    for output in cwl.outputs:
-        if glob := output.outputBinding.glob:
-            result = do_eval(
-                glob,
-                inputs,
-                outdir=None,
-                requirements=requirements,
-                tmpdir=None,
-                resources={},
-            )
-            outputs.append(result)
-
-    return outputs
-
-
 def extract_output_files(
     cwl_obj: CommandLineTool,
     inputs: dict,
@@ -434,6 +399,8 @@ def extract_and_translate_input_files(cwl_inputs) -> dict[str, Any]:
 
         elif isinstance(input_value, File):
             input_value.path = update_inputs(input_value)
+        elif isinstance(input_value, str) and input_value.startswith(LFN_PREFIX):
+            cwl_inputs[key] = Path(input_value.removeprefix(LFN_PREFIX)).name
 
     return {
         "InputDesc": cwl_inputs,

{ctadirac-2.2.80 → ctadirac-2.2.82}/src/CTADIRAC/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.2.80'
-__version_tuple__ = version_tuple = (2, 2, 80)
+__version__ = version = '2.2.82'
+__version_tuple__ = version_tuple = (2, 2, 82)

{ctadirac-2.2.80 → ctadirac-2.2.82/src/CTADIRAC.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: CTADIRAC
-Version: 2.2.80
+Version: 2.2.82
 Summary: CTADIRAC is an extension of the DIRAC interware for dedicated CTA usage.
 Author-email: Luisa Arrabito <arrabito@in2p3.fr>
 License: BSD 3-Clause License

{ctadirac-2.2.80 → ctadirac-2.2.82}/tests/unit/api/test_cwl_job.py

@@ -2,7 +2,7 @@ import xml.etree.ElementTree as ET
 from pathlib import Path
 
 import pytest
-
+from cwl_utils.parser import save
 from CTADIRAC.Interfaces.API.CWLJob import CWLJob
 from CTADIRAC.Interfaces.Utilities.CWL_utils import (
     LFN_DIRAC_PREFIX,
@@ -225,6 +225,12 @@ def test_datapipe_cwl_job(mock_submit_job):
         == "LFN:/ctao/simpipe/prod6/gamma-diffuse/010xxx/gamma_cone10_run010000.simtel.zst"
     )
 
+    assert save(job.transformed_inputs) == {
+        "dl0": {"class": "File", "path": "gamma_cone10_run010000.simtel.zst"},
+        "processing_config": {"class": "File", "path": "process_config.yaml"},
+        "dl1_filename": "test.dl1.h5",
+    }
+
     result = job.submit()
     mock_submit_job.assert_called_once_with(job)
     result_xml = ET.fromstring(result)

{ctadirac-2.2.80 → ctadirac-2.2.82}/tests/unit/api/test_cwl_utils.py

@@ -158,6 +158,21 @@ def test_translate_sandboxes_and_lfns(file_input, expected_result, expected_lfn)
                 "InputData": [],
             },
         ),
+        # Test that a input string containing "lfn" is correctly treated.
+        (
+            {
+                "input1": File(path="some/path/test_local_file1.txt"),
+                "input2": f"{LFN_PREFIX}/ctao/path/test.h5",
+            },
+            {
+                "InputDesc": {
+                    "input1": File(path="test_local_file1.txt"),
+                    "input2": "test.h5",
+                },
+                "InputSandbox": ["some/path/test_local_file1.txt"],
+                "InputData": [],
+            },
+        ),
     ],
 )
 def test_extract_and_translate_input_files(input_data, expected_result):