Merge pull request #227 from Forced-Alignment-and-Vowel-Extraction/dev

v0.8.1

Author: JoFrhwld

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "aligned_textgrid"
-version = "0.8.0"
+version = "0.8.1"
 description = "Classes for defining sequential information from TextGrids"
 authors = ["JoFrhwld <JoFrhwld@gmail.com>", "chrisbrickhouse <brickhouse@stanford.edu>"]
 license = "GPL-3.0-or-later"

src/aligned_textgrid/aligned_textgrid.py

@@ -794,9 +794,16 @@ def return_textgrid(self) -> Textgrid:
                 A `praatio` `Textgrid`
         """
         out_tg = Textgrid()
+        tier_names = []
+        dup_idx = 0
         for group in self.tier_groups:
             for tier in group:
-                out_tg.addTier(tier = tier.return_tier())
+                name = tier.name
+                if name in tier_names:
+                    name = f"{name}_{dup_idx}"
+                    dup_idx += 1 
+                tier_names += [name]
+                out_tg.addTier(tier = tier.return_tier(name))
         return out_tg
 
     def save_textgrid(

src/aligned_textgrid/points/tiers.py

@@ -202,14 +202,16 @@ def get_nearest_point(
         out_idx = self.get_nearest_point_index(time)
         return self.sequence_list[out_idx]
 
-    def return_tier(self) -> PointTier:
+    def return_tier(self, name:str|None = None) -> PointTier:
         """Returns SequencePointTier as a `praatio` PointTier
 
         Returns:
             (PointTier): A `praatio` point tier
         """
+        if name is None:
+            name = self.name
         all_points = [entry.return_point() for entry in self.sequence_list]
-        point_tier = PointTier(name = self.name, entries=all_points)
+        point_tier = PointTier(name = name, entries=all_points)
         return(point_tier)
 
     def save_as_tg(

src/aligned_textgrid/sequences/tiers.py

@@ -307,16 +307,19 @@ def get_interval_at_time(
         else:
             return None
 
-    def return_tier(self) -> IntervalTier:
+    def return_tier(self, name:str|None = None) -> IntervalTier:
         """Returns a `praatio` interval tier
 
         Returns:
             (praatio.data_classes.interval_tier.IntervalTier):
                 A `praatio` interval tier. Useful for saving results
                 back as a Praat TextGrid.
         """
+        
+        if name is None:
+            name = self.name
         all_intervals = [entry.return_interval() for entry in self.sequence_list]
-        interval_tier = IntervalTier(name = self.name, entries = all_intervals)
+        interval_tier = IntervalTier(name = name, entries = all_intervals)
         return interval_tier
 
 

tests/test_output.py

@@ -1,4 +1,4 @@
-from aligned_textgrid import AlignedTextGrid, Word, Phone
+from aligned_textgrid import AlignedTextGrid, Word, Phone, SequenceTier, TierGroup, custom_classes
 from aligned_textgrid.polar.polar_classes import PrStr, ToBI, \
     TurningPoints, Ranges, Levels, Misc
 from aligned_textgrid.polar.polar_grid import PolarGrid
@@ -82,4 +82,21 @@ class TestPickle:
         entry_classes=[Word, Phone]
     )
     def test_pickling(self):
-        assert cloudpickle.loads(cloudpickle.dumps(self.atg))
+        assert cloudpickle.loads(cloudpickle.dumps(self.atg))
+
+class TestCustomWrite:
+
+    def test_write(self):
+        Transcript, = custom_classes(["Transcript"])
+        the_dog = Transcript((0, 10, "the dog"))
+        the_cat = Transcript((10, 25, "dog cat"))
+        speaker1 = TierGroup([SequenceTier(entry_class=Transcript)])
+        speaker2 = TierGroup([SequenceTier(entry_class=Transcript)])
+
+        speaker1[0].append(the_dog)
+        speaker2[0].append(the_cat)
+        atg = AlignedTextGrid([speaker1, speaker2])
+        assert atg.return_textgrid()
+
+        
+