Anchor-annotator 0.3.2__py3-none-any.whl → 0.4.0__py3-none-any.whl

{Anchor_annotator-0.3.2.dist-info → Anchor_annotator-0.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Anchor_annotator
-Version: 0.3.2
+Version: 0.4.0
 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.4.0.dist-info/RECORD

@@ -0,0 +1,22 @@
+anchor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+anchor/__main__.py,sha256=5ufG8lcx2x1am-04xI991AG7saJd24dxPw5JzjmB878,45
+anchor/_version.py,sha256=j90u3VVU4UrJf1fgMUhaZarHK_Do2XGYXr-vZvOFzVo,411
+anchor/command_line.py,sha256=EucG805HyWk_zkMO9RXv9Yj0I0JVdDLZb1_DX2_ISjM,503
+anchor/db.py,sha256=ef4lO6HtCKoxC9CorIc0ZbPxKpjHa576a0ZIBOWNU9E,4956
+anchor/main.py,sha256=cZjj_PbAC2CPDneEy8HGNfH7F1hZpQexevFjBev9YxE,120664
+anchor/models.py,sha256=Uaz_IobsG6aPDH9xfZYwN8bBDzc7U-rcbgm0jqihyd4,95763
+anchor/plot.py,sha256=fUIVvSV7MIvV1HyNo5eZmi1PKun0WFDrnSXHkJD70zA,105668
+anchor/resources_rc.py,sha256=94wgxDTpP4Oy55Br7CZ_YnmvaqzHr4n-AydBPhZc-es,8427242
+anchor/settings.py,sha256=OdJQl54rhQ-JmsDiWIULxMFZZatM4arZ37hnmkk_VM4,47583
+anchor/ui_corpus_manager.py,sha256=e3ybOd4UdYarrLBATxI8vIFnioa4R_BHrbsEz5mJ5eA,8564
+anchor/ui_error_dialog.py,sha256=c_QS0s1VaJEV9AhcrQZQyWHHpUPudWjJY1NI7Ytipio,3832
+anchor/ui_main_window.py,sha256=MYb4PtV1sHYgnc3QwPphKjU3LepzBJpxllhN4nyDook,63525
+anchor/ui_preferences.py,sha256=MOC2dY4qkViW9cUbC0DVSO7FLg-dGSbmR630WFQ6V9c,41843
+anchor/undo.py,sha256=FrzTz9hSUXV6jFJ7EUurxY5NmftQ5NWhtVzzYuVmcRo,32959
+anchor/widgets.py,sha256=Lw2y9bymDiu01eGqLR0M8CSjXYV5-e037XqRQiX7Wn8,157619
+anchor/workers.py,sha256=SUrafStLUrdhi5b3QhkRYKdFghasDc8lxsUCZOF_FRg,171159
+Anchor_annotator-0.4.0.dist-info/LICENSE,sha256=C0oIsblENEgWQ7XMNdYoXyXsIA5wa3YF0I9lK3H7A1s,1076
+Anchor_annotator-0.4.0.dist-info/METADATA,sha256=EMWnDUTa3Di2cpH4RiP6buwD67Nj-m5vdkkstIFf8M8,1500
+Anchor_annotator-0.4.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+Anchor_annotator-0.4.0.dist-info/top_level.txt,sha256=wX6ZKxImGRZKFQjs3f6XYw_TfbAp6Xs3SmbLfLbFAJ0,7
+Anchor_annotator-0.4.0.dist-info/RECORD,,

anchor/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.3.2'
-__version_tuple__ = version_tuple = (0, 3, 2)
+__version__ = version = '0.4.0'
+__version_tuple__ = version_tuple = (0, 4, 0)

anchor/main.py

@@ -540,14 +540,14 @@ class MainWindow(QtWidgets.QMainWindow):
             self.dictionary_model,
         )
         self.ui.speakerWidget.set_models(
-            self.corpus_model, self.selection_model, self.speaker_model
+            self.corpus_model, self.file_selection_model, self.speaker_model
         )
         self.ui.transcriptionWidget.set_models(self.corpus_model, self.dictionary_model)
         self.ui.alignmentWidget.set_models(self.corpus_model)
         self.ui.acousticModelWidget.set_models(self.corpus_model)
         self.ui.languageModelWidget.set_models(self.corpus_model)
         self.ui.dictionaryWidget.set_models(self.dictionary_model)
