E1: leftover families, value-to-JSON copies, path identity; enum-dispatch guard

benchmark/adapters/openhcs.py

@@ -44,7 +44,7 @@
     CompilationDebugConfig,
     GlobalPipelineConfig,
     LazyCompilationDebugConfig,
-    MaterializationBackend,
+    MaterializeToDisk,
     PipelineConfig,
 )
 from openhcs.core.equivalence.policy import RuntimeEquivalencePolicy
@@ -326,7 +326,7 @@ def _execution_global_config(
             ),
             vfs_config=replace(
                 self.global_config.vfs_config,
-                materialization_backend=MaterializationBackend.DISK,
+                materialization_backend=MaterializeToDisk,
             ),
             compilation_debug_config=compilation_debug_config,
             materialize_runtime_artifacts=request.materialize_runtime_artifacts,

benchmark/cellprofiler_benchmark_cli.py

@@ -24,7 +24,7 @@
 )
 from benchmark.datasets.cppipe_case_catalog import official_cp3_case_category
 from benchmark.runtime_env import configure_headless_cpu_benchmark_runtime
-from openhcs.core.source_matching import is_image_path
+from openhcs.core.source_bindings import PathIsImage
 
 
 class BenchmarkCliCommand(ABC, metaclass=AutoRegisterMeta):
@@ -173,6 +173,7 @@ def configure(
     ) -> argparse.ArgumentParser:
         parser = self._parser(subparsers)
         from openhcs.runtime.zmq_execution_signature import (
+            ExportRuntimeValues,
             ZMQRuntimeObservationExportScope,
         )
 
