LbAPLocal 0.15.0__tar.gz → 0.16.0__tar.gz

{lbaplocal-0.15.0 → lbaplocal-0.16.0}/.gitlab-ci.yml

@@ -12,6 +12,15 @@ stages:
   - test
   - deploy
 
+include:
+  - remote: https://raw.githubusercontent.com/chrisburr/release/888e9de9c33649c558cd319de367e7520219322e/gitlab/trusted-publish.yml
+    inputs:
+      feedstock: lbaplocal-feedstock
+      repository: chrisburr/release
+      ref: 888e9de9c33649c558cd319de367e7520219322e
+      rules:
+        - if: $CI_COMMIT_TAG && $CI_PROJECT_PATH == "lhcb-dpa/analysis-productions/lbaplocal"
+
 pixi:
   parallel:
     matrix:
@@ -57,3 +66,8 @@ deploy-packages:
     - python -m build
     - if [ -z "$TWINE_PASSWORD" ] ; then echo "Set TWINE_PASSWORD in CI variables" ; exit 1 ; fi
     - twine upload -u __token__ dist/*
+
+# Ask conda-forge to update the feedstock once the release is on PyPI
+update-feedstock-version:
+  needs:
+    - deploy-packages

{lbaplocal-0.15.0 → lbaplocal-0.16.0}/PKG-INFO

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

{lbaplocal-0.15.0 → lbaplocal-0.16.0}/src/LbAPLocal/cli/main.py

@@ -1768,11 +1768,11 @@ def test(
     ] = None,
     job_name: Annotated[Optional[str], typer.Argument(help="Job name to test")] = None,
     dependent_input: Annotated[
-        Optional[str],
+        Optional[list[str]],
         typer.Option(
             "-i",
             "--input",
-            help="Specific input file (LFN or local path)",
+            help="Specific input file (LFN or local path); repeat for multiple files",
         ),
     ] = None,
     interactive: Annotated[
@@ -1850,6 +1850,7 @@ def test(
         lb-ap test                                     # Interactive wizard
         lb-ap test MyAnalysis MyJob                    # Uses 1 LFN by default
         lb-ap test MyAnalysis MyJob -n 100             # Slice input to 100 events
+        lb-ap test MyAnalysis MyJob -i LFN:/lhcb/... -i ./local.dst  # Custom inputs
         lb-ap test MyAnalysis MyJob --download         # Download input files locally
         lb-ap test MyAnalysis MyJob --n-lfns 5         # Test with 5 LFNs
         lb-ap test MyAnalysis MyJob --pick-smallest-lfn  # Use smallest LFN
@@ -3902,11 +3903,11 @@ def cwl_test(
     ] = None,
     job_name: Annotated[Optional[str], typer.Argument(help="Job name to test")] = None,
     dependent_input: Annotated[
-        Optional[str],
+        Optional[list[str]],
         typer.Option(
             "-i",
             "--input",
-            help="Specific input file (LFN or local path)",
+            help="Specific input file (LFN or local path); repeat for multiple files",
         ),
     ] = None,
     n_events: Annotated[
@@ -4007,7 +4008,8 @@ def cwl_test(
 
         production_name = params["production_name"]
         job_name = params["job_name"]
-        dependent_input = params.get("dependent_input") or dependent_input
+        if params.get("dependent_input"):
+            dependent_input = [params["dependent_input"]]
         n_events = params.get("n_events") or n_events
         skip_validation = params.get("skip_validation", skip_validation)
 
@@ -4050,7 +4052,7 @@ def cwl_test(
             f"[cyan]Production:[/cyan] {production_name}\n"
             f"[cyan]Job:[/cyan] {job_name}\n"
             f"[cyan]Events:[/cyan] {n_events or 'default'}\n"
-            f"[cyan]Input:[/cyan] {dependent_input or 'default'}\n"
+            f"[cyan]Input:[/cyan] {', '.join(dependent_input) if dependent_input else 'default'}\n"
             f"[cyan]Output:[/cyan] {output_dir}",
             title="🧪 CWL Test Configuration",
             border_style="cyan",
@@ -4124,9 +4126,18 @@ def cwl_test(
         console.print(f"\n[bold cyan]Slicing input to {n_events} events[/bold cyan]")
         slice_dir = output_dir / "sliced_input"
 
-        if dependent_input and not dependent_input.startswith("LFN:"):
+        # Slicing produces a single N-event file, so only the first custom
+        # input is used.
+        slice_source = dependent_input[0] if dependent_input else None
+        if dependent_input and len(dependent_input) > 1:
+            console.print(
+                f"[yellow]⚠ -n slices a single file; using only the first input "
+                f"({slice_source}) and ignoring {len(dependent_input) - 1} other(s)[/yellow]"
+            )
+
+        if slice_source and not slice_source.startswith("LFN:"):
             # Case B: Custom local file — slice directly
-            input_for_slice = str(Path(dependent_input).resolve())
+            input_for_slice = str(Path(slice_source).resolve())
         else:
             # Case A (no -i) or Case C (-i with LFN): need to resolve a PFN
             import importlib.util
@@ -4140,9 +4151,9 @@ def cwl_test(
 
             slice_map_path = output_dir / "slice-replica-map.json"
 
-            if dependent_input and dependent_input.startswith("LFN:"):
+            if slice_source and slice_source.startswith("LFN:"):
                 # Case C: Custom LFN input
-                lfn_path = dependent_input.removeprefix("LFN:")
+                lfn_path = slice_source.removeprefix("LFN:")
                 cmd_map = [
                     "lb-dirac",
                     "python",
@@ -4223,7 +4234,7 @@ def cwl_test(
         )
 
         # Replace dependent_input with the sliced local file
-        dependent_input = str(sliced_path)
+        dependent_input = [str(sliced_path)]
 
     # Step 2b: Resolve/rewrite input data for execution.
     #
@@ -4236,6 +4247,8 @@ def cwl_test(
     #   specific LFN), then rewrite the CWL with the resolved PFN string --
     #   never pass an unresolved "LFN:..." string to
     #   rewrite_cwl_for_custom_input, which raises on that.
+    # -i may be repeated and may mix B and C; all LFNs are resolved in one
+    # replica-map call and the inputs keep their command-line order.
     cwl_inputs_path = None
     # NOTE: replica_map_path is a user-facing debug artifact (and, in the
     # LFN case, the resolve_lfn_to_pfn input); unlike the retired DIRAC-based
@@ -4243,16 +4256,79 @@ def cwl_test(
     # resolved PFNs flow through the inputs YAML instead.
     replica_map_path = None
 
-    def rewrite_for_custom_input(input_value):
-        """Rewrite the CWL for a resolved custom input, exiting on failure."""
+    if dependent_input:
+        # Strip the LFN: prefix — DIRAC APIs expect bare paths
+        custom_lfns = [
+            item.removeprefix("LFN:")
+            for item in dependent_input
+            if item.startswith("LFN:")
+        ]
+        lfn_pfn_map = {}
+        if custom_lfns:
+            console.print(
+                f"\n[bold cyan]Generating replica map for {len(custom_lfns)} "
+                f"custom input LFN(s)[/bold cyan]"
+            )
+            import importlib.util
+
+            spec = importlib.util.find_spec("LbAPLocal.cwl.generate_replica_map")
+            if spec is None or spec.origin is None:
+                err_console.print(
+                    "[bold red]✗ Could not find LbAPLocal.cwl.generate_replica_map module[/bold red]"
+                )
+                raise typer.Exit(code=1)
+
+            map_path = output_dir / f"{cwl_workflow_path.stem}-replica-map.json"
+            cmd_map = ["lb-dirac", "python", spec.origin]
+            for lfn_path in custom_lfns:
+                cmd_map += ["--lfns", lfn_path]
+            cmd_map += ["--output-map", str(map_path)]
+            if download:
+                cmd_map.append("--download")
+            result = subprocess.run(cmd_map, capture_output=True, text=True)
+            if result.returncode != 0:
+                # generate_replica_map prints errors to stdout via rich Console
+                error_output = result.stderr or result.stdout
+                err_console.print(
+                    f"[bold red]✗ Failed to generate replica map:[/bold red]\n{error_output}"
+                )
+                raise typer.Exit(code=1)
+            replica_map_path = map_path
+            console.print(f"[green]✓ Generated replica map:[/green] {replica_map_path}")
+
+            from LbAPLocal.cwl.generate_replica_map import resolve_lfn_to_pfn
+
+            lfn_pfn_map = resolve_lfn_to_pfn(map_path)
+            missing = [lfn for lfn in custom_lfns if lfn not in lfn_pfn_map]
+            if missing:
+                err_console.print(
+                    f"[bold red]✗ Replica map has no entry for:[/bold red] "
+                    f"{', '.join(missing)} ({map_path})"
+                )
+                raise typer.Exit(code=1)
+            for lfn in custom_lfns:
+                console.print(
+                    f"[green]✓ Resolved custom input to PFN:[/green] {lfn_pfn_map[lfn]}"
+                )
+
+        resolved_inputs = [
+            (
+                lfn_pfn_map[item.removeprefix("LFN:")]
+                if item.startswith("LFN:")
+                else item
+            )
+            for item in dependent_input
+        ]
+
         from LbAPLocal.cwl.rewrite import rewrite_cwl_for_custom_input
 
         console.print(
-            f"\n[bold cyan]Rewriting CWL for custom input:[/bold cyan] {input_value}"
+            f"\n[bold cyan]Rewriting CWL for custom input(s):[/bold cyan] "
+            f"{', '.join(resolved_inputs)}"
         )
         try:
-            workflow_path, inputs_path = rewrite_cwl_for_custom_input(
-                cwl_workflow_path, [input_value], job_name
+            cwl_workflow_path, cwl_inputs_path = rewrite_cwl_for_custom_input(
+                cwl_workflow_path, resolved_inputs, job_name
             )
         except Exception as e:
             err_console.print(f"[bold red]✗ CWL rewriting failed:[/bold red] {e}")
@@ -4260,65 +4336,8 @@ def cwl_test(
 
             err_console.print(traceback.format_exc())
             raise typer.Exit(code=1)
-        console.print(f"[green]✓ Modified CWL workflow:[/green] {workflow_path}")
-        console.print(f"[green]✓ Custom inputs file:[/green] {inputs_path}")
-        return workflow_path, inputs_path
-
-    if dependent_input and dependent_input.startswith("LFN:"):
-        console.print(
-            "\n[bold cyan]Generating replica map for custom input LFN[/bold cyan]"
-        )
-        import importlib.util
-
-        spec = importlib.util.find_spec("LbAPLocal.cwl.generate_replica_map")
-        if spec is None or spec.origin is None:
-            err_console.print(
-                "[bold red]✗ Could not find LbAPLocal.cwl.generate_replica_map module[/bold red]"
-            )
-            raise typer.Exit(code=1)
-
-        map_path = output_dir / f"{cwl_workflow_path.stem}-replica-map.json"
-        # Strip the LFN: prefix — DIRAC APIs expect bare paths
-        lfn_path = dependent_input.removeprefix("LFN:")
-        cmd_map = [
-            "lb-dirac",
-            "python",
-            spec.origin,
-            "--lfns",
-            lfn_path,
-            "--output-map",
-            str(map_path),
-        ]
-        if download:
-            cmd_map.append("--download")
-        result = subprocess.run(cmd_map, capture_output=True, text=True)
-        if result.returncode != 0:
-            # generate_replica_map prints errors to stdout via rich Console
-            error_output = result.stderr or result.stdout
-            err_console.print(
-                f"[bold red]✗ Failed to generate replica map:[/bold red]\n{error_output}"
-            )
-            raise typer.Exit(code=1)
-        replica_map_path = map_path
-        console.print(f"[green]✓ Generated replica map:[/green] {replica_map_path}")
-
-        from LbAPLocal.cwl.generate_replica_map import resolve_lfn_to_pfn
-
-        lfn_pfn_map = resolve_lfn_to_pfn(map_path)
-        if not lfn_pfn_map:
-            err_console.print(
-                f"[bold red]✗ Replica map contains no entries:[/bold red] {map_path}"
-            )
-            raise typer.Exit(code=1)
-        resolved_input = next(iter(lfn_pfn_map.values()))
-        console.print(
-            f"[green]✓ Resolved custom input to PFN:[/green] {resolved_input}"
-        )
-
-        cwl_workflow_path, cwl_inputs_path = rewrite_for_custom_input(resolved_input)
-
-    elif dependent_input:
-        cwl_workflow_path, cwl_inputs_path = rewrite_for_custom_input(dependent_input)
+        console.print(f"[green]✓ Modified CWL workflow:[/green] {cwl_workflow_path}")
+        console.print(f"[green]✓ Custom inputs file:[/green] {cwl_inputs_path}")
 
     else:
         # Resolve input data for the default (no -i) case: BK query from the

{lbaplocal-0.15.0 → lbaplocal-0.16.0}/src/LbAPLocal.egg-info/PKG-INFO

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

lbaplocal-0.16.0/src/LbAPLocal.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "0.16.0",
+  "distance": 0,
+  "node": "gc92615b0f05b80a84cfe467f7d4176dd8f00fc95",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-10-06"
+}

{lbaplocal-0.15.0 → lbaplocal-0.16.0}/tests/test_execute.py

@@ -114,7 +114,7 @@ def test_cwl_test_custom_input_lfn(
         cwl_test(
             production_name=cwl_fixture_set.production_name,
             job_name=job_name,
-            dependent_input=f"LFN:{lfn}",
+            dependent_input=[f"LFN:{lfn}"],
             skip_validation=True,
             output_dir=output_dir,
         )
@@ -153,6 +153,59 @@ def test_cwl_test_custom_input_lfn(
     assert root_outputs, f"No .root output file found under {cwl_output}"
 
 
+@pytest.mark.slow
+def test_cwl_test_multiple_custom_inputs(
+    data_pkg_repo, mock_dirac_calls, cwl_fixture_set, tmp_path, monkeypatch
+):
+    """Test repeated `-i` mixing an LFN and a local path.
+
+    Both inputs must reach the rewritten CWL's `custom-input` entries in
+    command-line order, with the LFN resolved via the replica map. The two
+    inputs are distinct fixture DSTs: Gaudi crashes opening two files that
+    share a GUID, so a copy of the same DST can't be used.
+    """
+    import typer
+
+    from LbAPLocal.cli.main import cwl_test
+
+    monkeypatch.setattr(
+        LbAPLocal.cli,
+        "get_auth_headers",
+        lambda: dict(headers={"Authorization": "Bearer "}),
+    )
+
+    job_name = "2016_MagDown_PromptMC_D02KK"
+    lfn = cwl_fixture_set.get_lfn(job_name)
+    dst_path = cwl_fixture_set.get_dst_path(job_name)
+    local_path = cwl_fixture_set.get_dst_path("2016_MagUp_PromptMC_D02KK")
+
+    output_dir = tmp_path / "cwl_output"
+
+    try:
+        cwl_test(
+            production_name=cwl_fixture_set.production_name,
+            job_name=job_name,
+            dependent_input=[f"LFN:{lfn}", str(local_path)],
+            skip_validation=True,
+            output_dir=output_dir,
+        )
+    except (typer.Exit, SystemExit) as e:
+        exit_code = getattr(e, "exit_code", getattr(e, "code", 1))
+        pytest.fail(f"cwl_test exited with code {exit_code}")
+
+    custom_inputs_files = list(output_dir.glob("*_custom_inputs.yml"))
+    assert custom_inputs_files, "No custom inputs file generated"
+    custom_inputs = yaml.safe_load(custom_inputs_files[0].read_text())
+    entries = custom_inputs["custom-input"]
+    assert [e["class"] for e in entries] == ["File", "File"]
+    assert [e["location"] for e in entries] == [
+        dst_path.resolve().as_uri(),
+        local_path.resolve().as_uri(),
+    ]
+
+    assert list(output_dir.glob("*-replica-map.json")), "No replica map generated"
+
+
 # ============================================================================
 # Legacy tests (deprecated, kept temporarily)
 # ============================================================================

lbaplocal-0.15.0/src/LbAPLocal.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "0.15.0",
-  "distance": 0,
-  "node": "g9bb93815ef9dd1fb277f618aba2545808563f636",
-  "dirty": false,
-  "branch": "HEAD",
-  "node_date": "2026-08-27"
-}