LbAPLocal 0.9.5__tar.gz → 0.9.7__tar.gz

{lbaplocal-0.9.5 → lbaplocal-0.9.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: LbAPLocal
-Version: 0.9.5
+Version: 0.9.7
 Summary: Tool to locally run tests for AnalysisProductions
 Author: LHCb
 Project-URL: Homepage, https://gitlab.cern.ch/lhcb-dpa/analysis-productions/lbaplocal

{lbaplocal-0.9.5 → lbaplocal-0.9.7}/src/LbAPLocal/cwl/generate_replica_map.py

@@ -81,7 +81,11 @@ def dirac_make_replica_map(
 
     # Get replicas for jobs from the LFNs
     logger.info(f"Attempting to resolve data for {siteName}")
-    replicaDict = returnValueOrRaise(api.getReplicasForJobs(input_lfns))
+    from DIRAC.DataManagementSystem.Client.DataManager import DataManager
+
+    replicaDict = returnValueOrRaise(
+        DataManager().getReplicasForJobs(input_lfns, diskOnly=True, protocol="root")
+    )
     if replicaDict.get("Failed", {}):
         raise ValueError(
             f"Failed to resolve replicas for LFNs: {replicaDict['Failed']}"

{lbaplocal-0.9.5 → lbaplocal-0.9.7}/src/LbAPLocal/cwl/rewrite.py

@@ -286,12 +286,25 @@ def _add_optional_input(inputs: list[dict], input_id: str) -> None:
 
 
 def _make_input_optional(inputs: list[dict], input_id: str) -> None:
-    """Change an input from required (File[]) to optional (File[]?)."""
+    """Change an input from required (File[]) to optional (File[]?).
+
+    Handles both the shorthand ``"File[]"`` and the expanded
+    ``{"type": "array", "items": "File"}`` representations that
+    cwl_utils.parser.save may produce.
+    """
+    nullable_type = ["null", {"type": "array", "items": "File"}]
     for inp in inputs:
         if inp["id"] == input_id:
             current_type = inp.get("type")
             if current_type == "File[]":
-                inp["type"] = ["null", {"type": "array", "items": "File"}]
+                inp["type"] = nullable_type
+                inp["default"] = None
+            elif (
+                isinstance(current_type, dict)
+                and current_type.get("type") == "array"
+                and current_type.get("items") == "File"
+            ):
+                inp["type"] = nullable_type
                 inp["default"] = None
             break
 
@@ -318,9 +331,15 @@ def _make_output_type_nullable(output: dict) -> None:
         if isinstance(items, list) and "null" in items:
             return
 
-    # Convert File[] to File[]?
+    # Convert File[] to File[]? (handles both shorthand and expanded forms)
     if current_type == "File[]":
         output["type"] = ["null", {"type": "array", "items": "File"}]
+    elif (
+        isinstance(current_type, dict)
+        and current_type.get("type") == "array"
+        and current_type.get("items") == "File"
+    ):
+        output["type"] = ["null", {"type": "array", "items": "File"}]
 
 
 def _build_inputs_yaml(custom_input_files: list[str]) -> dict:

{lbaplocal-0.9.5 → lbaplocal-0.9.7}/src/LbAPLocal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: LbAPLocal
-Version: 0.9.5
+Version: 0.9.7
 Summary: Tool to locally run tests for AnalysisProductions
 Author: LHCb
 Project-URL: Homepage, https://gitlab.cern.ch/lhcb-dpa/analysis-productions/lbaplocal