Adjust no-transact pop hashing mechanism

CHANGELOG.md

@@ -16,7 +16,8 @@ dj.FreeTable(dj.conn(), "common_session.session_group").drop()
 
 ### Infrastructure
 
-- Disable populate transaction protection for long-populating tables #1066
+- Disable populate transaction protection for long-populating tables #1066,
+    #1108
 - Add docstrings to all public methods #1076
 - Update DataJoint to 0.14.2 #1081
 

src/spyglass/utils/dj_graph.py

@@ -14,6 +14,7 @@
 from datajoint import FreeTable, Table
 from datajoint.condition import make_condition
 from datajoint.dependencies import unite_master_parts
+from datajoint.hash import key_hash
 from datajoint.user_tables import TableMeta
 from datajoint.utils import get_master, to_camel_case
 from networkx import (
@@ -601,7 +602,8 @@ def hash(self):
         """Return hash of all visited nodes."""
         initial = hash_md5(b"")
         for table in self.all_ft:
-            initial.update(table.fetch())
+            for row in table.fetch(as_dict=True):
+                initial.update(key_hash(row).encode("utf-8"))
         return initial.hexdigest()
 
     # ------------------------------- Add Nodes -------------------------------

tests/spikesorting/conftest.py

@@ -76,7 +76,9 @@ def pop_curation(spike_v1, pop_sort):
         description="testing sort",
     )
 
-    yield spike_v1.CurationV1().fetch("KEY", as_dict=True)[0]
+    yield (spike_v1.CurationV1() & {"parent_curation_id": -1}).fetch(
+        "KEY", as_dict=True
+    )[0]
 
 
 @pytest.fixture(scope="session")

tests/spikesorting/test_curation.py

@@ -37,15 +37,14 @@ def test_curation_sort(spike_v1, pop_curation):
     ), "CurationV1.get_sorting unexpected shape"
 
 
-def test_curation_sort_info(spike_v1, pop_curation):
+def test_curation_sort_info(spike_v1, pop_curation, pop_curation_metric):
     sort_info = spike_v1.CurationV1.get_sort_group_info(pop_curation)
+    sort_metric = spike_v1.CurationV1.get_sort_group_info(pop_curation_metric)
+
     assert (
         hash_sort_info(sort_info) == "be874e806a482ed2677fd0d0b449f965"
     ), "CurationV1.get_sort_group_info unexpected value"
 
-
-def test_curation_metric(spike_v1, pop_curation_metric):
-    sort_info = spike_v1.CurationV1.get_sort_group_info(pop_curation_metric)
     assert (
-        hash_sort_info(sort_info) == "48e437bc116900fe64e492d74595b56d"
+        hash_sort_info(sort_metric) == "48e437bc116900fe64e492d74595b56d"
     ), "CurationV1.get_sort_group_info unexpected value"