simplify the corefud.Delete code by using deps instead of raw_deps

martinpopel · martinpopel · commit 07864f922ba4 · 2024-04-16T14:03:23.000+02:00
Fix node.raw_deps, so that it always sorts and removes duplicates,
so that the output CoNLL-U files are valid.
Add tests.
diff --git a/udapi/block/corefud/delete.py b/udapi/block/corefud/delete.py
@@ -67,9 +67,7 @@ def process_document(self, doc):
                             node.deps = [dep for dep in node.deps if not dep['parent'] in root.empty_nodes]
                         # otherwise propagate to non-empty ancestors
                         else:
-                            newdeps = self._deps_ignore_nodes(node, root.empty_nodes)
-                            newdeps_sorted = sorted(set((dep['parent'].ord, dep['deprel']) for dep in newdeps))
-                            node.raw_deps = '|'.join(f"{p}:{r}" for p, r in newdeps_sorted)
+                            node.deps = self._deps_ignore_nodes(node, root.empty_nodes)
                     # This needs to be done even if '.' not in node.raw_deps.
                     if '.' in node.misc['Functor'].split(':')[0]:
                         del node.misc['Functor']
diff --git a/udapi/core/node.py b/udapi/core/node.py
@@ -252,7 +252,7 @@ def raw_deps(self):
         #if self._raw_deps is not None:
         #    return self._raw_deps
         if self._deps:
-            self._raw_deps = '|'.join(f"{dep['parent']._ord}:{dep['deprel']}" for dep in self._deps)
+            self._raw_deps = '|'.join(f"{p}:{r}" for p, r in sorted(set((d['parent'].ord, d['deprel']) for d in self._deps)))
         return self._raw_deps
 
     @raw_deps.setter
diff --git a/udapi/core/tests/test_enhdeps.py b/udapi/core/tests/test_enhdeps.py
@@ -57,7 +57,7 @@ def test_create_deps2empty(self):
         e.deps.append({'parent': h, 'deprel':'dep:e2h'})
         d.deps.append({'parent': e, 'deprel': 'dep:d2e'})
         self.assertEqual("2:dep:e2h", e.raw_deps, )
-        self.assertEqual("5:conj|3.1:dep:d2e", d.raw_deps)
+        self.assertEqual("3.1:dep:d2e|5:conj", d.raw_deps)
         self.assertEqual(self.tree.descendants_and_empty, self.nodes[:3] + [e] + self.nodes[3:])
 
 
diff --git a/udapi/core/tests/test_node.py b/udapi/core/tests/test_node.py
@@ -245,5 +245,25 @@ def test_empty_nodes(self):
         self.assertEqual(root.descendants_and_empty, [e1, e2, e3, e4, e6, e7])
         self.assertEqual([n.ord for n in root.descendants_and_empty], [0.1, 0.2, 0.3, 0.4, 0.5, 0.6])
 
+    def test_enh_deps_and_reordering(self):
+        """Test reordering of node ord in enhanced deps when reorderin/removing nodes."""
+        root = Root()
+        for i in range(3):
+            root.create_child(form=f'node{i+1}')
+
+        n1, n2, n3 = root.descendants()
+        n1.raw_deps = '2:nsubj|3:obj'
+        self.assertEqual(n1.raw_deps, '2:nsubj|3:obj')
+        self.assertEqual(n1.deps, [{'parent': n2, 'deprel': 'nsubj'}, {'parent': n3, 'deprel': 'obj'}])
+        n2.shift_after_node(n3)
+        self.assertEqual(n1.raw_deps, '2:obj|3:nsubj')
+        # TODO only node.raw_deps are currently guaranteed to return the deps sorted, not node.deps
+        #self.assertEqual(n1.deps, [{'parent': n3, 'deprel': 'obj'}, {'parent': n2, 'deprel': 'nsubj'}])
+        # TODO: after removing a node, all deps should be updated
+        #n2.remove()
+        #self.assertEqual(n1.raw_deps, '2:nsubj')
+        #self.assertEqual(n1.deps, [{'parent': n3, 'deprel': 'obj'}])
+
+
 if __name__ == "__main__":
     unittest.main()
