LbAPLocal 0.10.2__tar.gz → 0.12.0__tar.gz

{lbaplocal-0.10.2 → lbaplocal-0.12.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: LbAPLocal
-Version: 0.10.2
+Version: 0.12.0
 Summary: Tool to locally run tests for AnalysisProductions
 Author: LHCb
 Project-URL: Homepage, https://gitlab.cern.ch/lhcb-dpa/analysis-productions/lbaplocal
@@ -13,9 +13,10 @@ Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: LbAPCommon>=0.15.10
+Requires-Dist: LbAPCommon>=0.19.0
 Requires-Dist: LbProdRun>1.12.2
-Requires-Dist: dirac-cwl>=1.1.3
+Requires-Dist: cwltool>=3.1.20260108
+Requires-Dist: cwl-utils>=0.41
 Requires-Dist: LbDiracWrappers
 Requires-Dist: LbEnv
 Requires-Dist: apd>=0.6.0

{lbaplocal-0.10.2 → lbaplocal-0.12.0}/pyproject.toml

@@ -19,9 +19,11 @@ classifiers = [
 ]
 requires-python = ">=3.12"
 dependencies = [
-    "LbAPCommon>=0.15.10",
+    "LbAPCommon>=0.19.0",
     "LbProdRun>1.12.2",
-    "dirac-cwl>=1.1.3",
+    # floor = oldest verified build that routes JS eval through cwl-utils (set_js_engine)
+    "cwltool>=3.1.20260108",
+    "cwl-utils>=0.41",
     "LbDiracWrappers",
     "LbEnv",
     "apd>=0.6.0",
@@ -57,6 +59,8 @@ testing = [
 [project.scripts]
 lb-ap = "LbAPLocal.cli.main:app"
 lb-ap-legacy = "LbAPLocal.cli.legacy:main"
+lb-ap-run-app = "LbAPLocal.cwl.app_runner:main"
+lb-ap-cwl-run = "LbAPLocal.cwl.runner:app"
 
 [tool.black]
 exclude = '''

lbaplocal-0.12.0/src/LbAPLocal/cli/cvmfs.py

@@ -0,0 +1,37 @@
+###############################################################################
+# (c) Copyright 2026 CERN for the benefit of the LHCb Collaboration           #
+#                                                                             #
+# This software is distributed under the terms of the GNU General Public      #
+# Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
+#                                                                             #
+# In applying this licence, CERN does not waive the privileges and immunities #
+# granted to it by virtue of its status as an Intergovernmental Organization  #
+# or submit itself to any jurisdiction.                                       #
+###############################################################################
+"""Helpers for locating versioned LHCb packages on CVMFS."""
+
+import re
+from fnmatch import fnmatch
+from pathlib import Path
+
+# Matches LHCb version directories like ``v32r48`` or ``v26r4p1``.
+VERSION_PATTERN = re.compile(r"v(\d+)r(\d+)(?:p(\d+))?")
+
+
+def latest_available(path: Path, pattern: str = "v*") -> str:
+    """Return the highest-numbered version directory under ``path``.
+
+    Only directories whose names match ``VERSION_PATTERN`` and the glob
+    ``pattern`` are considered.
+    """
+    matches = {}
+    for version_path in path.iterdir():
+        if not version_path.is_dir():
+            continue
+        version = version_path.name
+        if match := VERSION_PATTERN.fullmatch(version):
+            if not fnmatch(version, pattern):
+                continue
+            version_segments = tuple(0 if x is None else int(x) for x in match.groups())
+            matches[version_segments] = version
+    return max(matches.items())[1]

lbaplocal-0.12.0/src/LbAPLocal/cli/decfile_lexer.py

@@ -0,0 +1,131 @@
+###############################################################################
+# (c) Copyright 2026 CERN for the benefit of the LHCb Collaboration           #
+#                                                                             #
+# This software is distributed under the terms of the GNU General Public      #
+# Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
+#                                                                             #
+# In applying this licence, CERN does not waive the privileges and immunities #
+# granted to it by virtue of its status as an Intergovernmental Organization  #
+# or submit itself to any jurisdiction.                                       #
+###############################################################################
+"""A small Pygments lexer for EvtGen ``.dec`` decay files.
+
+Used to syntax-highlight the decay-file preview in the ``lb-ap generate`` wizard.
+It highlights:
+
+* the structured ``# Key: value`` header (NickName, Descriptor, ...),
+* EvtGen keywords (``Alias``, ``Decay``, ``Enddecay``, ``CDecay``, ...),
+* decay models and numeric branching fractions, and
+* embedded Python inside ``# InsertPythonCode: ... # EndInsertPythonCode``
+  blocks (the code lines are ``#``-commented in the file; we strip the leading
+  ``#`` and lex the remainder as real Python).
+"""
+
+import re
+
+from pygments.lexer import Lexer, RegexLexer, bygroups
+from pygments.lexers.python import PythonLexer
+from pygments.token import (
+    Comment,
+    Keyword,
+    Name,
+    Number,
+    Operator,
+    Text,
+)
+
+# Keywords that introduce statements in a decay file.
+_KEYWORDS = (
+    "Alias",
+    "ChargeConj",
+    "Decay",
+    "Enddecay",
+    "CDecay",
+    "Define",
+    "Particle",
+    "ModelAlias",
+    "JetSetPar",
+    "SetLineshapePW",
+    "ChangeMassMin",
+    "ChangeMassMax",
+    "End",
+)
+
+_PYCODE_START = re.compile(r"^#+\s*InsertPythonCode\b")
+_PYCODE_END = re.compile(r"^#+\s*EndInsertPythonCode\b")
+# A python-code line in the block: leading whitespace + "#" + optional space,
+# then the actual code.
+_PY_PREFIX = re.compile(r"(\s*#\s?)(.*)$")
+
+
+class _DecBaseLexer(RegexLexer):
+    """The non-Python token rules for ``.dec`` files."""
+
+    name = "DecFileBase"
+
+    tokens = {
+        "root": [
+            # Header metadata lines: "# NickName: value"
+            (
+                r"^(#\s*)([A-Za-z][\w ]*?)(:)(.*)$",
+                bygroups(Comment, Name.Attribute, Operator, Comment),
+            ),
+            # Plain comments
+            (r"#.*$", Comment),
+            # Statement keywords
+            (r"\b(?:%s)\b" % "|".join(_KEYWORDS), Keyword),
+            # Branching fractions / numbers
+            (r"[-+]?\d+\.\d+(?:[eE][-+]?\d+)?", Number.Float),
+            (r"[-+]?\d+", Number.Integer),
+            # Decay arrows / operators
+            (r"->|,", Operator),
+            # Particle names (incl. the usual EvtGen punctuation)
+            (r"[A-Za-z][\w*+\-/'~()]*", Name),
+            (r"\s+", Text),
+            (r".", Text),
+        ],
+    }
+
+
+class DecFileLexer(Lexer):
+    """Highlight ``.dec`` files, delegating embedded Python to ``PythonLexer``."""
+
+    name = "DecFile"
+    aliases = ["dec", "decfile"]
+    filenames = ["*.dec"]
+
+    def __init__(self, **options):
+        super().__init__(**options)
+        self._base = _DecBaseLexer(**options)
+        self._python = PythonLexer(**options)
+
+    def get_tokens_unprocessed(self, text):
+        pos = 0
+        in_python = False
+        for line in text.splitlines(keepends=True):
+            newline = "\n" if line.endswith("\n") else ""
+            body = line[: -len(newline)] if newline else line
+            stripped = body.strip()
+
+            if not in_python and _PYCODE_START.match(stripped):
+                yield from self._emit(self._base, line, pos)
+                in_python = True
+            elif in_python and _PYCODE_END.match(stripped):
+                yield from self._emit(self._base, line, pos)
+                in_python = False
+            elif in_python and (match := _PY_PREFIX.match(body)):
+                prefix, code = match.group(1), match.group(2)
+                # The "# " comment prefix, then the code lexed as real Python.
+                yield pos, Comment, prefix
+                yield from self._emit(self._python, code, pos + len(prefix))
+                if newline:
+                    yield pos + len(prefix) + len(code), Text, newline
+            else:
+                yield from self._emit(self._base, line, pos)
+
+            pos += len(line)
+
+    @staticmethod
+    def _emit(lexer, chunk, offset):
+        for index, token, value in lexer.get_tokens_unprocessed(chunk):
+            yield offset + index, token, value