style cleanup

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

@@ -1,5 +1,6 @@
 import datajoint as dj
 import numpy as np
+from itertools import compress
 from ripple_detection import get_multiunit_population_firing_rate
 
 from spyglass.common import Session  # noqa: F401
@@ -18,24 +19,27 @@ class SortedSpikesGroupUnitSelectionParams(SpyglassMixin, dj.Manual):
     include_labels = Null: longblob
     exclude_labels = Null: longblob
     """
-
-    @property
-    def default_params(self):
-        return {
-            "unit_filter_params_name": "all_units",
-            "include_labels": [],
-            "exclude_labels": [],
-        }
+    contents = [
+        [
+            "all_units",
+            [],
+            [],
+        ],
+        [
+            "exclude_noise",
+            [],
+            ["noise", "mua"],
+        ],
+        [
+            "default_exclusion",
+            [],
+            ["noise", "mua"],
+        ],
+    ]
 
     @classmethod
-    def insert_default(cls, **kwargs):
-        """
-        Insert default parameter set for position determination
-        """
-        cls.insert1(
-            {**cls().default_params},
-            skip_duplicates=True,
-        )
+    def insert_default(cls):
+        cls.insert(cls.contents, skip_duplicates=True)
 
 
 @schema
@@ -64,15 +68,13 @@ def create_group(
             "nwb_file_name": nwb_file_name,
             "unit_filter_params_name": unit_filter_params_name,
         }
+        parts_insert = [{**key, **group_key} for key in keys]
+
         self.insert1(
             group_key,
             skip_duplicates=True,
         )
-        for key in keys:
-            self.SortGroup.insert1(
-                {**key, **group_key},
-                skip_duplicates=True,
-            )
+        self.SortGroup.insert(parts_insert)
 
     @staticmethod
     def filter_units(
@@ -133,8 +135,10 @@ def fetch_spike_data(key, time_slice=None):
                 include_unit = SortedSpikesGroup.filter_units(
                     group_label_list, include_labels, exclude_labels
                 )
-                from itertools import compress  # worth bumping to top of script
-                sorting_spike_times = list(compress(sorting_spike_times, include_unit))
+
+                sorting_spike_times = list(
+                    compress(sorting_spike_times, include_unit)
+                )
 
             # filter the spike times based on the time slice if provided
             if time_slice is not None:

src/spyglass/spikesorting/imported.py

@@ -81,7 +81,7 @@ def add_annotation(
             unit id
         label : List[str], optional
             list of str labels for the unit, by default None
-        annotations : _type_, optional
+        annotations : dict, optional
             dictionary of other annotation values for unit, by default None
         merge_annotations : bool, optional
             whether to merge with existing annotations, by default False
@@ -90,11 +90,15 @@ def add_annotation(
             label = [label]
         query = self & key
         if not len(query) == 1:
-            raise ValueError(f"ImportedSpikeSorting key must be unique. Found: {query}")
+            raise ValueError(
+                f"ImportedSpikeSorting key must be unique. Found: {query}"
+            )
         unit_key = {**key, "id": id}
         annotation_query = ImportedSpikeSorting.Annotations & unit_key
         if annotation_query and not merge_annotations:
-            raise ValueError(f"Unit already has annotations: {annotation_query}")
+            raise ValueError(
+                f"Unit already has annotations: {annotation_query}"
+            )
         elif annotation_query:
             existing_annotations = annotation_query.fetch1()
             existing_annotations["label"] += label