LbAPLocal 0.9.3__tar.gz → 0.9.5__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: LbAPLocal
-Version: 0.9.3
+Version: 0.9.5
 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.3 → lbaplocal-0.9.5}/src/LbAPLocal/cli/main.py

@@ -115,13 +115,13 @@ _TIPS = [
     "Use [bold cyan]lb-ap test --pretty[/] for a split-view of real-time logs",
     "Use [bold cyan]lb-ap list --tree[/] for a tree view of productions and jobs",
     "Use [bold cyan]lb-ap test --dry-run[/] to validate config without running",
-    "Use [bold cyan]lb-ap test --pick-smallest-lfn[/] for faster testing with small files",
-    "Use [bold cyan]lb-ap clone[/] with no args for an interactive wizard",
+    "Use [bold cyan]lb-ap clone[/] to quickly clone a repository with the right branch or tag",
     "Use [bold cyan]lb-ap -b my-branch test ...[/] to auto-clone and test a branch",
     "Use [bold cyan]lb-ap test -i local.dst ...[/] to test with a local input file",
+    "Use [bold cyan]lb-ap test -i LFN:/lhcb/.../gridfile.dst ...[/] to test with a file on the grid",
     "Use [bold cyan]lb-ap make-reproducer -s single-event[/] for the smallest tarball",
     "Use [bold cyan]lb-ap -C /path/to/repo list[/] to run from a different directory",
-    "Use [bold cyan]lb-ap test --n-lfns 5 --pick-smallest-lfn[/] to test with multiple small files",
+    "Use [bold cyan]lb-ap test --n-lfns 1 --pick-smallest-lfn[/] to test with the smallest file available",
     "Use [bold cyan]lb-ap checkout -w[/] for an interactive checkout wizard",
     "Use [bold cyan]lb-ap versions[/] to list available production versions",
     "Clones are cached in [dim]~/.cache/lbaplocal/clones/[/] for reuse",
@@ -460,11 +460,11 @@ def main(
     rich formatting, better error messages, and CWL workflow integration.
 
     Use -C to run commands from a different directory:
-        lb-ap-exp -C /path/to/AnalysisProductions list
+        lb-ap -C /path/to/AnalysisProductions list
 
     Use --branch to auto-clone or checkout a branch:
-        lb-ap-exp --branch my-feature list
-        lb-ap-exp -C /path/to/repo --branch my-feature test MyJob
+        lb-ap --branch my-feature list
+        lb-ap -C /path/to/repo --branch my-feature test MyJob
     """
     # Determine version string
     try:
@@ -1025,21 +1025,21 @@ def versions(
     working group and production name.
 
     Examples:
-        lb-ap-exp versions
-        lb-ap-exp versions charm MyAnalysis
+        lb-ap versions
+        lb-ap versions charm MyAnalysis
     """
     if not production_name and not working_group:
         err_console.print(
             "[bold yellow]⚠ Version querying currently requires both working group "
             "and production name[/bold yellow]\n"
-            "Usage: [cyan]lb-ap-exp versions WORKING_GROUP PRODUCTION_NAME[/cyan]"
+            "Usage: [cyan]lb-ap versions WORKING_GROUP PRODUCTION_NAME[/cyan]"
         )
         raise typer.Exit(code=1)
 
     if working_group and not production_name:
         err_console.print(
             "[bold yellow]⚠ Please specify both working group and production name[/bold yellow]\n"
-            "Usage: [cyan]lb-ap-exp versions WORKING_GROUP PRODUCTION_NAME[/cyan]"
+            "Usage: [cyan]lb-ap versions WORKING_GROUP PRODUCTION_NAME[/cyan]"
         )
         raise typer.Exit(code=1)
 
@@ -1114,19 +1114,19 @@ def clone(
 
     **Branch Mode** (1 argument):
       Clone and checkout/create a branch for general development
-      Example: lb-ap-exp clone my-feature-branch
+      Example: lb-ap clone my-feature-branch
 
     **Production Mode** (4 arguments):
       Clone and checkout a specific production version to a NEW branch
-      Example: lb-ap-exp clone charm MyAnalysis v1.0 my-new-branch
+      Example: lb-ap clone charm MyAnalysis v1.0 my-new-branch
 
     If no arguments: Interactive wizard
 
     Examples:
-        lb-ap-exp clone                                    # Interactive wizard
-        lb-ap-exp clone master                             # Branch mode: checkout master
-        lb-ap-exp clone my-feature                         # Branch mode: create 'my-feature'
-        lb-ap-exp clone charm MyAnalysis v1.0 work-branch  # Production mode
+        lb-ap clone                                    # Interactive wizard
+        lb-ap clone master                             # Branch mode: checkout master
+        lb-ap clone my-feature                         # Branch mode: create 'my-feature'
+        lb-ap clone charm MyAnalysis v1.0 work-branch  # Production mode
     """
     # Auto-detect clone type if not specified
     if clone_type is None:
@@ -1352,9 +1352,9 @@ def checkout(
     If arguments are omitted, an interactive wizard will guide you through the process.
 
     Examples:
-        lb-ap-exp checkout                                 # Interactive wizard
-        lb-ap-exp checkout charm MyAnalysis v1.0 my-branch
-        lb-ap-exp checkout beauty Analysis v2.1 test --allow-deletes
+        lb-ap checkout                                 # Interactive wizard
+        lb-ap checkout charm MyAnalysis v1.0 my-branch
+        lb-ap checkout beauty Analysis v2.1 test --allow-deletes
     """
     # Use wizard if arguments missing or interactive mode requested
     if interactive or not all([working_group, production_name, version, branch_name]):
@@ -1404,9 +1404,9 @@ def list_productions(
     List all available production folders, or jobs within a specific production.
 
     Examples:
-        lb-ap-exp list
-        lb-ap-exp list MyAnalysis
-        lb-ap-exp list MyAnalysis --tree
+        lb-ap list
+        lb-ap list MyAnalysis
+        lb-ap list MyAnalysis --tree
     """
     try:
         inside_ap_datapkg()
@@ -3387,6 +3387,7 @@ def cwl_test(
 
     # Step 2b: Rewrite CWL for custom input (if provided)
     cwl_inputs_path = None
+    replica_map_path = None
     if dependent_input:
         from LbAPLocal.cwl.rewrite import rewrite_cwl_for_custom_input
 
@@ -3408,6 +3409,39 @@ def cwl_test(
             err_console.print(traceback.format_exc())
             raise typer.Exit(code=1)
 
+        # Generate replica map for LFN custom inputs so the executor can resolve them
+        if 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"
+            cmd_map = [
+                "lb-dirac",
+                "python",
+                spec.origin,
+                "--lfns",
+                dependent_input,
+                "--output-map",
+                str(map_path),
+            ]
+            result = subprocess.run(cmd_map, capture_output=True, text=True)
+            if result.returncode != 0:
+                err_console.print(
+                    f"[bold red]✗ Failed to generate replica map:[/bold red]\n{result.stderr}"
+                )
+                raise typer.Exit(code=1)
+            replica_map_path = map_path
+            console.print(f"[green]✓ Generated replica map:[/green] {replica_map_path}")
+
     # Step 3: Execute CWL workflow
     console.print("\n[bold cyan]Step 3/3: Executing CWL workflow[/bold cyan]")
 
@@ -3511,6 +3545,8 @@ def cwl_test(
         cmd.append("--verbose")
         cmd.extend(["--preserve-environment", "CMAKE_PREFIX_PATH"])
         cmd.extend(["--preserve-environment", "ANALYSIS_PRODUCTIONS_DYNAMIC"])
+        if replica_map_path:
+            cmd.extend(["--replica-map", str(replica_map_path)])
 
     # Add workflow file
     cmd.append(str(cwl_workflow_path.resolve()))

{lbaplocal-0.9.3 → lbaplocal-0.9.5}/src/LbAPLocal/cli/wizards.py

@@ -106,7 +106,7 @@ def clone_wizard() -> dict:
     )
 
     console.print("\n[bold cyan]Step 3:[/bold cyan] Version")
-    console.print("[dim]Tip: Use 'lb-ap-exp versions' to see available versions[/dim]")
+    console.print("[dim]Tip: Use 'lb-ap versions' to see available versions[/dim]")
     version = Prompt.ask(
         "Enter version tag",
         default="master",
@@ -286,7 +286,7 @@ def test_wizard(productions: Optional[List[str]] = None) -> dict:
                 job_name = Prompt.ask("Enter job name")
         else:
             console.print(
-                "[dim]Tip: Use 'lb-ap-exp list <production>' to see available jobs[/dim]"
+                "[dim]Tip: Use 'lb-ap list <production>' to see available jobs[/dim]"
             )
             job_name = Prompt.ask("Enter job name")
     except Exception as e:

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

@@ -439,7 +439,7 @@ def do_bkquery(
         for record in records:
             lfn = record[filenameIndex]
             replica_result = returnValueOrRaise(
-                DataManager().getReplicasForJobs([lfn], diskOnly=True)
+                DataManager().getReplicasForJobs([lfn], diskOnly=True, protocol="root")
             )
             inputFiles.extend(replica_result["Successful"])
             if len(inputFiles) == numTestLFNs:
@@ -495,12 +495,10 @@ app = typer.Typer(
 
 @app.command()
 def main(
-    cwl_file: Path = typer.Argument(
-        ...,
-        help="Path to CWL file with dirac:Production hint",
-        exists=True,
+    cwl_file: Path | None = typer.Argument(
+        None,
+        help="Path to CWL file with dirac:Production hint (not needed when --lfns is provided)",
         dir_okay=False,
-        readable=True,
     ),
     n_lfns: int | None = typer.Option(
         None,
@@ -518,18 +516,23 @@ def main(
         "--download",
         help="Download input files locally instead of using remote protocol where available",
     ),
-    output_yaml: Path = typer.Option(
+    output_yaml: Path | None = typer.Option(
         None,
         "--output-yaml",
         "-o",
         help="Output path for CWL input YAML file (default: <cwl_file>-inputs.yml)",
     ),
-    output_map: Path = typer.Option(
+    output_map: Path | None = typer.Option(
         None,
         "--output-map",
         "-c",
         help="Output path for replica map JSON (default: <cwl_file>-replica-map.json)",
     ),
+    lfns: list[str] = typer.Option(
+        [],
+        "--lfns",
+        help="LFN paths to use directly, bypassing the Bookkeeping query (requires --output-map)",
+    ),
     verbose: bool = typer.Option(
         False,
         "--verbose",
@@ -544,15 +547,24 @@ def main(
 
     1. A CWL input YAML file with the input-data parameter
     2. A replica map JSON file for local execution
+
+    Alternatively, pass --lfns to skip the Bookkeeping query and generate a replica map
+    directly for specific LFNs (e.g. when using a custom input file).
     """
     if verbose:
         logger.setLevel(logging.DEBUG)
 
-    # Validate flags
-    if pick_smallest and n_lfns is None:
-        console.print(
-            "[red]Error:[/red] --pick-smallest-lfn requires --n-lfns to be specified"
-        )
+    # Validate: require either cwl_file or --lfns
+    if not lfns and cwl_file is None:
+        console.print("[red]Error:[/red] Provide a CWL file or use --lfns")
+        raise typer.Exit(1)
+
+    if lfns and cwl_file is not None:
+        console.print("[red]Error:[/red] --lfns and a CWL file are mutually exclusive")
+        raise typer.Exit(1)
+
+    if cwl_file is not None and not cwl_file.exists():
+        console.print(f"[red]Error:[/red] CWL file not found: {cwl_file}")
         raise typer.Exit(1)
 
     # initialise dirac first
@@ -560,61 +572,83 @@ def main(
 
     DIRAC.initialize()
 
-    # Set default output paths if not provided
-    if output_yaml is None:
-        output_yaml = cwl_file.parent / f"{cwl_file.stem}-inputs.yml"
-    if output_map is None:
-        output_map = cwl_file.parent / f"{cwl_file.stem}-replica-map.json"
-
-    # Read the CWL file and extract inputDataset hint
-    logger.info(f"Reading CWL file: {cwl_file}")
-    with open(cwl_file, "r") as f:
-        cwl_content = yaml.safe_load(f)
-
-    # Find the dirac:Production hint
-    hints = cwl_content.get("hints", [])
-    input_dataset_dict = None
-    for hint in hints:
-        if hint.get("class") == "dirac:Production":
-            input_dataset_dict = hint
-            break
-
-    if not input_dataset_dict:
-        console.print("[red]Error:[/red] No dirac:Production hint found in CWL file")
-        console.print(
-            "Expected a hint with class='dirac:Production' in the 'hints' section"
-        )
-        raise typer.Exit(1)
+    if lfns:
+        # --- Direct LFN mode: skip BK query, resolve the provided LFNs ---
+        lfns_list = list(lfns)
+        logger.info(f"Using {len(lfns_list)} LFN(s) provided via --lfns")
 
-    # Parse into InputDataset model
-    try:
-        input_dataset_outer = InputDataset(**input_dataset_dict)
-    except Exception as e:
-        console.print(f"[red]Error:[/red] Failed to parse dirac:Production hint: {e}")
-        raise typer.Exit(1)
+        if output_map is None:
+            console.print(
+                "[red]Error:[/red] --output-map is required when using --lfns"
+            )
+            raise typer.Exit(1)
+
+    else:
+        # --- CWL hint mode: query BK and resolve LFNs from the hint ---
+        if pick_smallest and n_lfns is None:
+            console.print(
+                "[red]Error:[/red] --pick-smallest-lfn requires --n-lfns to be specified"
+            )
+            raise typer.Exit(1)
+
+        # Set default output paths if not provided
+        if output_yaml is None:
+            output_yaml = cwl_file.parent / f"{cwl_file.stem}-inputs.yml"
+        if output_map is None:
+            output_map = cwl_file.parent / f"{cwl_file.stem}-replica-map.json"
+
+        # Read the CWL file and extract inputDataset hint
+        logger.info(f"Reading CWL file: {cwl_file}")
+        with open(cwl_file, "r") as f:
+            cwl_content = yaml.safe_load(f)
+
+        # Find the dirac:Production hint
+        hints = cwl_content.get("hints", [])
+        input_dataset_dict = None
+        for hint in hints:
+            if hint.get("class") == "dirac:Production":
+                input_dataset_dict = hint
+                break
 
-    input_dataset = input_dataset_outer.input_dataset_config
+        if not input_dataset_dict:
+            console.print(
+                "[red]Error:[/red] No dirac:Production hint found in CWL file"
+            )
+            console.print(
+                "Expected a hint with class='dirac:Production' in the 'hints' section"
+            )
+            raise typer.Exit(1)
+
+        # Parse into InputDataset model
+        try:
+            input_dataset_outer = InputDataset(**input_dataset_dict)
+        except Exception as e:
+            console.print(
+                f"[red]Error:[/red] Failed to parse dirac:Production hint: {e}"
+            )
+            raise typer.Exit(1)
 
-    logger.info("Found dirac:Production hint:")
-    logger.info(f"  Event Type: {input_dataset.event_type}")
-    logger.info(
-        f"  Config: {input_dataset.conditions_dict.configName}/{input_dataset.conditions_dict.configVersion}"
-    )
-    logger.info(f"  Processing Pass: {input_dataset.conditions_dict.inProPass}")
+        input_dataset = input_dataset_outer.input_dataset_config
 
-    # Query Bookkeeping for LFNs
-    try:
-        lfns_list = do_bkquery(
-            input_dataset, numTestLFNs=n_lfns, pick_smallest=pick_smallest
+        logger.info("Found dirac:Production hint:")
+        logger.info(f"  Event Type: {input_dataset.event_type}")
+        logger.info(
+            f"  Config: {input_dataset.conditions_dict.configName}/{input_dataset.conditions_dict.configVersion}"
         )
-    except Exception as e:
-        console.print(f"[red]Error:[/red] Bookkeeping query failed: {e}")
-        raise typer.Exit(1)
+        logger.info(f"  Processing Pass: {input_dataset.conditions_dict.inProPass}")
 
-    logger.info(f"Retrieved {len(lfns_list)} LFNs")
+        # Query Bookkeeping for LFNs
+        try:
+            lfns_list = do_bkquery(
+                input_dataset, numTestLFNs=n_lfns, pick_smallest=pick_smallest
+            )
+        except Exception as e:
+            console.print(f"[red]Error:[/red] Bookkeeping query failed: {e}")
+            raise typer.Exit(1)
 
-    # Generate replica map using DIRAC
+        logger.info(f"Retrieved {len(lfns_list)} LFNs")
 
+    # Generate replica map using DIRAC
     logger.info("Generating replica map with DIRAC...")
     try:
         replica_map = dirac_make_replica_map(
@@ -629,28 +663,28 @@ def main(
         console.print(f"[red]Error:[/red] Failed to generate replica map: {e}")
         raise typer.Exit(1)
 
-    # Generate CWL input YAML file
-    cwl_inputs = {
-        "input-data": [
-            {
-                "class": "File",
-                "location": f"LFN:{lfn}",
-            }
-            for lfn in lfns_list
-        ]
-    }
-
-    logger.info(f"Writing CWL input YAML to: {output_yaml}")
-    with open(output_yaml, "w") as f:
-        yaml.dump(cwl_inputs, f, default_flow_style=False, sort_keys=False)
+    # Write CWL input YAML (only in CWL hint mode or when output_yaml is explicitly provided)
+    if output_yaml is not None:
+        cwl_inputs = {
+            "input-data": [
+                {
+                    "class": "File",
+                    "location": f"LFN:{lfn}",
+                }
+                for lfn in lfns_list
+            ]
+        }
+        logger.info(f"Writing CWL input YAML to: {output_yaml}")
+        with open(output_yaml, "w") as f:
+            yaml.dump(cwl_inputs, f, default_flow_style=False, sort_keys=False)
 
     logger.info(f"Writing replica map to: {output_map}")
     with open(output_map, "w") as f:
-        # Convert Pydantic model to dict for JSON serialization
         f.write(replica_map.model_dump_json(indent=2))
 
     console.print("\n[green]✓[/green] Successfully generated:")
-    console.print(f"  • Input YAML: {output_yaml}")
+    if output_yaml is not None:
+        console.print(f"  • Input YAML: {output_yaml}")
     console.print(f"  • Replica map: {output_map}")
     console.print(f"\nRetrieved {len(lfns_list)} LFN(s)")
 

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

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