bundle.add_tree(t) should set/update t.sent_id according to bundle.bundle_id

also use f-strings and internally faster self._bundle_id

Author: martinpopel

udapi/block/udpipe/base.py

@@ -153,7 +153,7 @@ def process_document(self, doc):
                             orig_bundle_id = bundle.bundle_id
                             bundle.bundle_id = orig_bundle_id + '-1'
                             for i, new_tree in enumerate(new_trees[1:], 2):
-                                new_bundle = Bundle(document=doc, bundle_id=orig_bundle_id + '-' + str(i))
+                                new_bundle = Bundle(document=doc, bundle_id=f"{orig_bundle_id}-{i}")
                                 new_tree.zone = tree.zone
                                 new_bundle.add_tree(new_tree)
                                 new_bundles.append(new_bundle)
@@ -166,7 +166,7 @@ def process_document(self, doc):
                             bundle.bundle_id = orig_bundle_id + '-1'
                             tree.text = sentences[0]
                             for i, sentence in enumerate(sentences[1:], 2):
-                                new_bundle = Bundle(document=doc, bundle_id=orig_bundle_id + '-' + str(i))
+                                new_bundle = Bundle(document=doc, bundle_id=f"{orig_bundle_id}-{i}")
                                 new_tree = new_bundle.create_tree(zone=tree.zone)
                                 new_tree.text = sentence
                                 new_bundles.append(new_bundle)

udapi/core/bundle.py

@@ -39,9 +39,9 @@ def bundle_id(self, bundle_id):
                 tree._sent_id = bundle_id + '/' + tree.zone  # pylint: disable=protected-access
 
     def __str__(self):
-        if self.bundle_id is None:
+        if self._bundle_id is None:
             return 'bundle without id'
-        return "bundle id='%s'" % self.bundle_id
+        return f"bundle id='{self._bundle_id}'"
 
     def __iter__(self):
         return iter(self.trees)
@@ -91,6 +91,10 @@ def add_tree(self, root):
         if root.zone is None:
             root._zone = ''
         self.check_zone(root.zone)
+        if self._bundle_id:
+            root._sent_id = self._bundle_id
+            if root.zone:
+                root._sent_id += '/' + root.zone
         root.bundle = self
         self.trees.append(root)
         doc_json = root.json.get('__doc__')
@@ -107,7 +111,7 @@ def remove(self):
 
     def address(self):
         """Return bundle_id or '?' if missing."""
-        return self.bundle_id if self.bundle_id is not None else '?'
+        return self._bundle_id if self._bundle_id is not None else '?'
 
     def draw(self, **kwargs):
         """Pretty print the trees using TextModeTrees."""