euler-preprocess 2.0.0__tar.gz → 2.1.0__tar.gz

{euler_preprocess-2.0.0 → euler_preprocess-2.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: euler-preprocess
-Version: 2.0.0
+Version: 2.1.0
 Summary: Physics-based preprocessing (fog, etc.) for RGB+depth datasets
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown

{euler_preprocess-2.0.0 → euler_preprocess-2.1.0}/euler_preprocess/common/output.py

@@ -381,11 +381,29 @@ def _select_pipeline_target(
                 f"pipeline.output_targets does not contain slot '{slot}'"
             )
 
-    if len(pipeline.output_targets) == 1:
-        return pipeline.output_targets[0]
+    # Auxiliary slot names declared by the transform are reserved for
+    # OUTPUT_SLOT_SPECS and routed by prepare_output_backends; ignore them
+    # when picking the *primary* target.  This lets pipeline configs use
+    # arbitrary slot aliases (e.g. ``"fog"`` for the primary RGB output)
+    # alongside named auxiliary outputs.
+    aux_slots = set((getattr(transform_class, "OUTPUT_SLOT_SPECS", None) or {}).keys())
+    primary_candidates = [
+        t for t in pipeline.output_targets if t.slot not in aux_slots
+    ]
+
+    if len(primary_candidates) == 1:
+        return primary_candidates[0]
+
+    if not primary_candidates:
+        raise ValueError(
+            f"pipeline.output_targets has no primary target for "
+            f"{transform_class.__name__}; only auxiliary slots present "
+            f"({sorted(aux_slots)}). Add a target for the primary output."
+        )
 
     raise ValueError(
-        "pipeline.output_targets contains multiple entries; set top-level "
+        "pipeline.output_targets contains multiple primary entries "
+        f"({[t.slot for t in primary_candidates]}); set top-level "
         "'output_slot' to select the target for this transform."
     )
 

{euler_preprocess-2.0.0 → euler_preprocess-2.1.0}/euler_preprocess.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: euler-preprocess
-Version: 2.0.0
+Version: 2.1.0
 Summary: Physics-based preprocessing (fog, etc.) for RGB+depth datasets
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown

{euler_preprocess-2.0.0 → euler_preprocess-2.1.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "euler-preprocess"
-version = "2.0.0"
+version = "2.1.0"
 description = "Physics-based preprocessing (fog, etc.) for RGB+depth datasets"
 readme = "README.md"
 requires-python = ">=3.9"

{euler_preprocess-2.0.0 → euler_preprocess-2.1.0}/tests/test_fog_aux_outputs.py

@@ -331,6 +331,76 @@ def test_aux_outputs_carry_correct_index_metadata(tmp_path: Path) -> None:
     assert airlight_index["euler_train"]["used_as"] == "target"
 
 
+def test_primary_slot_auto_selected_when_aliased(tmp_path: Path) -> None:
+    """A pipeline target whose slot is *not* one of the aux slot names is
+    automatically picked up as the primary RGB target — even when its slot
+    name doesn't match the transform's primary slot (e.g. ``"fog"``).
+    """
+    dataset = _make_dataset(tmp_path)
+    pipeline_root = tmp_path / "pipeline_root_alias"
+    manifest_path = pipeline_root / ".euler_pipeline" / "pipeline_outputs.json"
+    config = {
+        "pipeline": {
+            "output_root": str(pipeline_root),
+            "outputs_manifest_path": str(manifest_path),
+            "output_targets": [
+                {
+                    "slot": "fog",
+                    "datasetType": "rgb",
+                    "relativePath": "foggy_rgb.zip",
+                    "path": str(pipeline_root / "foggy_rgb.zip"),
+                    "storage": "zip",
+                },
+                {
+                    "slot": ATMOSPHERIC_LIGHT_SLOT,
+                    "datasetType": "rgb",
+                    "relativePath": "atmospheric_light.zip",
+                    "path": str(pipeline_root / "atmospheric_light.zip"),
+                    "storage": "zip",
+                },
+                {
+                    "slot": SCATTERING_COEFFICIENT_SLOT,
+                    "datasetType": "rgb",
+                    "relativePath": "scattering_coefficient.zip",
+                    "path": str(pipeline_root / "scattering_coefficient.zip"),
+                    "storage": "zip",
+                },
+            ],
+        }
+    }
+
+    backends = prepare_output_backends(config, dataset, FogTransform)
+
+    assert set(backends.keys()) == {
+        "rgb",
+        SCATTERING_COEFFICIENT_SLOT,
+        ATMOSPHERIC_LIGHT_SLOT,
+    }
+    # Primary backend points at the "fog" target, not a literal "rgb" target.
+    assert backends["rgb"].root == pipeline_root / "foggy_rgb.zip"
+
+    transform = FogTransform(
+        config_path=str(_write_fog_config(tmp_path / "fog_cfg.json")),
+        out_path=str(backends["rgb"].root),
+        output_backends=backends,
+    )
+    transform.run(dataset)
+
+    import zipfile
+
+    with zipfile.ZipFile(pipeline_root / "foggy_rgb.zip", "r") as zf:
+        assert "Scene01/Camera_0/00001.png" in zf.namelist()
+    with zipfile.ZipFile(pipeline_root / "scattering_coefficient.zip", "r") as zf:
+        assert "Scene01/Camera_0/00001.npy" in zf.namelist()
+    with zipfile.ZipFile(pipeline_root / "atmospheric_light.zip", "r") as zf:
+        assert "Scene01/Camera_0/00001.npy" in zf.namelist()
+
+    # Manifest still lists every active slot in declaration order.
+    manifest = json.loads(manifest_path.read_text())
+    slots = [target["slot"] for target in manifest["outputs"]]
+    assert slots == ["fog", SCATTERING_COEFFICIENT_SLOT, ATMOSPHERIC_LIGHT_SLOT]
+
+
 def test_apply_model_returns_full_size_maps_for_uniform() -> None:
     """Sanity-check the broadcast logic on the model layer."""
     from euler_preprocess.fog.models import apply_model