Anchor-annotator 0.5.0__py3-none-any.whl → 0.7.0__py3-none-any.whl

anchor/settings.py

@@ -116,6 +116,8 @@ class AnchorSettings(QtCore.QSettings):
     CLUSTERING_DISTANCE_THRESHOLD = "anchor/clustering/distance_threshold"
     CLUSTERING_METRIC = "anchor/clustering/metric"
 
+    PLOT_THREAD_COUNT = "anchor/plot/max_thread_count"
+
     PITCH_MAX_TIME = "anchor/pitch/max_time"
     PITCH_MIN_F0 = "anchor/pitch/min_f0"
     PITCH_MAX_F0 = "anchor/pitch/max_f0"
@@ -218,6 +220,7 @@ class AnchorSettings(QtCore.QSettings):
             AnchorSettings.TIER_TRANSCRIBED_WORDS_VISIBLE: True,
             AnchorSettings.TIER_TRANSCRIBED_PHONES_VISIBLE: True,
             AnchorSettings.THEME_PRESET: "MFA",
+            AnchorSettings.PLOT_THREAD_COUNT: 10,
         }
         self.default_values.update(self.mfa_theme)
         self.border_radius = 5
@@ -264,9 +267,10 @@ class AnchorSettings(QtCore.QSettings):
                 super(AnchorSettings, self).value(arg__1, self.default_values[arg__1])
             )
         elif "color" in arg__1:
-            value = QtGui.QColor(
-                super(AnchorSettings, self).value(arg__1, self.default_values[arg__1])
-            )
+            value = super(AnchorSettings, self).value(arg__1, self.default_values[arg__1])
+            if value is None:
+                value = self.default_values[arg__1]
+            value = QtGui.QColor(value)
         elif "keybind" in arg__1:
             value = QtGui.QKeySequence(
                 super(AnchorSettings, self).value(arg__1, self.default_values[arg__1])
@@ -319,6 +323,8 @@ class AnchorSettings(QtCore.QSettings):
 
     def set_theme(self, theme):
         for k, v in theme.items():
+            if v is None:
+                continue
             self.setValue(k, v)
         self.sync()
         self.themeUpdated.emit()
@@ -909,7 +915,7 @@ class AnchorSettings(QtCore.QSettings):
         }}
         QToolButton:checked  {{
             color: {active_color};
-            background-color: {active_background_color};
+            background-color: {hover_background_color};
             border-color: {active_border_color};
         }}
         QPushButton:disabled, QToolButton:disabled {{

anchor/ui_main_window.py

@@ -262,6 +262,8 @@ class Ui_MainWindow(object):
         self.segmentUtteranceAct.setIcon(icon6)
         self.openCorpusManagerAct = QAction(MainWindow)
         self.openCorpusManagerAct.setObjectName("openCorpusManagerAct")
+        self.verifyTranscriptsAct = QAction(MainWindow)
+        self.verifyTranscriptsAct.setObjectName("verifyTranscriptsAct")
         self.centralwidget = QWidget(MainWindow)
         self.centralwidget.setObjectName("centralwidget")
         self.verticalLayout_4 = QVBoxLayout(self.centralwidget)
@@ -663,6 +665,14 @@ class Ui_MainWindow(object):
             QCoreApplication.translate("MainWindow", "Manage corpora and models", None)
         )
         # endif // QT_CONFIG(tooltip)
+        self.verifyTranscriptsAct.setText(
+            QCoreApplication.translate("MainWindow", "Verify transcripts", None)
+        )
+        # if QT_CONFIG(tooltip)
+        self.verifyTranscriptsAct.setToolTip(
+            QCoreApplication.translate("MainWindow", "Verify transcripts", None)
+        )
+        # endif // QT_CONFIG(tooltip)
         self.menuCorpus.setTitle(QCoreApplication.translate("MainWindow", "Corpus", None))
         self.loadRecentCorpusMenu.setTitle(
             QCoreApplication.translate("MainWindow", "Load a recent corpus", None)

anchor/undo.py

@@ -427,28 +427,26 @@ class UpdateUtteranceTextCommand(FileCommand):
                 "UpdateUtteranceTextCommand", "Update utterance text"
             )
         )
