Anchor-annotator 0.3.1__tar.gz → 0.3.3__tar.gz

{anchor_annotator-0.3.1 → anchor_annotator-0.3.3/Anchor_annotator.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Anchor_annotator
-Version: 0.3.1
+Version: 0.3.3
 Summary: Anchor annotator is a program for inspecting corpora for the Montreal Forced Aligner and correcting transcriptions and pronunciations.
 Home-page: https://github.com/MontrealCorpusTools/Anchor-annotator
 Author: Montreal Corpus Tools

{anchor_annotator-0.3.1/Anchor_annotator.egg-info → anchor_annotator-0.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Anchor_annotator
-Version: 0.3.1
+Version: 0.3.3
 Summary: Anchor annotator is a program for inspecting corpora for the Montreal Forced Aligner and correcting transcriptions and pronunciations.
 Home-page: https://github.com/MontrealCorpusTools/Anchor-annotator
 Author: Montreal Corpus Tools

{anchor_annotator-0.3.1 → anchor_annotator-0.3.3}/anchor/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.3.1'
-__version_tuple__ = version_tuple = (0, 3, 1)
+__version__ = version = '0.3.3'
+__version_tuple__ = version_tuple = (0, 3, 3)

{anchor_annotator-0.3.1 → anchor_annotator-0.3.3}/anchor/main.py

@@ -1087,8 +1087,8 @@ class MainWindow(QtWidgets.QMainWindow):
             )
             for m in (
                 session.query(anchor.db.AcousticModel)
-                .order_by(anchor.db.AcousticModel.last_used.desc())
                 .filter_by(available_locally=True)
+                .order_by(anchor.db.AcousticModel.last_used.desc())
             ):
                 a = QtGui.QAction(f"{m.path} [{m.name}]", parent=self)
                 a.setData(m.id)
@@ -1105,8 +1105,8 @@ class MainWindow(QtWidgets.QMainWindow):
 
             for m in (
                 session.query(anchor.db.Dictionary)
-                .order_by(anchor.db.Dictionary.last_used.desc())
                 .filter_by(available_locally=True)
+                .order_by(anchor.db.Dictionary.last_used.desc())
             ):
                 a = QtGui.QAction(text=f"{m.path} [{m.name}]", parent=self)
                 a.setData(m.id)
@@ -1122,8 +1122,8 @@ class MainWindow(QtWidgets.QMainWindow):
 
             for m in (
                 session.query(anchor.db.LanguageModel)
-                .order_by(anchor.db.LanguageModel.last_used.desc())
                 .filter_by(available_locally=True)
+                .order_by(anchor.db.LanguageModel.last_used.desc())
             ):
                 a = QtGui.QAction(text=f"{m.path} [{m.name}]", parent=self)
                 a.setData(m.id)
@@ -1139,8 +1139,8 @@ class MainWindow(QtWidgets.QMainWindow):
 
             for m in (
                 session.query(anchor.db.G2PModel)
-                .order_by(anchor.db.G2PModel.last_used.desc())
                 .filter_by(available_locally=True)
+                .order_by(anchor.db.G2PModel.last_used.desc())
             ):
                 a = QtGui.QAction(text=f"{m.path} [{m.name}]", parent=self)
                 a.setData(m.id)
@@ -1932,7 +1932,7 @@ class MainWindow(QtWidgets.QMainWindow):
                 session.query(anchor.db.AnchorCorpus).filter_by(current=True).update(
                     {anchor.db.AnchorCorpus.acoustic_model_id: m_id}
                 )
-                session.query(anchor.db.AcousticModel).filter_by(
+                session.query(anchor.db.AcousticModel).filter(
                     anchor.db.AcousticModel.id == m_id
                 ).update(
                     {
@@ -2003,9 +2003,7 @@ class MainWindow(QtWidgets.QMainWindow):
                 session.query(anchor.db.AnchorCorpus).filter_by(current=True).update(
                     {anchor.db.AnchorCorpus.dictionary_id: m_id}
                 )
-                session.query(anchor.db.Dictionary).filter_by(
-                    anchor.db.Dictionary.id == m_id
-                ).update(
+                session.query(anchor.db.Dictionary).filter(anchor.db.Dictionary.id == m_id).update(
                     {
                         anchor.db.Dictionary.last_used: datetime.datetime.now(),
                     }
@@ -2060,7 +2058,7 @@ class MainWindow(QtWidgets.QMainWindow):
                 session.query(anchor.db.AnchorCorpus).filter_by(current=True).update(
                     {anchor.db.AnchorCorpus.language_model_id: m_id}
                 )
-                session.query(anchor.db.LanguageModel).filter_by(
+                session.query(anchor.db.LanguageModel).filter(
                     anchor.db.LanguageModel.id == m_id
                 ).update(
                     {
@@ -2139,7 +2137,7 @@ class MainWindow(QtWidgets.QMainWindow):
                         anchor.db.AnchorCorpus.g2p_model_id: m_id,
                     }
                 )
-                session.query(anchor.db.G2PModel).filter_by(anchor.db.G2PModel.id == m_id).update(
+                session.query(anchor.db.G2PModel).filter(anchor.db.G2PModel.id == m_id).update(
                     {
                         anchor.db.G2PModel.last_used: datetime.datetime.now(),
                     }
@@ -2182,7 +2180,7 @@ class MainWindow(QtWidgets.QMainWindow):
                 session.query(anchor.db.AnchorCorpus).filter_by(current=True).update(
                     {anchor.db.AnchorCorpus.ivector_extractor_id: m_id}
                 )
-                session.query(anchor.db.IvectorExtractor).filter_by(
+                session.query(anchor.db.IvectorExtractor).filter(
                     anchor.db.IvectorExtractor.id == m_id
                 ).update(
                     {

{anchor_annotator-0.3.1 → anchor_annotator-0.3.3}/anchor/models.py

@@ -166,6 +166,7 @@ class FileUtterancesModel(QtCore.QAbstractListModel):
 
     waveformReady = QtCore.Signal()
     utterancesReady = QtCore.Signal()
+    speakersChanged = QtCore.Signal()
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -325,6 +326,7 @@ class FileUtterancesModel(QtCore.QAbstractListModel):
             if utterance.speaker_id not in self.speakers:
                 self.speakers.append(utterance.speaker_id)
                 self.speaker_channel_mapping[utterance.speaker_id] = utterance.channel
+                self.speakersChanged.emit()
             self._speaker_indices[index] = utterance.speaker_id
 
     def merge_table_utterances(
@@ -848,6 +850,8 @@ class FileSelectionModel(QtCore.QItemSelectionModel):
         except sqlalchemy.orm.exc.DetachedInstanceError:
             new_file = True
         self.requested_utterance_id = utterance_id
+        self.selected_min_time = None
+        self.selected_max_time = None
         if new_file:
             self.fileAboutToChange.emit()
             self.model().set_file(file_id)
@@ -943,8 +947,7 @@ class CorpusSelectionModel(QtCore.QItemSelectionModel):
         self.currentRowChanged.connect(self.switch_utterance)
         # self.selectionChanged.connect(self.update_selection_audio)
         # self.selectionChanged.connect(self.update_selection_audio)
-        # self.model().changeCommandFired.connect(self.expire_current)
-        self.model().layoutChanged.connect(self.check_selection)
+        self.model().newResults.connect(self.check_selection)
         self.model().unlockCorpus.connect(self.fileChanged.emit)
 
     def set_current_utterance(self, utterance_id):
@@ -2275,32 +2278,6 @@ class CorpusModel(TableModel):
             self._speaker_indices[row],
         )
 
-    def fileAt(self, index) -> int:
-        if not isinstance(index, int):
-            if not index.isValid():
-                return None
-            index = index.row()
-        return self._file_indices[index]
-
-    def indexForUtterance(self, utterance_id: int, column: int = 1):
-        return self.createIndex(self.reversed_indices[utterance_id], column)
-
-    def rollback_changes(self):
-        self.unsaved_files = set()
-        self.session.rollback()
-        # self.query_session.expire_all()
-        self.databaseSynced.emit(False)
-        self.update_data()
-
-    def commit_changes(self):
-        self.session.bulk_update_mappings(
-            File, [{"id": x, "modified": True} for x in self.unsaved_files]
-        )
-
-        self.unsaved_files = set()
-        self.session.commit()
-        self.databaseSynced.emit(True)
-
     def finish_export_files(self):
         self.filesSaved.emit()
 
@@ -2586,7 +2563,6 @@ class CorpusTableModel(QtCore.QAbstractTableModel):
         self.session.commit()
         corpus_name = os.path.basename(corpus_directory)
         c = anchor.db.AnchorCorpus(name=corpus_name, path=corpus_directory, current=True, **kwargs)
-        print(c.current)
         self.session.add(c)
         self.session.commit()
         self.corpora.append(c)

{anchor_annotator-0.3.1 → anchor_annotator-0.3.3}/anchor/plot.py

@@ -2510,6 +2510,16 @@ class SpeakerTier(pg.GraphicsObject):
         self.corpus_model.refreshUtteranceText.connect(self.refreshTexts)
         self.selection_model.selectionChanged.connect(self.update_select)
         self.selection_model.model().utterancesReady.connect(self.refresh)
+        self.file_model.speakersChanged.connect(self.update_available_speakers)
+        self.available_speakers = {}
+
+    def update_available_speakers(self):
+        self.available_speakers = {}
+        for speaker_id in self.file_model.speakers:
+            speaker_name = self.corpus_model.get_speaker_name(speaker_id)
+            self.available_speakers[speaker_name] = speaker_id
+        for reg in self.visible_utterances.values():
+            reg.available_speakers = self.available_speakers
 
     def wheelEvent(self, ev):
         self.receivedWheelEvent.emit(ev)

{anchor_annotator-0.3.1 → anchor_annotator-0.3.3}/anchor/undo.py

@@ -6,7 +6,7 @@ import typing
 import pynini.lib
 import sqlalchemy
 from montreal_forced_aligner.data import WordType
-from montreal_forced_aligner.db import File, Pronunciation, Speaker, Utterance, Word
+from montreal_forced_aligner.db import File, Pronunciation, Speaker, Utterance, Word, bulk_update
 from PySide6 import QtCore, QtGui
 from sqlalchemy.orm import make_transient
 
@@ -643,18 +643,18 @@ class UpdateUtteranceSpeakerCommand(FileCommand):
                 )
             )
             session.flush()
+        mappings = []
         for u in self.utterances:
             u.speaker_id = self.new_speaker_id
-        session.query(Speaker).filter(
-            Speaker.id.in_(self.old_speaker_ids + [self.new_speaker_id])
-        ).update({Speaker.modified: True})
+            mappings.append({"id": u.id, "speaker_id": self.new_speaker_id})
+        bulk_update(self.corpus_model.session, Utterance, mappings)
 
     def _undo(self, session) -> None:
+        mappings = []
         for i, u in enumerate(self.utterances):
             u.speaker_id = self.old_speaker_ids[i]
-        session.query(Speaker).filter(
-            Speaker.id.in_(self.old_speaker_ids + [self.new_speaker_id])
-        ).update({Speaker.modified: True})
+            mappings.append({"id": u.id, "speaker_id": self.old_speaker_ids[i]})
+        bulk_update(self.corpus_model.session, Utterance, mappings)
 
     def update_data(self):
         super().update_data()

{anchor_annotator-0.3.1 → anchor_annotator-0.3.3}/anchor/widgets.py

@@ -125,6 +125,7 @@ class MediaPlayer(QtMultimedia.QMediaPlayer):  # pragma: no cover
             or self.currentTime() >= self.maxTime()
         ):
             self.setCurrentTime(self.startTime())
+        self.timer.start()
         super(MediaPlayer, self).play()
         if fade_in:
             self.fade_in_anim.start()
@@ -155,8 +156,6 @@ class MediaPlayer(QtMultimedia.QMediaPlayer):  # pragma: no cover
             self.timer.stop()
             self.setCurrentTime(self.startTime())
             self.timeChanged.emit(self.currentTime())
-        elif state == QtMultimedia.QMediaPlayer.PlaybackState.PlayingState:
-            self.timer.start()
         elif state == QtMultimedia.QMediaPlayer.PlaybackState.PausedState:
             self.timer.stop()
 
@@ -183,10 +182,10 @@ class MediaPlayer(QtMultimedia.QMediaPlayer):  # pragma: no cover
     def set_volume(self, volume: int):
         if self.audioOutput() is None:
             return
-        linearVolume = QtMultimedia.QAudio.convertVolume(
+        linearVolume = QtMultimedia.QtAudio.convertVolume(
             volume / 100.0,
-            QtMultimedia.QAudio.VolumeScale.LogarithmicVolumeScale,
-            QtMultimedia.QAudio.VolumeScale.LinearVolumeScale,
+            QtMultimedia.QtAudio.VolumeScale.LogarithmicVolumeScale,
+            QtMultimedia.QtAudio.VolumeScale.LinearVolumeScale,
         )
         self.audioOutput().setVolume(linearVolume)
 
@@ -195,10 +194,10 @@ class MediaPlayer(QtMultimedia.QMediaPlayer):  # pragma: no cover
             return 100
         volume = self.audioOutput().volume()
         volume = int(
-            QtMultimedia.QAudio.convertVolume(
+            QtMultimedia.QtAudio.convertVolume(
                 volume,
-                QtMultimedia.QAudio.VolumeScale.LinearVolumeScale,
-                QtMultimedia.QAudio.VolumeScale.LogarithmicVolumeScale,
+                QtMultimedia.QtAudio.VolumeScale.LinearVolumeScale,
+                QtMultimedia.QtAudio.VolumeScale.LogarithmicVolumeScale,
             )
             * 100
         )

{anchor_annotator-0.3.1 → anchor_annotator-0.3.3}/anchor/workers.py

@@ -3171,7 +3171,6 @@ class SpectrogramWorker(FunctionWorker):  # pragma: no cover
                 self.y = scipy.signal.resample(
                     self.y, int(self.y.shape[0] * max_sr / self.sample_rate)
                 )
-                # self.y = resampy.resample(self.y, self.sample_rate, max_sr, filter='kaiser_fast')
                 self.sample_rate = max_sr
             self.y = librosa.effects.preemphasis(self.y, coef=pre_emph_coeff)
             if self.stopped.is_set():

{anchor_annotator-0.3.1 → anchor_annotator-0.3.3}/docs/source/changelog/index.rst

@@ -6,6 +6,21 @@ Changelog
 
    Alpha releases
 
+0.3.3
+-----
+
+- Fixed a bug in loading saved dictionaries and models
+
+0.3.2
+-----
+
+- Fixed compatibility with Qt 6.7
+
+0.3.1
+-----
+
+- Fixed a crash on launch
+
 0.3.0
 -----