Merge branch 'master' into remove-cli

Author: edeno

CHANGELOG.md

@@ -22,7 +22,7 @@
         of `DLCPoseEstimation` #1208
 - Spikesorting
     - Fix compatibility bug between v1 pipeline and `SortedSpikesGroup` unit
-        filtering #1238
+        filtering #1238, #1249
     - Speedup `get_sorting` on `CurationV1` #1246
 - Behavior
     - Implement pipeline for keypoint-moseq extraction of behavior syllables #1056

src/spyglass/spikesorting/analysis/v1/group.py

@@ -189,8 +189,12 @@ def fetch_spike_data(
             ]
 
             # filter the spike times based on the labels if present
-            for attr in ("curation_label", "label"):  # v1, v0. if both, use v0
-                group_labels = getattr(nwb_file[nwb_field_name], attr, None)
+            for col in ("label", "curation_label"):  # v0, v1 names
+                if col in nwb_file[nwb_field_name].columns:
+                    group_labels = nwb_file[nwb_field_name][col]
+                    break
+            else:
+                group_labels = None
             if group_labels is not None:
                 group_label_list = group_labels.to_list()
                 include_unit = SortedSpikesGroup.filter_units(