LbAPLocal 0.9.7__tar.gz → 0.9.9__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: LbAPLocal
-Version: 0.9.7
+Version: 0.9.9
 Summary: Tool to locally run tests for AnalysisProductions
 Author: LHCb
 Project-URL: Homepage, https://gitlab.cern.ch/lhcb-dpa/analysis-productions/lbaplocal
@@ -24,6 +24,7 @@ Requires-Dist: consolemd
 Requires-Dist: mplhep
 Requires-Dist: requests
 Requires-Dist: setuptools
+Requires-Dist: packaging
 Requires-Dist: typer
 Requires-Dist: rich
 Requires-Dist: textual

{lbaplocal-0.9.7 → lbaplocal-0.9.9}/pyproject.toml

@@ -30,6 +30,7 @@ dependencies = [
     "mplhep",
     "requests",
     "setuptools",
+    "packaging",
     "typer",
     "rich",
     "textual",

{lbaplocal-0.9.7 → lbaplocal-0.9.9}/src/LbAPLocal/cli/main.py

@@ -17,6 +17,7 @@ and integration with CWL-based workflows.
 """
 
 import importlib.metadata
+import json
 import os
 import random
 import shlex
@@ -30,6 +31,7 @@ from typing import Annotated, Optional
 import typer
 import yaml
 from LbAPCommon import parse_yaml, render_yaml
+from packaging.version import InvalidVersion, Version
 from rich.console import Console
 from rich.live import Live
 from rich.panel import Panel
@@ -42,6 +44,7 @@ from rich.tree import Tree
 from LbAPLocal.job_slice import run_minimal_reproducer
 
 from ..utils import (
+    LBAPI_HOST,
     available_productions,
     check_production,
     inside_ap_datapkg,
@@ -66,6 +69,9 @@ _BANNER_STAMP = _CACHE_DIR / ".banner_stamp"
 _ANIMATION_STAMP = _CACHE_DIR / ".animation_stamp"
 _BANNER_COOLDOWN_SECS = 3600  # 1 hour
 _ANIMATION_COOLDOWN_SECS = 1800  # 30 minutes
+_VERSION_CHECK_STAMP = _CACHE_DIR / ".version_check"
+_VERSION_CHECK_CACHE = _CACHE_DIR / "version_compat.json"
+_VERSION_CHECK_COOLDOWN_SECS = 7200  # 2 hours
 
 # Commands that always show the banner regardless of cooldown
 _ALWAYS_BANNER_COMMANDS = {"test"}
@@ -158,6 +164,114 @@ def _check_dirac_proxy() -> bool:
         return False
 
 
+def _fetch_version_compatibility() -> dict | None:
+    """Fetch CLI version compatibility info from LbAPI.
+
+    Returns the parsed JSON response, or None if the request fails.
+    """
+    import requests
+
+    try:
+        resp = requests.get(f"{LBAPI_HOST}/cli/compatibility", timeout=3)
+        resp.raise_for_status()
+        data = resp.json()
+        # Cache for future use
+        _CACHE_DIR.mkdir(parents=True, exist_ok=True)
+        _VERSION_CHECK_CACHE.write_text(json.dumps(data))
+        _touch_stamp(_VERSION_CHECK_STAMP)
+        return data
+    except Exception:
+        return None
+
+
+def _check_version_compatibility(version_str: str) -> None:
+    """Check if the installed version is allowed by the server.
+
+    Exits with an error if the version is blocked or below the minimum.
+    Silently passes if the server is unreachable and no cache exists.
+    """
+    if version_str == "dev":
+        return
+
+    try:
+        installed = Version(version_str)
+    except InvalidVersion:
+        return
+
+    # Use cache if fresh, otherwise fetch
+    if not _stamp_expired(_VERSION_CHECK_STAMP, _VERSION_CHECK_COOLDOWN_SECS):
+        try:
+            data = json.loads(_VERSION_CHECK_CACHE.read_text())
+        except Exception:
+            data = _fetch_version_compatibility()
+    else:
+        data = _fetch_version_compatibility()
+
+    if data is None:
+        return  # Offline / unreachable — don't block
+
+    try:
+        minimum = Version(data["minimum_version"])
+    except (KeyError, InvalidVersion):
+        return
+
+    blocked_versions = data.get("blocked_versions", [])
+    message = data.get("message")
+
+    reason = None
+    if version_str in blocked_versions:
+        reason = f"Version [bold red]{version_str}[/bold red] has been blocked due to a known issue."
+    elif installed < minimum:
+        reason = (
+            f"Version [bold red]{version_str}[/bold red] is below the minimum"
+            f" required version [bold cyan]{data['minimum_version']}[/bold cyan]."
+        )
+
+    if reason:
+        parts = [reason]
+        if message:
+            parts.append(f"\n{message}")
+        parts.append(
+            "\n\nTo upgrade:"
+            "\n  • If using LbEnv from CVMFS, close and reopen your session to pick up the latest version"
+            "\n  • Otherwise:  [bold]pip install --upgrade LbAPLocal[/bold]  or"
+            "  [bold]conda update lbaplocal[/bold]"
+        )
+        console.print(
+            Panel(
+                "\n".join(parts),
+                title="⚠ Update Required",
+                border_style="yellow",
+                padding=(1, 2),
+            )
+        )
+        if not Confirm.ask("[yellow]Continue anyway?[/yellow]", default=False):
+            raise typer.Exit(code=1)
+
+
+def _check_git_ssh() -> bool:
+    """Check if SSH access to gitlab.cern.ch (port 7999) works."""
+    try:
+        result = subprocess.run(
+            [
+                "ssh",
+                "-T",
+                "-o",
+                "ConnectTimeout=3",
+                "-o",
+                "StrictHostKeyChecking=accept-new",
+                "-p",
+                "7999",
+                "git@gitlab.cern.ch",
+            ],
+            capture_output=True,
+            timeout=5,
+        )
+        return result.returncode == 0
+    except Exception:
+        return False
+
+
 def _build_banner_content(version: str) -> str:
     """Build the full banner content with logo, tip, links, and context."""
     parts = [BANNER.format(version=version)]
@@ -189,6 +303,13 @@ def _build_banner_content(version: str) -> str:
         else "[dim]Proxy:[/dim] [red]✗[/red]"
     )
 
+    ssh = _check_git_ssh()
+    ctx_items.append(
+        "[dim]Git SSH:[/dim] [green]✓[/green]"
+        if ssh
+        else "[dim]Git SSH:[/dim] [red]✗[/red]"
+    )
+
     cwd = Path.cwd()
     try:
         display_dir = f"~/{cwd.relative_to(Path.home())}"
@@ -328,7 +449,14 @@ def check_kerberos_ticket() -> bool:
 
 
 def get_default_clone_type() -> CloneType:
-    """Determine default clone type based on environment"""
+    """Determine default clone type based on environment.
+
+    Prefers SSH, then Kerberos, then prompts the user.
+    """
+    if _check_git_ssh():
+        console.print("[green]✓ Using SSH authentication (key detected)[/green]")
+        return CloneType.SSH
+
     if check_kerberos_ticket():
         console.print(
             "[green]✓ Using Kerberos authentication (ticket detected)[/green]"
@@ -336,7 +464,7 @@ def get_default_clone_type() -> CloneType:
         return CloneType.KRB5
 
     # Prompt user for preferred method
-    console.print("\n[yellow]No Kerberos ticket detected[/yellow]")
+    console.print("\n[yellow]No SSH key or Kerberos ticket detected[/yellow]")
     console.print("Available clone methods:")
     console.print("  1. SSH (requires SSH key configured)")
     console.print("  2. HTTPS (requires username/password)")
@@ -472,6 +600,9 @@ def main(
     except importlib.metadata.PackageNotFoundError:
         lbaplocal_version = "dev"
 
+    # Check version compatibility (may exit if blocked)
+    _check_version_compatibility(lbaplocal_version)
+
     # Banner: always for "test", otherwise respect 1-hour cooldown
     command = ctx.invoked_subcommand
     show_banner = command in _ALWAYS_BANNER_COMMANDS or _stamp_expired(
@@ -3545,6 +3676,21 @@ def cwl_test(
         cmd.append("--verbose")
         cmd.extend(["--preserve-environment", "CMAKE_PREFIX_PATH"])
         cmd.extend(["--preserve-environment", "ANALYSIS_PRODUCTIONS_DYNAMIC"])
+        # Preserve X509/XRootD authentication variables so that grid
+        # authentication
+        for var in [
+            "X509_USER_PROXY",
+            "X509_USER_CERT",
+            "X509_USER_KEY",
+            "X509_CERT_DIR",
+            "X509_VOMS_DIR",
+            "BEARER_TOKEN",
+            "BEARER_TOKEN_FILE",
+            "XrdSecPROTOCOL",
+        ]:
+            if var in os.environ:
+                cmd.extend(["--preserve-environment", var])
+
         if replica_map_path:
             cmd.extend(["--replica-map", str(replica_map_path)])
 
@@ -3563,6 +3709,19 @@ def cwl_test(
     console.print(
         f"[dim]  ANALYSIS_PRODUCTIONS_DYNAMIC={custom_env.get('ANALYSIS_PRODUCTIONS_DYNAMIC', 'NOT SET')}[/dim]"
     )
+    for var in [
+        "X509_USER_PROXY",
+        "X509_USER_CERT",
+        "X509_USER_KEY",
+        "X509_CERT_DIR",
+        "X509_VOMS_DIR",
+        "BEARER_TOKEN",
+        "BEARER_TOKEN_FILE",
+        "XrdSecPROTOCOL",
+    ]:
+        val = custom_env.get(var)
+        if val:
+            console.print(f"[dim]  {var}={val}[/dim]")
 
     # Verify the fake siteroot structure was created
     ap_link = fake_siteroot / "DBASE" / "AnalysisProductions" / "v999999999999"

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: LbAPLocal
-Version: 0.9.7
+Version: 0.9.9
 Summary: Tool to locally run tests for AnalysisProductions
 Author: LHCb
 Project-URL: Homepage, https://gitlab.cern.ch/lhcb-dpa/analysis-productions/lbaplocal
@@ -24,6 +24,7 @@ Requires-Dist: consolemd
 Requires-Dist: mplhep
 Requires-Dist: requests
 Requires-Dist: setuptools
+Requires-Dist: packaging
 Requires-Dist: typer
 Requires-Dist: rich
 Requires-Dist: textual

{lbaplocal-0.9.7 → lbaplocal-0.9.9}/src/LbAPLocal.egg-info/requires.txt

@@ -9,6 +9,7 @@ consolemd
 mplhep
 requests
 setuptools
+packaging
 typer
 rich
 textual