+        self.tokenizer = self.corpus_model.corpus.get_tokenizer(
+            self.corpus_model.corpus.get_dict_id_for_speaker(
+                self.corpus_model.get_speaker_name(self.speaker_id)
+            )
+        )
 
-    def _redo(self, session) -> None:
-        oovs = set()
-        for w in self.new_text.split():
-            if not self.corpus_model.dictionary_model.check_word(w, self.speaker_id):
-                oovs.add(w)
-        self.utterance.text = self.new_text
-        self.utterance.normalized_text = self.new_text  # FIXME: Update this
+    def _process_text(self, session, text: str):
+        self.utterance.text = text
+        normalized_text, normalized_character_text, oovs = self.tokenizer(text)
+        self.utterance.normalized_text = normalized_text
+        self.utterance.normalized_character_text = normalized_character_text
         self.utterance.oovs = " ".join(oovs)
-        self.utterance.ignored = not self.new_text
+        self.utterance.ignored = not text
         session.merge(self.utterance)
 
+    def _redo(self, session) -> None:
+        self._process_text(session, self.new_text)
+
     def _undo(self, session) -> None:
-        oovs = set()
-        for w in self.new_text.split():
-            if not self.corpus_model.dictionary_model.check_word(w, self.speaker_id):
-                oovs.add(w)
-        self.utterance.text = self.old_text
-        self.utterance.normalized_text = self.old_text  # FIXME: Update this
-        self.utterance.oovs = " ".join(oovs)
-        self.utterance.ignored = not self.old_text
-        session.merge(self.utterance)
+        self._process_text(session, self.old_text)
 
     def id(self) -> int:
         return 1
@@ -767,7 +765,9 @@ class AddPronunciationCommand(DictionaryCommand):
 
     def _redo(self, session) -> None:
         if self.word_id is None:
