merge_new_unit_ids -> merge_new_unit_id

Author: alejoe91

src/spikeinterface/curation/curation_model.py

@@ -17,7 +17,7 @@ class ManualLabel(BaseModel):
 
 class Merge(BaseModel):
     merge_unit_group: List[Union[int, str]] = Field(..., description="List of groups of units to be merged")
-    merge_new_unit_ids: Optional[Union[int, str]] = Field(default=None, description="New unit IDs for the merge group")
+    merge_new_unit_id: Optional[Union[int, str]] = Field(default=None, description="New unit IDs for the merge group")
 
 
 class Split(BaseModel):
@@ -67,7 +67,7 @@ def add_label_definition_name(cls, label_definitions):
 
     @classmethod
     def check_manual_labels(cls, values):
-        values = dict(values)
+
         unit_ids = list(values["unit_ids"])
         manual_labels = values.get("manual_labels")
         if manual_labels is None:
@@ -99,7 +99,7 @@ def check_manual_labels(cls, values):
 
     @classmethod
     def check_merges(cls, values):
-        values = dict(values)
+
         unit_ids = list(values["unit_ids"])
         merges = values.get("merges")
         if merges is None:
@@ -110,7 +110,7 @@ def check_merges(cls, values):
             # Convert dict format to list of Merge objects
             merge_list = []
             for merge_new_id, merge_group in merges.items():
-                merge_list.append({"merge_unit_group": list(merge_group), "merge_new_unit_ids": merge_new_id})
+                merge_list.append({"merge_unit_group": list(merge_group), "merge_new_unit_id": merge_new_id})
             merges = merge_list
 
         # Make a copy of the list
@@ -138,16 +138,16 @@ def check_merges(cls, values):
                 raise ValueError("Merge unit groups must have at least 2 elements")
 
             # Check new unit id not already used
-            if merge.merge_new_unit_ids is not None:
-                if merge.merge_new_unit_ids in unit_ids:
-                    raise ValueError(f"New unit ID {merge.merge_new_unit_ids} is already in the unit list")
+            if merge.merge_new_unit_id is not None:
+                if merge.merge_new_unit_id in unit_ids:
+                    raise ValueError(f"New unit ID {merge.merge_new_unit_id} is already in the unit list")
 
         values["merges"] = merges
         return values
 
     @classmethod
     def check_splits(cls, values):
-        values = dict(values)
+
         unit_ids = list(values["unit_ids"])
         splits = values.get("splits")
         if splits is None:
@@ -230,7 +230,6 @@ def check_splits(cls, values):
 
     @classmethod
     def check_removed(cls, values):
-        values = dict(values)
         unit_ids = list(values["unit_ids"])
         removed = values.get("removed")
         if removed is None:
@@ -246,8 +245,6 @@ def check_removed(cls, values):
     @classmethod
     def convert_old_format(cls, values):
         format_version = values.get("format_version", "0")
-        if format_version != "2":
-            values = dict(values)
         if format_version == "0":
             print("Conversion from format version v0 (sortingview) to v2")
             if "mergeGroups" not in values.keys():
@@ -298,6 +295,7 @@ def convert_old_format(cls, values):
     @model_validator(mode="before")
     def validate_fields(cls, values):
         values = dict(values)
+        values["label_definitions"] = values.get("label_definitions", {})
         values = cls.convert_old_format(values)
         values = cls.check_manual_labels(values)
         values = cls.check_merges(values)

src/spikeinterface/curation/tests/test_curation_model.py

@@ -91,22 +91,22 @@ def test_merge_units():
         "format_version": "2",
         "unit_ids": [1, 2, 3, 4],
         "merges": [
-            {"merge_unit_group": [1, 2], "merge_new_unit_ids": 5},
-            {"merge_unit_group": [3, 4], "merge_new_unit_ids": 6},
+            {"merge_unit_group": [1, 2], "merge_new_unit_id": 5},
+            {"merge_unit_group": [3, 4], "merge_new_unit_id": 6},
         ],
     }
 
     model = CurationModel(**valid_merge)
     assert len(model.merges) == 2
-    assert model.merges[0].merge_new_unit_ids == 5
-    assert model.merges[1].merge_new_unit_ids == 6
+    assert model.merges[0].merge_new_unit_id == 5
+    assert model.merges[1].merge_new_unit_id == 6
 
     # Test dictionary format
     valid_merge_dict = {"format_version": "2", "unit_ids": [1, 2, 3, 4], "merges": {5: [1, 2], 6: [3, 4]}}
 
     model = CurationModel(**valid_merge_dict)
     assert len(model.merges) == 2
-    merge_new_ids = {merge.merge_new_unit_ids for merge in model.merges}
+    merge_new_ids = {merge.merge_new_unit_id for merge in model.merges}
     assert merge_new_ids == {5, 6}
 
     # Test list format
@@ -122,7 +122,7 @@ def test_merge_units():
     invalid_merge_group = {
         "format_version": "2",
         "unit_ids": [1, 2, 3],
-        "merges": [{"merge_unit_group": [1], "merge_new_unit_ids": 4}],
+        "merges": [{"merge_unit_group": [1], "merge_new_unit_id": 4}],
     }
     with pytest.raises(ValidationError):
         CurationModel(**invalid_merge_group)
@@ -132,8 +132,8 @@ def test_merge_units():
         "format_version": "2",
         "unit_ids": [1, 2, 3],
         "merges": [
-            {"merge_unit_group": [1, 2], "merge_new_unit_ids": 4},
-            {"merge_unit_group": [2, 3], "merge_new_unit_ids": 5},
+            {"merge_unit_group": [1, 2], "merge_new_unit_id": 4},
+            {"merge_unit_group": [2, 3], "merge_new_unit_id": 5},
         ],
     }
     with pytest.raises(ValidationError):
@@ -231,7 +231,7 @@ def test_removed_units():
     invalid_merge_remove = {
         "format_version": "2",
         "unit_ids": [1, 2, 3],
-        "merges": [{"merge_unit_group": [1, 2], "merge_new_unit_ids": 4}],
+        "merges": [{"merge_unit_group": [1, 2], "merge_new_unit_id": 4}],
         "removed": [1],  # Unit is both merged and removed
     }
     with pytest.raises(ValidationError):
@@ -248,7 +248,7 @@ def test_complete_model():
             "tags": LabelDefinition(name="tags", label_options=["burst", "slow"], exclusive=False),
         },
         "manual_labels": [{"unit_id": 1, "labels": {"quality": ["good"], "tags": ["burst"]}}],
-        "merges": [{"merge_unit_group": [2, 3], "merge_new_unit_ids": 6}],
+        "merges": [{"merge_unit_group": [2, 3], "merge_new_unit_id": 6}],
         "splits": [
             {"unit_id": 4, "split_mode": "indices", "split_indices": [[0, 1], [2, 3]], "split_new_unit_ids": [7, 8]}
         ],