refactor: use make_modality_config and exact time

Author: BitForge95

tests/create_experiment.py

@@ -1,31 +1,8 @@
-import copy
 import shutil
 from contextlib import contextmanager
 
 from .create_sequence_data import _generate_sequence_data
 
-DEFAULT_CONFIG = {
-    "device_0": {
-        "sampling_rate": 1.0,
-        "chunk_size": 40,
-        "interpolation": {
-            "interpolation_mode": "nearest_neighbor",
-        },
-    },
-    "device_1": {
-        "sampling_rate": 1.0,
-        "chunk_size": 60,
-        "interpolation": {
-            "interpolation_mode": "linear",
-        },
-    },
-}
-
-
-def get_default_config():
-    """Return a fresh copy of the default modality configuration."""
-    return copy.deepcopy(DEFAULT_CONFIG)
-
 
 @contextmanager
 def setup_test_experiment(
@@ -48,3 +25,27 @@ def setup_test_experiment(
     finally:
         if tmp_path.exists():
             shutil.rmtree(tmp_path)
+
+
+def make_modality_config(*device_names, sampling_rates=None, offsets=None):
+    if sampling_rates is None:
+        sampling_rates = [10.0] * len(device_names)
+    elif isinstance(sampling_rates, (int, float)):
+        sampling_rates = [sampling_rates] * len(device_names)
+
+    if offsets is None:
+        offsets = [0.0] * len(device_names)
+    elif isinstance(offsets, (int, float)):
+        offsets = [offsets] * len(device_names)
+
+    assert len(device_names) == len(sampling_rates), (
+        f"sampling_rates length {len(sampling_rates)} does not match device_names length {len(device_names)}"
+    )
+    assert len(device_names) == len(offsets), (
+        f"offsets length {len(offsets)} does not match device_names length {len(device_names)}"
+    )
+
+    return {
+        name: {"interpolation": {"sampling_rate": sr, "offset": off}}
+        for name, sr, off in zip(device_names, sampling_rates, offsets, strict=True)
+    }

tests/test_experiment.py

@@ -11,7 +11,7 @@
 from experanto.interpolators import Interpolator
 
 from .create_experiment import (
-    get_default_config,
+    make_modality_config,
     setup_test_experiment,
 )
 
@@ -126,7 +126,7 @@ def test_get_valid_range_all_devices(tmp_path, device_name, start_t, end_t):
             {"start_time": 5.0, "t_end": 15.0},
         ],
     ) as experiment_path:
-        config = get_default_config()
+        config = make_modality_config("device_0", "device_1", "device_2")
         config["device_2"] = {
             "sampling_rate": 1.0,
             "chunk_size": 40,
@@ -142,7 +142,8 @@ def test_get_valid_range_all_devices(tmp_path, device_name, start_t, end_t):
 def test_get_valid_range_raises_for_invalid_device(tmp_path):
     with setup_test_experiment(tmp_path) as experiment_path:
         experiment = Experiment(
-            root_folder=str(experiment_path), modality_config=get_default_config()
+            root_folder=str(experiment_path),
+            modality_config=make_modality_config("device_0", "device_1"),
         )
         with pytest.raises(KeyError):
             experiment.get_valid_range("device_does_not_exist")
@@ -157,7 +158,8 @@ def test_experiment_with_non_zero_start_time(tmp_path):
         devices_kwargs=[{"t_end": start_offset + duration, "start_time": start_offset}],
     ) as experiment_path:
         experiment = Experiment(
-            root_folder=str(experiment_path), modality_config=get_default_config()
+            root_folder=str(experiment_path),
+            modality_config=make_modality_config("device_0"),
         )
         res = experiment.interpolate(np.array([start_offset + 1.0]), device="device_0")
         assert res is not None
@@ -187,9 +189,11 @@ def test_experiment_numeric_precision_offset(
         ],
     ) as experiment_path:
         experiment = Experiment(
-            root_folder=str(experiment_path), modality_config=get_default_config()
+            root_folder=str(experiment_path),
+            modality_config=make_modality_config("device_0"),
         )
         valid_range = experiment.get_valid_range("device_0")
+        # Keep pytest.approx here as it's dealing with floats generated by Hypothesis
         assert valid_range[0] == pytest.approx(start_offset)
         assert valid_range[1] == pytest.approx(start_offset + duration)
         res = experiment.interpolate(np.array([start_offset]), device="device_0")
@@ -202,7 +206,8 @@ def test_experiment_multi_device_interpolation(tmp_path, return_valid, device):
     """Check data consistency when interpolating across multiple modalities."""
     with setup_test_experiment(tmp_path, n_devices=2) as experiment_path:
         exp = Experiment(
-            root_folder=str(experiment_path), modality_config=get_default_config()
+            root_folder=str(experiment_path),
+            modality_config=make_modality_config("device_0", "device_1"),
         )
         times = np.array([1.0, 2.0])
         results = exp.interpolate(times, device=device, return_valid=return_valid)
@@ -244,22 +249,18 @@ def test_experiment_start_end_time_reflects_union(
     with setup_test_experiment(
         tmp_path, n_devices=len(device_ranges), devices_kwargs=devices_kwargs
     ) as experiment_path:
-        # Manually build the config dict for however many devices were generated
-        config = {}
-        for i in range(len(device_ranges)):
-            config[f"device_{i}"] = {
-                "interpolation": {
-                    "sampling_rate": 10.0,
-                    "offset": float(np.random.rand()),
-                }
-            }
+        # Dynamically build the config using make_modality_config
+        device_names = [f"device_{i}" for i in range(len(device_ranges))]
+        offsets = [float(np.random.rand()) for _ in device_ranges]
+        config = make_modality_config(*device_names, offsets=offsets)
 
         experiment = Experiment(
             root_folder=str(experiment_path), modality_config=config
         )
 
-    assert experiment.start_time == pytest.approx(expected_start)
-    assert experiment.end_time == pytest.approx(expected_end)
+    # Removed pytest.approx here
+    assert experiment.start_time == expected_start
+    assert experiment.end_time == expected_end
 
 
 @pytest.mark.parametrize("override_meta", INVALID_META_CASES, ids=INVALID_META_IDS)
@@ -275,7 +276,7 @@ def test_experiment_invalid_metadata(tmp_path, override_meta):
         with open(meta_file, "w") as f:
             yaml.safe_dump(meta, f)
 
-        config = {"device_0": {"interpolation": {"sampling_rate": 10.0}}}
+        config = make_modality_config("device_0")
 
         with pytest.raises(
             ValueError, match="Experiment time range could not be determined"
@@ -311,10 +312,7 @@ def test_experiment_skips_invalid_devices(tmp_path, override_meta, caplog):
         with open(meta_file, "w") as f:
             yaml.safe_dump(meta, f)
 
-        config = {
-            "valid_device": {"interpolation": {"sampling_rate": 10.0}},
-            "invalid_device": {"interpolation": {"sampling_rate": 10.0}},
-        }
+        config = make_modality_config("valid_device", "invalid_device")
 
         with caplog.at_level(logging.WARNING, logger="experanto.experiment"):
             experiment = Experiment(
@@ -323,5 +321,6 @@ def test_experiment_skips_invalid_devices(tmp_path, override_meta, caplog):
 
     assert "valid_device" in experiment.devices
     assert "invalid_device" not in experiment.devices
-    assert experiment.start_time == pytest.approx(start_val)
-    assert experiment.end_time == pytest.approx(end_val)
+    # Removed pytest.approx here
+    assert experiment.start_time == start_val
+    assert experiment.end_time == end_val