@@ -197,8 +198,8 @@ def configure(
         parser.add_argument("--pipeline-name")
         parser.add_argument(
             "--observation-scope",
-            choices=tuple(scope.value for scope in ZMQRuntimeObservationExportScope),
-            default=ZMQRuntimeObservationExportScope.VALUES.value,
+            choices=tuple(ZMQRuntimeObservationExportScope.__registry__),
+            default=ExportRuntimeValues.name,
             help="Retain full runtime values or outcome-only execution evidence.",
         )
         parser.add_argument("--host", default="localhost")
@@ -280,7 +281,7 @@ def run(self, args: argparse.Namespace) -> int:
             runtime_observation_export_path=str(
                 MeasuredPipelineRunArtifact.RUNTIME_OBSERVATION.path_in(output_dir)
             ),
-            runtime_observation_export_scope=ZMQRuntimeObservationExportScope(
+            runtime_observation_export_scope=ZMQRuntimeObservationExportScope.named(
                 args.observation_scope
             ),
             submit_timeout_ms=args.submit_timeout_ms,
@@ -1008,7 +1009,7 @@ def _official_cellprofiler3_source_root(dataset_wrapper_path: Path) -> Path:
 
 def _has_image_payloads(path: Path) -> bool:
     return any(
-        candidate.is_file() and is_image_path(str(candidate))
+        candidate.is_file() and PathIsImage.holds_for(str(candidate))
         for candidate in path.iterdir()
     )
 

benchmark/cellprofiler_comparison.py

@@ -38,6 +38,7 @@
     run_cellprofiler_cppipe_parity,
 )
 from benchmark.timing import BenchmarkPhase, additive_phase_total_seconds
+from openhcs.interop.cellprofiler.module_settings import SettingUnmapped
 from openhcs.core.config import GlobalPipelineConfig, PartitionFilterConfig
 from benchmark.equivalence.outputs import image_paths, table_paths
 
@@ -271,7 +272,7 @@ def from_report(
                 unmapped_cppipe_setting_row_count=sum(
                     1
                     for setting in report.cppipe_settings
-                    if setting.coverage.value == "unmapped"
+                    if setting.coverage is SettingUnmapped
                 ),
                 supported_absorbed_processing_modules=(
                     coverage.supported_absorbed_processing_modules
@@ -304,7 +305,7 @@ def from_report(
                     module_num=setting.module_num,
                     setting_name=setting.setting_name,
                     normalized_setting_name=setting.normalized_setting_name,
-                    coverage=setting.coverage.value,
+                    coverage=setting.coverage.name,
                     value=setting.value,
                 )
                 for setting in report.cppipe_settings

benchmark/contracts/measured_run_receipt.py

@@ -14,7 +14,10 @@
 from benchmark.contracts.run_artifacts import write_new_measured_artifact
 from benchmark.timing import PhaseTimingRecord
 from openhcs.runtime.environment_provenance import RuntimeEnvironmentSnapshot
-from openhcs.runtime.zmq_execution_signature import ZMQRuntimeObservationExportScope
+from openhcs.runtime.zmq_execution_signature import (
+    ExportRuntimeValues,
+    ZMQRuntimeObservationExportScope,
+)
 
 MEASURED_PIPELINE_RUN_RECEIPT_SCHEMA_VERSION = "openhcs.benchmark.measured-pipeline.v2"
 _ARCHIVED_MEASURED_PIPELINE_RUN_RECEIPT_SCHEMA_VERSION = (
@@ -65,8 +68,8 @@ class MeasuredPipelineRunReceipt:
     completed_at_epoch_seconds: float
     compile_artifact_id: str | None = None
     server_environment: RuntimeEnvironmentSnapshot | None = None
-    observation_export_scope: ZMQRuntimeObservationExportScope = (
-        ZMQRuntimeObservationExportScope.VALUES
+    observation_export_scope: type[ZMQRuntimeObservationExportScope] = (
+        ExportRuntimeValues
     )
     expected_axis_count: int | None = None
     observed_axis_count: int | None = None
@@ -138,11 +141,8 @@ def read(cls, path: Path) -> Self:
             cls,
             {
                 **payload,
-                "observation_export_scope": ZMQRuntimeObservationExportScope(
-                    payload.get(
-                        "observation_export_scope",
-                        ZMQRuntimeObservationExportScope.VALUES.value,
-                    )
+                "observation_export_scope": ZMQRuntimeObservationExportScope.named(
+                    payload.get("observation_export_scope", ExportRuntimeValues.name)
                 ),
                 "phase_timings": tuple(
                     PhaseTimingRecord.from_payload(record) for record in timing_payloads

benchmark/control.py

@@ -273,7 +273,7 @@ def report_measured_pipeline_run(
                 f"- Compile artifact: `{receipt.compile_artifact_id or 'none; server job may include compilation'}`",
                 f"- Output roots: {len(receipt.output_roots)}",
                 "- Output files: not inspected; use output/equivalence evidence for output claims",
-                f"- Runtime observation scope: `{receipt.observation_export_scope.value}`",
+                f"- Runtime observation scope: `{receipt.observation_export_scope.name}`",
                 f"- Execution axes: {receipt.observed_axis_count if receipt.observed_axis_count is not None else 'not recorded'}"
                 + (
                     f" / {receipt.expected_axis_count} expected"

benchmark/converter/compatibility_matrix.py

@@ -150,7 +150,7 @@ class CPPipeSettingCompatibilityCoverage(ModuleSettingRowRecord):
 
     case_name: str
     canonical_module_name: str
-    coverage: ModuleSettingCoverageStatus
+    coverage: type[ModuleSettingCoverageStatus]
 
 
 @dataclass(frozen=True, slots=True)

benchmark/equivalence/outputs.py

@@ -24,7 +24,9 @@
     RuntimeArtifactExecutionObservation,
 )
 from openhcs.core.runtime_exports import RuntimeExportObservation
-from openhcs.core.source_bindings import SourceProjectionRole
+from openhcs.core.source_bindings import (
+    SourceArtifactRole,
+)
 from openhcs.core.source_matching import SourceImageSetIdentityPolicy
 from openhcs.core.source_projection import SourceProjectionSet
 from openhcs.core.source_workspace_projection import VirtualWorkspaceSourceProjection
@@ -159,7 +161,7 @@ def image_snapshots(
                 for projection in (
                     workspace.source_projections_by_virtual_path[virtual_path],
                 )
-                if projection.projection_role is SourceProjectionRole.SOURCE_ARTIFACT
+                if projection.projection_role is SourceArtifactRole
                 and (root / projection.ref.backend_address).absolute() in expected_paths
             )
             if not projections:

benchmark/matched_cellprofiler_batch.py

@@ -78,7 +78,7 @@
     GlobalPipelineConfig,
     LazyPathPlanningConfig,
     LazyPartitionFilterConfig,
-    MaterializationBackend,
+    MaterializeToDisk,
     MultiprocessingStartMethod,
     PathPlanningConfig,
     PipelineConfig,
@@ -121,7 +121,7 @@
 )
 from openhcs.runtime.zmq_execution_signature import (
     ZMQAuxiliaryExecutionParams,
-    ZMQRuntimeObservationExportScope,
+    ExportRuntimeOutcomes,
 )
 from python_introspect import to_jsonable
 from openhcs.domains.microscopy.axes import Microscopy
@@ -1112,7 +1112,7 @@ def _global_config(
             global_output_folder=output_dir,
             output_dir_suffix="_matched_pilot",
         ),
-        vfs_config=VFSConfig(materialization_backend=MaterializationBackend.DISK),
+        vfs_config=VFSConfig(materialization_backend=MaterializeToDisk),
         analysis_consolidation_config=AnalysisConsolidationConfig(enabled=False),
         materialize_runtime_artifacts=False,
     )
@@ -1659,7 +1659,7 @@ def capture_progress_event(event: Mapping[str, Any]) -> None:
         axis_events.clear()
         progress_events.clear()
         print(f"OpenHCS batch {repetition} starting.", flush=True)
-        export_scope = ZMQRuntimeObservationExportScope.OUTCOMES
+        export_scope = ExportRuntimeOutcomes
         evidence_dir = root / "candidate_evidence" / str(repetition)
         output_dir = root / "candidate" / str(repetition)
         global_config = _global_config(

benchmark/openhcs_measured_run.py

@@ -48,7 +48,7 @@
 )
 from openhcs.runtime.zmq_execution_signature import (
     ZMQAuxiliaryExecutionParams,
-    ZMQRuntimeObservationExportScope,
+    ExportRuntimeOutcomes,
 )
 
 from .timing import (
@@ -381,7 +381,7 @@ def retain_measured_openhcs_completion(
         )
     if (
         auxiliary_params.runtime_observation_export_scope
-        is ZMQRuntimeObservationExportScope.OUTCOMES
+        is ExportRuntimeOutcomes
     ):
         observation_export = ZMQRuntimeExecutionOutcomeExport.read(
             observation_export_path

benchmark/validation/corpus.py

@@ -43,16 +43,16 @@
     ImportedMetadataTable,
     MetadataExtractionRule,
     MetadataSelector,
-    MetadataSource,
+    FromFileName,
+    FromPipelineStart,
     NamedSourceBinding,
     SourceBindingMatchDimension,
     SourceBindingMatchField,
     PairByMetadata,
     PairByOrder,
-    SourceBindingOrigin,
     SourceFilterClause,
-    SourceFilterMatchType,
-    SourceFilterSubject,
+    PathIsImage,
+    SourceFileName,
     SourceSelector,
 )
 from openhcs.domains.microscopy.axes import Microscopy
@@ -533,7 +533,7 @@ def source_bindings_for_validation(
                 metadata=(MetadataSelector(field="channel", value=channel.value),),
                 inherit_current_scope=True,
             ),
-            origin=SourceBindingOrigin.PIPELINE_START,
+            origin=FromPipelineStart,
             component_identity=(
                 ComponentSelector(
                     component=Microscopy.Channel,
@@ -562,14 +562,14 @@ def source_bindings_for_validation(
     return SourceBindingsConfig(
         source_filters=(
             SourceFilterClause(
-                subject=SourceFilterSubject.FILE,
-                match_type=SourceFilterMatchType.IS_IMAGE,
+                subject=SourceFileName,
+                match_type=PathIsImage,
             ),
         ),
         bindings=bindings,
         metadata_rules=(
             MetadataExtractionRule(
-                source=MetadataSource.FILE_NAME,
+                source=FromFileName,
                 pattern=(
                     r"^(?:plate-(?P<plate>[^_]+)_)?"
                     r"well-(?P<well>[A-P]\d{2})_site-(?P<site>[^_]+)_"

benchmark/well_throughput_scaling.py

@@ -42,7 +42,7 @@
     LazyPathPlanningConfig,
     LazyVFSConfig,
     LazyPartitionFilterConfig,
-    MaterializationBackend,
+    MaterializeToDisk,
     MultiprocessingStartMethod,
     PartitionFilterConfig,
 )
@@ -76,7 +76,7 @@
 from openhcs.runtime.zmq_execution_observation import ZMQRuntimeExecutionOutcomeExport
 from openhcs.runtime.zmq_execution_signature import (
     ZMQAuxiliaryExecutionParams,
-    ZMQRuntimeObservationExportScope,
+    ExportRuntimeOutcomes,
 )
 from python_introspect import to_jsonable
 from openhcs.domains.microscopy.axes import Microscopy
@@ -2122,7 +2122,7 @@ def run_case_well_throughput(
                 output_dir_suffix="_well_throughput",
             ),
             vfs_config=LazyVFSConfig(
-                materialization_backend=MaterializationBackend.DISK
+                materialization_backend=MaterializeToDisk
             ),
         ),
         global_config,
@@ -2146,7 +2146,7 @@ def run_case_well_throughput(
     ).with_auxiliary_params(
         ZMQAuxiliaryExecutionParams(
             runtime_observation_export_path=observation_path,
-            runtime_observation_export_scope=ZMQRuntimeObservationExportScope.OUTCOMES,
+            runtime_observation_export_scope=ExportRuntimeOutcomes,
         )
     )
     progress_events: list[dict[str, Any]] = []