-            self.word_id = session.query(Word.id).filter(Word.word == self.word).first()[0]
+            q = session.query(Word.id).filter(Word.word == self.word).first()
+            if q is not None:
+                self.word_id = q[0]
             if self.word_id is None:
                 self.word_id = session.query(sqlalchemy.func.max(Word.id)).scalar() + 1
                 word_mapping_id = (

anchor/widgets.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import os
 import re
+import time
 import typing
 from typing import TYPE_CHECKING, Optional
 
@@ -93,13 +94,6 @@ class MediaPlayer(QtMultimedia.QMediaPlayer):  # pragma: no cover
         self.fade_in_anim.setEasingCurve(QtCore.QEasingCurve.Type.Linear)
         self.fade_in_anim.setKeyValueAt(0.1, 0.1)
 
-        self.fade_out_anim = QtCore.QPropertyAnimation(self._audio_output, b"volume")
-        self.fade_out_anim.setDuration(5)
-        self.fade_out_anim.setStartValue(self._audio_output.volume())
-        self.fade_out_anim.setEndValue(0)
-        self.fade_out_anim.setEasingCurve(QtCore.QEasingCurve.Type.Linear)
-        self.fade_out_anim.setKeyValueAt(0.1, self._audio_output.volume())
-        self.fade_out_anim.finished.connect(super().pause)
         self.file_path = None
         self.set_volume(self.settings.value(self.settings.VOLUME))
 
@@ -113,6 +107,12 @@ class MediaPlayer(QtMultimedia.QMediaPlayer):  # pragma: no cover
     def play(self) -> None:
         if self.startTime() is None:
             return
+        if self.mediaStatus() not in {
+            QtMultimedia.QMediaPlayer.MediaStatus.BufferedMedia,
+            QtMultimedia.QMediaPlayer.MediaStatus.LoadedMedia,
+            QtMultimedia.QMediaPlayer.MediaStatus.EndOfMedia,
+        }:
+            return
         fade_in = self.settings.value(self.settings.ENABLE_FADE)
         if fade_in:
             self._audio_output.setVolume(0.1)
@@ -167,7 +167,7 @@ class MediaPlayer(QtMultimedia.QMediaPlayer):  # pragma: no cover
         if selection_model is None:
             return
         self.selection_model = selection_model
-        self.selection_model.fileChanged.connect(self.loadNewFile)
+        self.selection_model.fileChanged.connect(self.load_new_file)
         self.selection_model.viewChanged.connect(self.update_times)
         self.selection_model.selectionAudioChanged.connect(self.update_selection_times)
 
@@ -175,24 +175,23 @@ class MediaPlayer(QtMultimedia.QMediaPlayer):  # pragma: no cover
         self.settings.setValue(self.settings.VOLUME, volume)
         if self.audioOutput() is None:
             return
-        linearVolume = QtMultimedia.QtAudio.convertVolume(
+        linearVolume = QtMultimedia.QAudio.convertVolume(
             volume / 100.0,
-            QtMultimedia.QtAudio.VolumeScale.LogarithmicVolumeScale,
-            QtMultimedia.QtAudio.VolumeScale.LinearVolumeScale,
+            QtMultimedia.QAudio.VolumeScale.LogarithmicVolumeScale,
+            QtMultimedia.QAudio.VolumeScale.LinearVolumeScale,
         )
         self.audioOutput().setVolume(linearVolume)
         self.fade_in_anim.setEndValue(linearVolume)
-        self.fade_out_anim.setStartValue(linearVolume)
 
     def volume(self) -> int:
         if self.audioOutput() is None:
             return 100
         volume = self.audioOutput().volume()
         volume = int(
-            QtMultimedia.QtAudio.convertVolume(
+            QtMultimedia.QAudio.convertVolume(
                 volume,
-                QtMultimedia.QtAudio.VolumeScale.LinearVolumeScale,
-                QtMultimedia.QtAudio.VolumeScale.LogarithmicVolumeScale,
+                QtMultimedia.QAudio.VolumeScale.LinearVolumeScale,
+                QtMultimedia.QAudio.VolumeScale.LogarithmicVolumeScale,
             )
             * 100
         )
@@ -211,9 +210,13 @@ class MediaPlayer(QtMultimedia.QMediaPlayer):  # pragma: no cover
             self.stop()
             self.setCurrentTime(self.startTime())
 
-    def loadNewFile(self, *args):
-        self.audioReady.emit(False)
-        self.stop()
+    def load_new_file(self, *args):
+        if self.playbackState() in {
+            QtMultimedia.QMediaPlayer.PlaybackState.PlayingState,
+            QtMultimedia.QMediaPlayer.PlaybackState.PausedState,
+        }:
+            self.stop()
+            time.sleep(0.1)
         try:
             new_file = self.selection_model.model().file.sound_file.sound_file_path
         except Exception:
@@ -227,8 +230,6 @@ class MediaPlayer(QtMultimedia.QMediaPlayer):  # pragma: no cover
             self.setSource(QtCore.QUrl())
             return
         self.setSource(f"file:///{new_file}")
-        self.setPosition(0)
-        self.audioReady.emit(True)
 
     def currentTime(self):
         pos = self.position()
@@ -1063,21 +1064,72 @@ class SearchBox(ClearableField):
 
     def __init__(self, *args):
         super().__init__(*args)
+        settings = AnchorSettings()
         self.returnPressed.connect(self.activate)
         self.setObjectName("search_box")
 
         self.clear_action.triggered.connect(self.returnPressed.emit)
 
-        regex_icon = QtGui.QIcon.fromTheme("edit-regex")
+        regex_icon = QtGui.QIcon()
+        word_icon = QtGui.QIcon()
+        case_icon = QtGui.QIcon()
+        if (
+            settings.theme_preset == "Native"
+            and QtGui.QGuiApplication.styleHints().colorScheme() == QtCore.Qt.ColorScheme.Dark
+        ):
+            regex_icon.addFile(
+                ":icons/anchor_dark/actions/edit-regex.svg",
+                mode=QtGui.QIcon.Mode.Normal,
+                state=QtGui.QIcon.State.Off,
+            )
+            word_icon.addFile(
+                ":icons/anchor_dark/actions/edit-word.svg",
+                mode=QtGui.QIcon.Mode.Normal,
+                state=QtGui.QIcon.State.Off,
+            )
+            case_icon.addFile(
+                ":icons/anchor_dark/actions/edit-case.svg",
+                mode=QtGui.QIcon.Mode.Normal,
+                state=QtGui.QIcon.State.Off,
+            )
+        else:
+            regex_icon.addFile(
+                ":icons/anchor_light/actions/edit-regex.svg",
+                mode=QtGui.QIcon.Mode.Normal,
+                state=QtGui.QIcon.State.Off,
+            )
+            word_icon.addFile(
+                ":icons/anchor_light/actions/edit-word.svg",
+                mode=QtGui.QIcon.Mode.Normal,
+                state=QtGui.QIcon.State.Off,
+            )
+            case_icon.addFile(
+                ":icons/anchor_light/actions/edit-case.svg",
+                mode=QtGui.QIcon.Mode.Normal,
+                state=QtGui.QIcon.State.Off,
+            )
+        regex_icon.addFile(
+            ":icons/edit-regex-checked.svg",
+            mode=QtGui.QIcon.Mode.Normal,
+            state=QtGui.QIcon.State.On,
+        )
+        word_icon.addFile(
+            ":icons/edit-word-checked.svg",
+            mode=QtGui.QIcon.Mode.Normal,
+            state=QtGui.QIcon.State.On,
+        )
+        case_icon.addFile(
+            ":icons/edit-case-checked.svg",
+            mode=QtGui.QIcon.Mode.Normal,
+            state=QtGui.QIcon.State.On,
+        )
 
         self.regex_action = QtGui.QAction(icon=regex_icon, parent=self)
         self.regex_action.setCheckable(True)
 
-        word_icon = QtGui.QIcon.fromTheme("edit-word")
         self.word_action = QtGui.QAction(icon=word_icon, parent=self)
         self.word_action.setCheckable(True)
 
-        case_icon = QtGui.QIcon.fromTheme("edit-case")
         self.case_action = QtGui.QAction(icon=case_icon, parent=self)
         self.case_action.setCheckable(True)
 
@@ -1108,7 +1160,7 @@ class SearchBox(ClearableField):
     def query(self) -> TextFilterQuery:
         filter = TextFilterQuery(
             super().text(),
-            self.regex_action.isChecked() or self.word_action.isChecked(),
+            self.regex_action.isChecked(),
             self.word_action.isChecked(),
             self.case_action.isChecked(),
         )
@@ -2063,7 +2115,7 @@ class OovTableView(AnchorTableView):
 
     def generate_context_menu(self, location):
         menu = QtWidgets.QMenu()
-        # menu.setStyleSheet(self.settings.menu_style_sheet)
+        menu.setStyleSheet(self.settings.menu_style_sheet)
         menu.addAction(self.add_pronunciation_action)
         menu.exec_(self.mapToGlobal(location))
 
@@ -2122,7 +2174,7 @@ class DictionaryTableView(AnchorTableView):
 
     def generate_context_menu(self, location):
         menu = QtWidgets.QMenu()
-        # menu.setStyleSheet(self.settings.menu_style_sheet)
+        menu.setStyleSheet(self.settings.menu_style_sheet)
         menu.addAction(self.add_pronunciation_action)
         menu.addSeparator()
         menu.addAction(self.delete_words_action)
@@ -2205,8 +2257,7 @@ class SpeakerTableView(AnchorTableView):
             | QtWidgets.QAbstractItemView.EditTrigger.DoubleClicked
         )
         self.speaker_model: SpeakerModel = None
-        self.view_delegate = ButtonDelegate(":magnifying-glass.svg", self)
-        self.delete_delegate = ButtonDelegate(":expand.svg", self)
+        self.view_delegate = ButtonDelegate("edit-find", self)
         self.edit_delegate = EditableDelegate(self)
         self.speaker_delegate = SpeakerViewDelegate(self)
         self.setItemDelegateForColumn(1, self.speaker_delegate)
@@ -2500,7 +2551,7 @@ class ButtonDelegate(QtWidgets.QStyledItemDelegate):
         options = QtWidgets.QStyleOptionViewItem(option)
         options.rect = QtCore.QRect(x, y, self.settings.icon_size, self.settings.icon_size)
         self.initStyleOption(options, index)
-        icon = QtGui.QIcon(self.icon_path)
+        icon = QtGui.QIcon.fromTheme(self.icon_path)
         icon.paint(painter, options.rect, QtCore.Qt.AlignmentFlag.AlignCenter)
 
         painter.restore()
@@ -2899,9 +2950,13 @@ class AlignmentWidget(QtWidgets.QWidget):
     def __init__(self, *args):
         super().__init__(*args)
         self.button = QtWidgets.QToolButton()
-        layout = QtWidgets.QFormLayout()
+        self.verify_button = QtWidgets.QToolButton()
+        form_layout = QtWidgets.QFormLayout()
+        button_layout = QtWidgets.QHBoxLayout()
+        layout = QtWidgets.QVBoxLayout()
         self.acoustic_model_label = QtWidgets.QLabel("Not loaded")
         self.dictionary_label = QtWidgets.QLabel("Not loaded")
+        self.interjection_word_label = QtWidgets.QLabel("Not loaded")
         self.fine_tune_check = QtWidgets.QCheckBox()
         self.beam = QtWidgets.QSpinBox()
         self.beam.setMinimum(6)
@@ -2914,14 +2969,18 @@ class AlignmentWidget(QtWidgets.QWidget):
         self.silence_boost = ThresholdWidget()
         self.silence_boost.setText("1.0")
         self.cutoff_check = QtWidgets.QCheckBox()
-        layout.addRow(QtWidgets.QLabel("Acoustic model"), self.acoustic_model_label)
-        layout.addRow(QtWidgets.QLabel("Dictionary"), self.dictionary_label)
-        layout.addRow(QtWidgets.QLabel("Beam"), self.beam)
-        layout.addRow(QtWidgets.QLabel("Retry beam"), self.retry_beam)
-        layout.addRow(QtWidgets.QLabel("Silence boost factor"), self.silence_boost)
-        layout.addRow(QtWidgets.QLabel("Fine tune"), self.fine_tune_check)
-        layout.addRow(QtWidgets.QLabel("Cutoff modeling"), self.cutoff_check)
-        layout.addWidget(self.button)
+        form_layout.addRow(QtWidgets.QLabel("Acoustic model"), self.acoustic_model_label)
+        form_layout.addRow(QtWidgets.QLabel("Dictionary"), self.dictionary_label)
+        form_layout.addRow(QtWidgets.QLabel("Beam"), self.beam)
+        form_layout.addRow(QtWidgets.QLabel("Retry beam"), self.retry_beam)
+        form_layout.addRow(QtWidgets.QLabel("Silence boost factor"), self.silence_boost)
+        form_layout.addRow(QtWidgets.QLabel("Fine tune"), self.fine_tune_check)
+        form_layout.addRow(QtWidgets.QLabel("Cutoff modeling"), self.cutoff_check)
+        form_layout.addRow(QtWidgets.QLabel("Interjection words"), self.interjection_word_label)
+        layout.addLayout(form_layout)
+        button_layout.addWidget(self.button)
+        button_layout.addWidget(self.verify_button)
+        layout.addLayout(button_layout)
         self.text = QtWidgets.QTextEdit()
         self.text.setReadOnly(True)
         layout.addWidget(self.text)
@@ -2930,6 +2989,10 @@ class AlignmentWidget(QtWidgets.QWidget):
 
     def refresh(self):
         validate_enabled = True
+        num_interjection_words = self.corpus_model.get_interjection_count()
+        self.interjection_word_label.setText(str(num_interjection_words))
+        if self.verify_button.defaultAction() is not None:
+            self.verify_button.defaultAction().setEnabled(num_interjection_words > 0)
         if self.corpus_model.has_dictionary:
             self.dictionary_label.setText(self.corpus_model.corpus.dictionary_model.name)
         else:
@@ -2948,6 +3011,7 @@ class AlignmentWidget(QtWidgets.QWidget):
         self.refresh()
         self.corpus_model.dictionaryChanged.connect(self.refresh)
         self.corpus_model.acousticModelChanged.connect(self.refresh)
+        self.corpus_model.corpusLoaded.connect(self.refresh)
 
     def parameters(self):
         return {
@@ -3228,6 +3292,7 @@ class SpeakerWidget(QtWidgets.QWidget):
                         session.query(Speaker.id).filter(Speaker.name == speaker_id).first()
                     )
                     if actual_speaker_id is None:
+                        self.speaker_model.set_speaker_filter(speaker_id)
                         return
                     self.speaker_dropdown.completions[speaker_id] = actual_speaker_id[0]
                     speaker_id = actual_speaker_id[0]