-        self.ui.diarizationWidget.set_models(self.diarization_model, self.selection_model)
+        self.ui.diarizationWidget.set_models(self.diarization_model, self.file_selection_model)
         self.ui.oovWidget.set_models(self.oov_model)
         self.file_selection_model.currentUtteranceChanged.connect(self.change_utterance)
         self.selection_model.fileViewRequested.connect(self.file_selection_model.set_current_file)
@@ -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)
@@ -1385,6 +1385,8 @@ class MainWindow(QtWidgets.QMainWindow):
         self.ui.languageModelMenu.setEnabled(True)
 
     def finalize_load_g2p_model(self, generator: PyniniValidator):
+        if generator is None:
+            return
         self.dictionary_model.set_g2p_generator(generator)
         self.corpus_model.g2p_model = generator.g2p_model
         self.check_actions()
@@ -1932,7 +1934,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 +2005,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 +2060,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 +2139,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 +2182,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/models.py

@@ -24,6 +24,12 @@ from montreal_forced_aligner.corpus.acoustic_corpus import (
 )
 from montreal_forced_aligner.data import PhoneType, WordType
 from montreal_forced_aligner.db import File, Phone, Speaker, Utterance
+from montreal_forced_aligner.dictionary.mixins import (
+    DEFAULT_CLITIC_MARKERS,
+    DEFAULT_COMPOUND_MARKERS,
+    DEFAULT_PUNCTUATION,
+    DEFAULT_WORD_BREAK_MARKERS,
+)
 from montreal_forced_aligner.g2p.generator import PyniniValidator
 from montreal_forced_aligner.models import (
     AcousticModel,
@@ -45,6 +51,23 @@ if typing.TYPE_CHECKING:
 logger = logging.getLogger("anchor")
 
 
+WORD_BREAK_SET = "".join(
+    sorted(
+        set(
+            DEFAULT_WORD_BREAK_MARKERS
+            + DEFAULT_PUNCTUATION
+            + DEFAULT_CLITIC_MARKERS
+            + DEFAULT_COMPOUND_MARKERS
+        )
+    )
+)
+
+if "-" in WORD_BREAK_SET:
+    WORD_BREAK_SET = "" + WORD_BREAK_SET.replace("-", "")
+
+WORD_BREAK_REGEX_SET = rf"[\s{WORD_BREAK_SET}]"
+
+
 # noinspection PyUnresolvedReferences
 @dataclass(slots=True)
 class TextFilterQuery:
@@ -76,9 +99,9 @@ class TextFilterQuery:
         if posix:
             text = text.replace(r"\b", word_break_set)
             if text.startswith(r"\b"):
-                text = r"((?<=\s)|(?<=^))" + text[2:]
+                text = rf"((?<={WORD_BREAK_REGEX_SET})|(?<=^))" + text[2:]
             if text.endswith(r"\b"):
-                text = text[:-2] + r"((?=\s)|(?=$))"
+                text = text[:-2] + rf"((?={WORD_BREAK_REGEX_SET})|(?=$))"
         if self.regex or self.word:
             if not self.case_sensitive:
                 text = "(?i)" + text
@@ -545,7 +568,6 @@ class FileSelectionModel(QtCore.QItemSelectionModel):
     resetView = QtCore.Signal()
     viewChanged = QtCore.Signal(object, object)
     selectionAudioChanged = QtCore.Signal()
-    currentTimeChanged = QtCore.Signal(object)
     currentUtteranceChanged = QtCore.Signal()
     speakerRequested = QtCore.Signal(object)
 
@@ -710,7 +732,8 @@ class FileSelectionModel(QtCore.QItemSelectionModel):
             end = None
         self.selected_min_time = begin
         self.selected_max_time = end
-        self.selectionAudioChanged.emit()
+        if self.selected_min_time != self.min_time:
+            self.selectionAudioChanged.emit()
 
     def request_start_time(self, start_time):
         if start_time >= self.max_time:
@@ -719,7 +742,8 @@ class FileSelectionModel(QtCore.QItemSelectionModel):
             return
         self.selected_min_time = start_time
         self.selected_max_time = None
-        self.selectionAudioChanged.emit()
+        if self.selected_min_time != self.min_time:
+            self.selectionAudioChanged.emit()
 
     def set_current_channel(self, channel):
         if channel == self.selected_channel:
@@ -804,7 +828,8 @@ class FileSelectionModel(QtCore.QItemSelectionModel):
             end = self.max_time
         self.selected_min_time = begin
         self.selected_max_time = end
-        self.selectionAudioChanged.emit()
+        if self.selected_min_time != self.min_time:
+            self.selectionAudioChanged.emit()
 
     def visible_utterances(self) -> typing.List[Utterance]:
         file_utts = []
@@ -843,8 +868,7 @@ class FileSelectionModel(QtCore.QItemSelectionModel):
             self.selected_max_time = None
         self.viewChanged.emit(self.min_time, self.max_time)
 
-    def set_current_file(self, info, force_update=False):
-        file_id, begin, end, utterance_id, speaker_id = info
+    def set_current_file(self, file_id, begin, end, utterance_id, speaker_id, force_update=False):
         try:
             new_file = self.model().file is None or self.model().file.id != file_id
         except sqlalchemy.orm.exc.DetachedInstanceError:
@@ -926,7 +950,7 @@ class CorpusSelectionModel(QtCore.QItemSelectionModel):
     channelChanged = QtCore.Signal()
     resetView = QtCore.Signal()
     fileAboutToChange = QtCore.Signal()
-    fileViewRequested = QtCore.Signal(object)
+    fileViewRequested = QtCore.Signal(object, object, object, object, object)
     selectionAudioChanged = QtCore.Signal()
     currentTimeChanged = QtCore.Signal(object)
     currentUtteranceChanged = QtCore.Signal()
@@ -1023,7 +1047,7 @@ class CorpusSelectionModel(QtCore.QItemSelectionModel):
         if focus:
             flags |= QtCore.QItemSelectionModel.SelectionFlag.Current
             if row == self.currentIndex().row():
-                self.fileViewRequested.emit(self.model().audio_info_for_utterance(row))
+                self.fileViewRequested.emit(*self.model().audio_info_for_utterance(row))
 
         index = self.model().index(row, 0)
         if not index.isValid():
@@ -1082,7 +1106,7 @@ class CorpusSelectionModel(QtCore.QItemSelectionModel):
             return
         self.current_utterance_id = utt
         self.currentUtteranceChanged.emit()
-        self.fileViewRequested.emit(self.model().audio_info_for_utterance(row))
+        self.fileViewRequested.emit(*self.model().audio_info_for_utterance(row))
 
     def model(self) -> CorpusModel:
         return super().model()
@@ -1099,7 +1123,7 @@ class CorpusSelectionModel(QtCore.QItemSelectionModel):
             return
         self.current_utterance_id = utt_id
         self.currentUtteranceChanged.emit()
-        self.fileViewRequested.emit(self.model().audio_info_for_utterance(row))
+        self.fileViewRequested.emit(*self.model().audio_info_for_utterance(row))
 
 
 class OovModel(TableModel):
@@ -1266,7 +1290,7 @@ class DictionaryTableModel(TableModel):
             return True
         return False
 
-    def add_word(self, word, word_id):
+    def add_word(self, word, word_id=None):
         self.requestLookup.emit(word)
         self.add_pronunciation(word, word_id)
 
@@ -1697,10 +1721,10 @@ class DiarizationModel(TableModel):
         super().__init__(columns, parent=parent)
         self.settings = AnchorSettings()
         self.speaker_count = None
-        self._utterance_ids = []
-        self._file_ids = []
-        self._speaker_indices = []
-        self._suggested_indices = []
+        self.utterance_ids = []
+        self.file_ids = []
+        self.speaker_indices = []
+        self.suggested_indices = []
         self.corpus_model: Optional[CorpusModel] = None
         self.set_limit(self.settings.value(self.settings.RESULTS_PER_PAGE))
         self.speaker_filter = None
@@ -1728,11 +1752,6 @@ class DiarizationModel(TableModel):
             return self._data[index.row()][index.column()]
         return super().data(index, role)
 
-    def utterance_id_at(self, row: int):
-        if row is None:
-            return None
-        return self._utterance_ids[row]
-
     def set_threshold(self, threshold: float):
         if threshold != self.threshold:
             self.current_offset = 0
@@ -1792,32 +1811,32 @@ class DiarizationModel(TableModel):
                 self.alternate_speaker_filter = current_speaker.id
 
     def reassign_utterance(self, row: int):
-        utterance_id = self.utterance_id_at(row)
+        utterance_id = self.utterance_ids[row]
         if utterance_id is None:
             return
-        self.changeUtteranceSpeakerRequested.emit(utterance_id, self._suggested_indices[row])
+        self.changeUtteranceSpeakerRequested.emit(utterance_id, self.suggested_indices[row])
         self.layoutAboutToBeChanged.emit()
         self._data.pop(row)
-        self._utterance_ids.pop(row)
-        self._suggested_indices.pop(row)
-        self._speaker_indices.pop(row)
+        self.utterance_ids.pop(row)
+        self.suggested_indices.pop(row)
+        self.speaker_indices.pop(row)
 
         self.layoutChanged.emit()
 
     def merge_speakers(self, row: int):
-        speaker_id = self._speaker_indices[row]
+        speaker_id = self.speaker_indices[row]
         if self.inverted:
-            utterance_id = self._utterance_ids[row]
+            utterance_id = self.utterance_ids[row]
             self.corpus_model.addCommand.emit(
                 undo.ChangeSpeakerCommand([utterance_id], speaker_id, 0, self)
             )
         else:
-            self.corpus_model.merge_speakers([self._suggested_indices[row], speaker_id])
+            self.corpus_model.merge_speakers([self.suggested_indices[row], speaker_id])
         self.layoutAboutToBeChanged.emit()
         self._data.pop(row)
-        self._utterance_ids.pop(row)
-        self._suggested_indices.pop(row)
-        self._speaker_indices.pop(row)
+        self.utterance_ids.pop(row)
+        self.suggested_indices.pop(row)
+        self.speaker_indices.pop(row)
 
         self.layoutChanged.emit()
 
@@ -1828,17 +1847,16 @@ class DiarizationModel(TableModel):
     def finish_update_data(self, result, *args, **kwargs):
         self.layoutAboutToBeChanged.emit()
         if result is None:
-            self._data, self._utterance_ids, self._suggested_indices, self._speaker_indices = (
-                [],
-                [],
-                [],
-            )
+            self._data = []
+            self.utterance_ids = []
+            self.suggested_indices = []
+            self.speaker_indices = []
         else:
             (
                 self._data,
-                self._utterance_ids,
-                self._suggested_indices,
-                self._speaker_indices,
+                self.utterance_ids,
+                self.suggested_indices,
+                self.speaker_indices,
             ) = result
         self.layoutChanged.emit()
         self.newResults.emit()

anchor/plot.py

@@ -13,6 +13,11 @@ import sqlalchemy
 from Bio import pairwise2
 from montreal_forced_aligner.data import CtmInterval
 from montreal_forced_aligner.db import Speaker, Utterance
+from montreal_forced_aligner.dictionary.mixins import (
+    DEFAULT_PUNCTUATION,
+    DEFAULT_WORD_BREAK_MARKERS,
+)
+from montreal_forced_aligner.tokenization.simple import SimpleTokenizer
 from PySide6 import QtCore, QtGui, QtWidgets
 
 from anchor import workers
@@ -161,7 +166,7 @@ class UtteranceClusterView(pg.PlotWidget):
         self.setBackground(self.settings.value(self.settings.PRIMARY_VERY_DARK_COLOR))
         self.corpus_model = None
         self.speaker_model: SpeakerModel = None
-        self.selection_model: CorpusSelectionModel = None
+        self.selection_model: FileSelectionModel = None
         self.updated_indices = set()
         self.brushes = {-1: pg.mkBrush(0.5)}
         self.scatter_item = ScatterPlot()
@@ -226,7 +231,7 @@ class UtteranceClusterView(pg.PlotWidget):
     def set_models(
         self,
         corpus_model: CorpusModel,
-        selection_model: CorpusSelectionModel,
+        selection_model: FileSelectionModel,
         speaker_model: SpeakerModel,
     ):
         self.corpus_model = corpus_model
@@ -248,13 +253,12 @@ class UtteranceClusterView(pg.PlotWidget):
         if ev.button() == QtCore.Qt.MouseButton.LeftButton:
             utterance_id = int(self.speaker_model.utterance_ids[index])
             utterance = self.corpus_model.session.query(Utterance).get(utterance_id)
-            self.selection_model.set_current_utterance(utterance_id)
-            self.selection_model.current_utterance_id = utterance_id
             self.selection_model.set_current_file(
                 utterance.file_id,
                 utterance.begin,
                 utterance.end,
-                utterance.channel,
+                utterance.id,
+                utterance.speaker_id,
                 force_update=True,
             )
         else:
@@ -1395,7 +1399,7 @@ class NormalizedTextRegion(TextAttributeRegion):
 
 
 class Highlighter(QtGui.QSyntaxHighlighter):
-    WORDS = r"\S+"
+    WORDS = rf"[^\s{''.join(DEFAULT_WORD_BREAK_MARKERS)+''.join(DEFAULT_PUNCTUATION)}]+"
 
     def __init__(self, *args):
         super(Highlighter, self).__init__(*args)
@@ -1424,8 +1428,20 @@ class Highlighter(QtGui.QSyntaxHighlighter):
     def highlightBlock(self, text):
         self.settings.sync()
         self.spellcheck_format.setUnderlineColor(self.settings.error_color)
+        tokenizers = self.dictionary_model.corpus_model.corpus.get_tokenizers()
+        dictionary_id = self.dictionary_model.corpus_model.corpus.get_dict_id_for_speaker(
+            self.speaker_id
+        )
+        words = self.WORDS
+        if isinstance(tokenizers, dict) and dictionary_id is not None:
+            tokenizer = self.dictionary_model.corpus_model.corpus.get_tokenizer(dictionary_id)
+        else:
+            tokenizer = tokenizers
+        if isinstance(tokenizer, SimpleTokenizer):
+            extra_symbols = "".join(tokenizer.punctuation) + "".join(tokenizer.word_break_markers)
+            words = rf"[^\s{extra_symbols}]+"
         if self.dictionary_model is not None and self.dictionary_model.word_sets:
-            for word_object in re.finditer(self.WORDS, text):
+            for word_object in re.finditer(words, text):
                 if not self.dictionary_model.check_word(word_object.group(), self.speaker_id):
                     self.setFormat(
                         word_object.start(),

anchor/settings.py

@@ -855,12 +855,27 @@ class AnchorSettings(QtCore.QSettings):
             margin: 0 -2px; /* expand outside the groove */
         }}
         QTableWidget, QTableView, QTreeView, QTreeWidget {{
-            alternate-background-color: {table_even_color};
+            border: 4px solid {enabled_color};
+        }}
+        QTableView::item, QTreeWidget::item {{
+            background-color: {table_odd_color};
+            color: {table_text_color};
             selection-background-color: {selection_color};
             selection-color: {text_edit_color};
-            background-color: {table_odd_color};
+        }}
+        QTableView::item:selected, QTreeWidget::item:selected {{
+            background-color: {selection_color};
+            color: {text_edit_color};
+        }}
+        QTableView::item:alternate, QTreeWidget::item:alternate {{
+            background-color: {table_even_color};
             color: {table_text_color};
-            border: 4px solid {enabled_color};
+            selection-background-color: {selection_color};
+            selection-color: {text_edit_color};
+        }}
+        QTableView::item:alternate:selected, QTreeWidget::item:alternate:selected {{
+            background-color: {selection_color};
+            color: {text_edit_color};
         }}
        QTreeView QLabel, QTreeWidget QLabel{{
             color: {table_text_color};

anchor/undo.py

@@ -39,8 +39,11 @@ class CorpusCommand(QtGui.QUndoCommand):
 
     def redo(self) -> None:
         with self.corpus_model.edit_lock:
-            self._redo(self.corpus_model.session)
-            self.corpus_model.session.commit()
+            try:
+                self._redo(self.corpus_model.session)
+                self.corpus_model.session.commit()
+            except Exception:
+                self.corpus_model.session.rollback()
             # while True:
             #    try:
             #        with self.corpus_model.session.begin_nested():
@@ -53,8 +56,11 @@ class CorpusCommand(QtGui.QUndoCommand):
 
     def undo(self) -> None:
         with self.corpus_model.edit_lock:
-            self._undo(self.corpus_model.session)
-            self.corpus_model.session.commit()
+            try:
+                self._undo(self.corpus_model.session)
+                self.corpus_model.session.commit()
+            except Exception:
+                self.corpus_model.session.rollback()
             # while True:
             #    try:
             #        with self.corpus_model.session.begin_nested():
@@ -453,6 +459,11 @@ class UpdateUtteranceTextCommand(FileCommand):
         self.new_text = other.new_text
         return True
 
+    def update_data(self):
+        super().update_data()
+        self.corpus_model.changeCommandFired.emit()
+        self.corpus_model.update_utterance_table_row(self.utterance)
+
 
 class ReplaceAllCommand(CorpusCommand):
     def __init__(

anchor/widgets.py

@@ -74,10 +74,7 @@ class MediaPlayer(QtMultimedia.QMediaPlayer):  # pragma: no cover
         self.start_load_time = None
         self.min_time = None
         self.selection_model = None
-        self.timer = QtCore.QTimer(self)
-        self.timer.setInterval(1)
-        self.timer.timeout.connect(self.checkStop)
-        # self.positionChanged.connect(self.checkStop)
+        self.positionChanged.connect(self.checkStop)
         # self.positionChanged.connect(self.positionDebug)
         self.errorOccurred.connect(self.handle_error)
         o = None
@@ -89,7 +86,6 @@ class MediaPlayer(QtMultimedia.QMediaPlayer):  # pragma: no cover
         self._audio_output.setDevice(self.devices.defaultAudioOutput())
         self.setAudioOutput(self._audio_output)
         self.playbackStateChanged.connect(self.reset_position)
-        self.set_volume(self.settings.value(self.settings.VOLUME))
         self.fade_in_anim = QtCore.QPropertyAnimation(self._audio_output, b"volume")
         self.fade_in_anim.setDuration(10)
         self.fade_in_anim.setStartValue(0.1)
@@ -105,6 +101,7 @@ class MediaPlayer(QtMultimedia.QMediaPlayer):  # pragma: no cover
         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))
 
     def setMuted(self, muted: bool):
         self.audioOutput().setMuted(muted)
@@ -125,7 +122,6 @@ 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()
@@ -153,14 +149,11 @@ class MediaPlayer(QtMultimedia.QMediaPlayer):  # pragma: no cover
     def reset_position(self):
         state = self.playbackState()
         if state == QtMultimedia.QMediaPlayer.PlaybackState.StoppedState:
-            self.timer.stop()
             self.setCurrentTime(self.startTime())
-            self.timeChanged.emit(self.currentTime())
-        elif state == QtMultimedia.QMediaPlayer.PlaybackState.PausedState:
-            self.timer.stop()
 
     def update_audio_device(self):
         self._audio_output.setDevice(self.devices.defaultAudioOutput())
+        self.setAudioOutput(self._audio_output)
 
     def refresh_settings(self):
         self.settings.sync()
@@ -177,9 +170,9 @@ class MediaPlayer(QtMultimedia.QMediaPlayer):  # pragma: no cover
         self.selection_model.fileChanged.connect(self.loadNewFile)
         self.selection_model.viewChanged.connect(self.update_times)
         self.selection_model.selectionAudioChanged.connect(self.update_selection_times)
-        self.selection_model.currentTimeChanged.connect(self.update_selection_times)
 
     def set_volume(self, volume: int):
+        self.settings.setValue(self.settings.VOLUME, volume)
         if self.audioOutput() is None:
             return
         linearVolume = QtMultimedia.QtAudio.convertVolume(
@@ -188,6 +181,8 @@ class MediaPlayer(QtMultimedia.QMediaPlayer):  # pragma: no cover
             QtMultimedia.QtAudio.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:
@@ -207,9 +202,12 @@ class MediaPlayer(QtMultimedia.QMediaPlayer):  # pragma: no cover
         self.setCurrentTime(self.startTime())
 
     def update_times(self):
+        if self.playbackState() == QtMultimedia.QMediaPlayer.PlaybackState.PlayingState:
+            return
         if self.currentTime() < self.startTime() or self.currentTime() > self.maxTime():
             self.stop()
         if self.playbackState() != QtMultimedia.QMediaPlayer.PlaybackState.PlayingState:
+            self.stop()
             self.setCurrentTime(self.startTime())
 
     def loadNewFile(self, *args):
@@ -238,27 +236,14 @@ class MediaPlayer(QtMultimedia.QMediaPlayer):  # pragma: no cover
     def setCurrentTime(self, time):
         if time is None:
             time = 0
-        if self.playbackState() == QtMultimedia.QMediaPlayer.PlaybackState.PlayingState:
-            return
         pos = int(time * 1000)
         self.setPosition(pos)
-        self.timeChanged.emit(self.currentTime())
 
     def checkStop(self):
-        if not self.hasAudio():
-            self.stop()
-            self.setSource(
-                QtCore.QUrl.fromLocalFile(
-                    self.selection_model.model().file.sound_file.sound_file_path
-                )
-            )
-            self.play()
-            return
+        self.timeChanged.emit(self.currentTime())
         if self.playbackState() == QtMultimedia.QMediaPlayer.PlaybackState.PlayingState:
             if self.maxTime() is None or self.currentTime() > self.maxTime():
                 self.stop()
-                self.reset_position()
-        self.timeChanged.emit(self.currentTime())
 
 
 class NewSpeakerField(QtWidgets.QLineEdit):
@@ -2546,6 +2531,7 @@ class SpeakerClustersWidget(QtWidgets.QWidget):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
+        self.speaker_model = None
         self.settings = AnchorSettings()
         self.settings.sync()
         form_layout = QtWidgets.QHBoxLayout()
@@ -2640,7 +2626,7 @@ class DiarizationTable(AnchorTableView):
         self.doubleClicked.connect(self.search_utterance)
         self.clicked.connect(self.reassign_utterance)
         self.diarization_model: Optional[DiarizationModel] = None
-        self.selection_model: Optional[CorpusSelectionModel] = None
+        self.selection_model: Optional[FileSelectionModel] = None
         self.set_reference_utterance_action = QtGui.QAction("Use utterance as reference", self)
         self.set_reference_utterance_action.triggered.connect(self.set_reference_utterance)
         self.setContextMenuPolicy(QtCore.Qt.ContextMenuPolicy.CustomContextMenu)
@@ -2648,7 +2634,7 @@ class DiarizationTable(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.set_reference_utterance_action)
         menu.exec_(self.mapToGlobal(location))
 
@@ -2656,7 +2642,7 @@ class DiarizationTable(AnchorTableView):
         rows = self.selectionModel().selectedRows()
         if not rows:
             return
-        utterance_id = self.diarization_model._utterance_ids[rows[0].row()]
+        utterance_id = self.diarization_model.utterance_ids[rows[0].row()]
         self.diarization_model.set_utterance_filter(utterance_id)
         self.referenceUtteranceSelected.emit(
             self.diarization_model.data(
@@ -2665,7 +2651,7 @@ class DiarizationTable(AnchorTableView):
             )
         )
 
-    def set_models(self, model: DiarizationModel, selection_model: CorpusSelectionModel):
+    def set_models(self, model: DiarizationModel, selection_model: FileSelectionModel):
         self.diarization_model = model
         self.selection_model = selection_model
         self.setModel(model)
@@ -2684,14 +2670,14 @@ class DiarizationTable(AnchorTableView):
             return
         if index.column() == 0:
             row = index.row()
-            utterance_id = self.diarization_model._utterance_ids[row]
+            utterance_id = self.diarization_model.utterance_ids[row]
             if utterance_id is None:
                 return
             with self.diarization_model.corpus_model.corpus.session() as session:
                 try:
-                    file_id, begin, end, channel = (
+                    file_id, begin, end, speaker_id = (
                         session.query(
-                            Utterance.file_id, Utterance.begin, Utterance.end, Utterance.channel
+                            Utterance.file_id, Utterance.begin, Utterance.end, Utterance.speaker_id
                         )
                         .filter(Utterance.id == utterance_id)
                         .first()
@@ -2701,19 +2687,18 @@ class DiarizationTable(AnchorTableView):
                     return
         else:
             if index.column() == 1:
-                speaker_id = self.diarization_model._suggested_indices[index.row()]
+                speaker_id = self.diarization_model.suggested_indices[index.row()]
             else:
-                speaker_id = self.diarization_model._speaker_indices[index.row()]
+                speaker_id = self.diarization_model.speaker_indices[index.row()]
             with self.diarization_model.corpus_model.corpus.session() as session:
                 c = session.query(Corpus).first()
                 try:
-                    utterance_id, file_id, begin, end, channel = (
+                    utterance_id, file_id, begin, end = (
                         session.query(
                             Utterance.id,
                             Utterance.file_id,
                             Utterance.begin,
                             Utterance.end,
-                            Utterance.channel,
                         )
                         .join(Utterance.speaker)
                         .filter(Utterance.speaker_id == speaker_id)
@@ -2725,12 +2710,12 @@ class DiarizationTable(AnchorTableView):
                 except TypeError:
                     self.selection_model.clearSelection()
                     return
-        self.selection_model.set_current_utterance(utterance_id)
         self.selection_model.set_current_file(
             file_id,
             begin,
             end,
-            channel,
+            utterance_id,
+            speaker_id,
             force_update=True,
         )
 
@@ -3280,7 +3265,7 @@ class SpeakerWidget(QtWidgets.QWidget):
     def set_models(
         self,
         corpus_model: CorpusModel,
-        selection_model: CorpusSelectionModel,
+        selection_model: FileSelectionModel,
         speaker_model: SpeakerModel,
     ):
         self.speaker_model = speaker_model
@@ -3576,7 +3561,6 @@ class ModelSelectWidget(QtWidgets.QWidget):
         for i, m in enumerate(self.model.models):
             if not m.available_locally or not os.path.exists(m.path):
                 continue
-            print(m.name, m.path, os.path.exists(m.path))
             self.model_select.addItem(m.name, userData=m.id)
             if m.id == current_model:
                 index = i

anchor/workers.py

@@ -3650,6 +3650,8 @@ class ImportG2PModelWorker(FunctionWorker):  # pragma: no cover
         try:
             generator = Generator(g2p_model_path=self.model_path, num_pronunciations=5)
             generator.setup()
+        except shutil.ReadError:
+            self.signals.result.emit(None)
         except Exception:
             exctype, value = sys.exc_info()[:2]
             self.signals.error.emit((exctype, value, traceback.format_exc()))

Anchor_annotator-0.3.2.dist-info/RECORD

@@ -1,22 +0,0 @@
-anchor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-anchor/__main__.py,sha256=5ufG8lcx2x1am-04xI991AG7saJd24dxPw5JzjmB878,45
-anchor/_version.py,sha256=9jP8Fo8egXoMs_T3DFqSuJYg4n9o9mnwYubl_hnut4k,411
-anchor/command_line.py,sha256=EucG805HyWk_zkMO9RXv9Yj0I0JVdDLZb1_DX2_ISjM,503
-anchor/db.py,sha256=ef4lO6HtCKoxC9CorIc0ZbPxKpjHa576a0ZIBOWNU9E,4956
-anchor/main.py,sha256=eazWSZC94_nyBx_6rJ85hxC9wkCJYVP5FN_t9vnRm44,120658
-anchor/models.py,sha256=sCZf5wF6g1KorMgb0AifmqhaxZp5fiYmlmaJoow-tFI,95230
-anchor/plot.py,sha256=eNVG9sDdRA9_KKrHKSb2TF66bIluJsJzVnTGN3q-Brk,104878
-anchor/resources_rc.py,sha256=94wgxDTpP4Oy55Br7CZ_YnmvaqzHr4n-AydBPhZc-es,8427242
-anchor/settings.py,sha256=QdfBtJowHpkBLzJ_3bZRKxF1rJDBW9Z5kp83sJVz0pA,46965
-anchor/ui_corpus_manager.py,sha256=e3ybOd4UdYarrLBATxI8vIFnioa4R_BHrbsEz5mJ5eA,8564
-anchor/ui_error_dialog.py,sha256=c_QS0s1VaJEV9AhcrQZQyWHHpUPudWjJY1NI7Ytipio,3832
-anchor/ui_main_window.py,sha256=MYb4PtV1sHYgnc3QwPphKjU3LepzBJpxllhN4nyDook,63525
-anchor/ui_preferences.py,sha256=MOC2dY4qkViW9cUbC0DVSO7FLg-dGSbmR630WFQ6V9c,41843
-anchor/undo.py,sha256=HXhrzV-T2JKwPd28KCaR9S6GWmi2Wr2Xk7IBEonRRCs,32564
-anchor/widgets.py,sha256=arL006v_cOGWudEF4Adbh_wRjiyFRGHP9BXOtfCr0h0,158301
-anchor/workers.py,sha256=iWLBGCg6jJr_OmVFJCRGMgF5Rw5G9IhpdNiqDv8ZBxU,171083
-Anchor_annotator-0.3.2.dist-info/LICENSE,sha256=C0oIsblENEgWQ7XMNdYoXyXsIA5wa3YF0I9lK3H7A1s,1076
-Anchor_annotator-0.3.2.dist-info/METADATA,sha256=YcbnBTVx6O59V8W-6t9wu5GVrQBvGcXWDK3fCWHhkvE,1500
-Anchor_annotator-0.3.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-Anchor_annotator-0.3.2.dist-info/top_level.txt,sha256=wX6ZKxImGRZKFQjs3f6XYw_TfbAp6Xs3SmbLfLbFAJ0,7
-Anchor_annotator-0.3.2.dist-info/RECORD,,