PyPI - LbAPCommon - Versions diffs - 0.19.2__tar.gz → 0.19.4__tar.gz - Mend

@@ -346,6 +346,25 @@ class TestRecipeJobs:
             "--write=output1=tree1",
         ]
+    def test_split_trees_allow_missing(self):
+        input_yaml = textwrap.dedent("""
+            job1:
+              recipe:
+                name: split-trees
+                allow_missing: true
+                split:
+                  - key: tree1
+                    into: OUTPUT1.ROOT
+        """).strip()
+        result = yaml.safe_load(transform_yaml(input_yaml))
+        assert result["job1"]["options"]["extra_args"] == [
+            "--",
+            "--allow-missing",
+            "--write=output1=tree1",
+        ]
     def test_split_trees_generates_output(self):
         input_yaml = textwrap.dedent("""
             job1:
@@ -362,6 +381,27 @@ class TestRecipeJobs:
         assert result["job1"]["output"] == ["OUTPUT1.ROOT", "OUTPUT2.ROOT"]
+    def test_split_trees_deduplicates_shared_output(self):
+        input_yaml = textwrap.dedent("""
+            job1:
+              recipe:
+                name: split-trees
+                split:
+                  - key: tree1$
+                    into: TREE.ROOT
+                  - key: tree2$
+                    into: TREE.ROOT
+        """).strip()
+        result = yaml.safe_load(transform_yaml(input_yaml))
+        assert result["job1"]["output"] == ["TREE.ROOT"]
+        assert result["job1"]["options"]["extra_args"] == [
+            "--",
+            "--write=tree=tree1$",
+            "--write=tree=tree2$",
+        ]
     def test_filter_trees_sets_application(self):
         input_yaml = textwrap.dedent("""
             job1:

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: LbAPCommon
-Version: 0.19.2
+Version: 0.19.4
 Summary: Common utilities used by LHCb DPA WP2 related software
 Author: LHCb
 Project-URL: Homepage, https://gitlab.cern.ch/lhcb-dpa/analysis-productions/LbAPCommon

@@ -33,7 +33,10 @@ from pydantic import (
 from LbAPCommon import config as config
 from LbAPCommon.linting.bk_paths import InvalidBKQueryError, validate_bk_query
-from LbAPCommon.models.validators import output_filetype_validator
+from LbAPCommon.models.validators import (
+    output_filetype_validator,
+    unique_output_filetypes_validator,
+)
 from .recipes import AllRecipes
@@ -477,7 +480,9 @@ class APJob(BaseModel):
         discriminator=Discriminator(input_discriminator),
     )
-    output: list[OutputFileType] = Field(
+    output: Annotated[
+        list[OutputFileType], AfterValidator(unique_output_filetypes_validator)
+    ] = Field(
         title="Output files",
         description=(
             "List of output file types that will be produced by this job. "

@@ -44,6 +44,16 @@ class SplittingRecipe(BaseModel):
     split: list[SplitHow]
+    allow_missing: bool = Field(
+        default=False,
+        title="Allow missing trees",
+        description=(
+            "If true, objects in the input file that match none of the 'split' key patterns "
+            "are silently dropped instead of failing the job. Use this to keep only a subset "
+            "of the input trees."
+        ),
+    )
 class FilteringRecipe(BaseModel):
     """Recipe for filtering ROOT files using a custom entrypoint."""

@@ -25,3 +25,13 @@ def output_filetype_validator(v: str) -> str:
             "It appears the data taking year is included. Please remove it!"
         )
     return v
+def unique_output_filetypes_validator(v: list[str]) -> list[str]:
+    duplicates = sorted({filetype for filetype in v if v.count(filetype) > 1})
+    if duplicates:
+        raise ValueError(
+            f"Duplicate output filetype(s): {', '.join(duplicates)}. "
+            "Each output filetype may only be listed once per job."
+        )
+    return v

@@ -348,7 +348,9 @@ function expandSplitTrees(recipe, baseJob) {
     const into = String(split.into).toLowerCase().replace(/\.root$/i, "");
     return "--write=" + into + "=" + split.key;
   });
-  const outputs = splits.map((split) => split.into);
+  // Multiple keys may be written into the same file; only declare it once
+  const outputs = [...new Set(splits.map((split) => split.into))];
+  const flags = recipe.allow_missing ? ["--allow-missing"] : [];
   return [
     {
@@ -361,7 +363,7 @@ function expandSplitTrees(recipe, baseJob) {
             optimise_baskets: false,
           },
         },
-        extra_args: ["--", ...writeArgs],
+        extra_args: ["--", ...flags, ...writeArgs],
       },
       output: outputs,
     },

@@ -0,0 +1,8 @@
+{
+  "tag": "0.19.4",
+  "distance": 0,
+  "node": "g73f997884d784d4aa417d6d89a726219ea90edd8",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-07-28"
+}

@@ -167,6 +167,28 @@ def test_bad_end_run():
         parse_yaml(rendered_yaml)
+def test_bad_duplicate_output_filetypes():
+    rendered_yaml = dedent("""\
+    job_1:
+        application: DaVinci/v45r3
+        input:
+            bk_query: /MC/2018/Beam6500GeV-2018-MagDown/Sim09g/Trig0x617d18a4/Reco18/24142001/ALLSTREAMS.DST
+        output:
+            - TREE.ROOT
+            - tree.root
+        options:
+            - options.py
+        wg: Charm
+        inform: cernuser
+        priority: 1a
+    """)
+    with pytest.raises(
+        ValueError,
+        match=r"Configuration validation failed(.|\n)*❌ job_1 -> output(.|\n)*[Dd]uplicate",
+    ):
+        parse_yaml(rendered_yaml)
 @pytest.mark.parametrize(
     "value,expected",
     [

@@ -1,8 +0,0 @@
-{
-  "tag": "0.19.2",
-  "distance": 0,
-  "node": "gfaff33efef68eed53bc8e8c0430dadb4416a0ae2",
-  "dirty": false,
-  "branch": "HEAD",
-  "node_date": "2026-07-14"
-}

LbAPCommon 0.19.2__tar.gz → 0.19.4__tar.gz

LbAPCommon 0.19.2tar.gz → 0.19.4tar.gz