Fetch boiler from ssv1

.vscode/settings.json

@@ -1,21 +1,12 @@
 {
-    "editor.formatOnSave": true,
-    "files.trimTrailingWhitespace": true,
-    "files.trimFinalNewlines": true,
-    "editor.multiCursorModifier": "ctrlCmd",
-    "autoDocstring.docstringFormat": "numpy",
-    "remote.SSH.remoteServerListenOnSocket": true,
-    "git.confirmSync": false,
-    "python.analysis.typeCheckingMode": "off",
-    "[python]": {
-        "editor.defaultFormatter": "ms-python.black-formatter",
-        "editor.formatOnSave": true,
-        "editor.codeActionsOnSave": {
-            "source.organizeImports": true
-        },
-    },
-    "isort.args": [
-        "--profile",
-        "black"
-    ],
+  "editor.formatOnSave": true,
+  "files.trimTrailingWhitespace": true,
+  "files.trimFinalNewlines": true,
+  "autoDocstring.docstringFormat": "numpy",
+  "remote.SSH.remoteServerListenOnSocket": true,
+  "git.confirmSync": false,
+  "python.analysis.typeCheckingMode": "off",
+  "[python]": {
+      "editor.defaultFormatter": "ms-python.black-formatter"
+  },
 }

pyproject.toml

@@ -78,7 +78,7 @@ test = [
     "kachery-cloud",
 ]
 docs = [
-    "hatch",                 # Get version from env 
+    "hatch",                 # Get version from env
     "mike",                  # Docs versioning
     "mkdocs",                # Docs core
     "mkdocs-exclude",        # Docs exclude files

src/spyglass/spikesorting/imported.py

@@ -0,0 +1,13 @@
+import datajoint as dj
+from spyglass.common.common_session import Session
+
+schema = dj.schema("spikesorting_imported")
+
+
+@schema
+class ImportedSpikeSorting(dj.Imported):
+    definition = """
+    -> Session
+    ---
+    object_id: varchar(32)
+    """

src/spyglass/spikesorting/merge.py

@@ -0,0 +1,30 @@
+import datajoint as dj
+
+from spyglass.spikesorting.v1.curation import CurationV1  # noqa: F401
+from spyglass.spikesorting.imported import ImportedSpikeSorting  # noqa: F401
+from spyglass.utils.dj_merge_tables import _Merge
+
+schema = dj.schema("spikesorting_merge")
+
+
+@schema
+class SpikeSortingOutput(_Merge):
+    definition = """
+    merge_id: uuid
+    ---
+    source: varchar(32)
+    """
+
+    class CurationV1(dj.Part):
+        definition = """
+        -> master
+        ---
+        -> CurationV1
+        """
+
+    class ImportedSpikeSorting(dj.Part):
+        definition = """
+        -> master
+        ---
+        -> ImportedSpikeSorting
+        """

src/spyglass/spikesorting/v1/__init__.py

@@ -1,39 +1,21 @@
-from .curation_figurl import CurationFigurl, CurationFigurlSelection
-from .sortingview import SortingviewWorkspace, SortingviewWorkspaceSelection
-from .spikesorting_artifact import (
-    ArtifactDetection,
-    ArtifactDetectionParameters,
-    ArtifactDetectionSelection,
-    ArtifactRemovedIntervalList,
-)
-from .spikesorting_curation import (
-    AutomaticCuration,
-    AutomaticCurationParameters,
-    AutomaticCurationSelection,
-    CuratedSpikeSorting,
-    CuratedSpikeSortingSelection,
-    Curation,
-    MetricParameters,
-    MetricSelection,
-    QualityMetrics,
-    UnitInclusionParameters,
-    WaveformParameters,
-    Waveforms,
-    WaveformSelection,
-)
-from .spikesorting_populator import (
-    SpikeSortingPipelineParameters,
-    spikesorting_pipeline_populator,
-)
-from .spikesorting_recording import (
+from .recording import (
     SortGroup,
-    SortInterval,
     SpikeSortingPreprocessingParameters,
-    SpikeSortingRecording,
     SpikeSortingRecordingSelection,
+    SpikeSortingRecording,
+)
+from .artifact import (
+    ArtifactDetectionParameters,
+    ArtifactDetectionSelection,
+    ArtifactDetection,
 )
-from .spikesorting_sorting import (
-    SpikeSorterParameters,
-    SpikeSorting,
-    SpikeSortingSelection,
+from .sorting import SpikeSorterParameters, SpikeSortingSelection, SpikeSorting
+from .curation import CurationV1
+from .metric_curation import (
+    WaveformParameters,
+    MetricParameters,
+    MetricCurationParameters,
+    MetricCurationSelection,
+    MetricCuration,
 )
+from .figurl_curation import FigURLCurationSelection, FigURLCuration