Merge master into the transcript queue branch

tests/test_worker.py

@@ -31,9 +31,11 @@ class Chain(DikteTest):
 
     def run_chain(self, ask=False, paste_override=None, duration=2.0,
                   transcript="uh, book it for Thursday",
+                  transcribe_error=None,
                   cleaned="Book it for Thursday.",
                   cleanup_error=None, answer=("Booked.", ""), rms=None,
-                  clipboard=b"what was there before", paste_error=None):
+                  clipboard=b"what was there before", paste_error=None,
+                  focus=None):
         pipeline = worker.Pipeline(self.conf)
         done, failures, stages, cancels = [], [], [], []
         pipeline.finished.connect(lambda *args: done.append(args))
@@ -47,7 +49,10 @@ class Chain(DikteTest):
         # The chain reports its own failures on stderr, which a test run has no
         # use for.
         with contextlib.redirect_stderr(io.StringIO()), \
-                mock.patch.object(api, "transcribe", return_value=transcript) as tr, \
+                mock.patch.object(
+                    api, "transcribe",
+                    **({"side_effect": transcribe_error} if transcribe_error
+                       else {"return_value": transcript})) as tr, \
                 mock.patch.object(api, "cleanup", cleanup), \
                 mock.patch.object(assistant, "ask", return_value=answer) as ask_call, \
                 mock.patch.object(paste, "copy") as copy, \
@@ -61,7 +66,8 @@ class Chain(DikteTest):
                      "copy": copy, "copy_bytes": copy_bytes, "press": press,
                      "read_clipboard": read_clipboard}
             pipeline._work(self.wav, duration,
-                           self.rms if rms is None else rms, ask, paste_override)
+                           self.rms if rms is None else rms, ask, paste_override,
+                           focus)
         return {"done": done, "failures": failures, "stages": stages,
                 "cancelled": cancels, **calls}
 
@@ -73,7 +79,15 @@ class Chain(DikteTest):
         self.assertEqual(run["done"][0],
                          ("uh, book it for Thursday", "Book it for Thursday.", ""))
         run["copy"].assert_called_once_with("Book it for Thursday.")
-        run["press"].assert_called_once_with(self.conf["paste_shortcut"])
+        run["press"].assert_called_once_with(self.conf["paste_shortcut"],
+                                             focus=None)
+
+    def test_the_paste_is_told_where_the_dictation_started(self):
+        """Whoever was in front when the recording began is where the keys are
+        meant to go, and the press is the only part that can act on it."""
+        run = self.run_chain(focus=4242)
+        run["press"].assert_called_once_with(self.conf["paste_shortcut"],
+                                             focus=4242)
 
     def test_the_stages_are_named_as_they_happen(self):
         run = self.run_chain()
@@ -109,11 +123,57 @@ class Chain(DikteTest):
         run = self.run_chain()
         run["copy_bytes"].assert_not_called()
 
-    def test_the_clipboard_is_put_back_when_the_keypress_fails(self):
+    def test_a_failed_keypress_leaves_the_transcript_on_the_clipboard(self):
+        """The press failing is a warning, not a lost dictation: restoring the
+        old clipboard over the text would leave nothing to paste by hand."""
         self.conf["restore_clipboard"] = True
         run = self.run_chain(paste_error=paste.PasteError("not trusted"))
-        self.assertIn("not trusted", run["failures"][0])
-        run["copy_bytes"].assert_called_once_with(b"what was there before")
+        self.assertEqual(run["failures"], [])
+        raw, text, warning = run["done"][0]
+        self.assertIn("not trusted", warning)
+        run["copy_bytes"].assert_not_called()
+
+    def test_a_failed_keypress_still_reaches_the_history(self):
+        self.run_chain(paste_error=paste.PasteError("not trusted"))
+        rows = cfg.read_history()
+        self.assertEqual(len(rows), 1)
+        self.assertEqual(rows[0]["text"], "Book it for Thursday.")
+        # The row goes in before the paste is attempted, so the paste failing
+        # has to be written back into it: the record tells the whole truth.
+        self.assertIn("not trusted", rows[0]["cleanup_error"])
+
+    def test_a_failed_transcription_keeps_the_audio(self):
+        """Speech the user cannot repeat from memory must survive the failure."""
+        run = self.run_chain(transcribe_error=api.ApiError("server down"))
+        self.assertIn("server down", run["failures"][0])
+        self.assertIn("kept", run["failures"][0])
+        kept = list(cfg.RECORDINGS_DIR.glob("*.wav"))
+        self.assertEqual(len(kept), 1)
+        self.assertFalse(os.path.exists(self.wav))
+
+    def test_two_failures_in_one_second_keep_both_recordings(self):
+        self.run_chain(transcribe_error=api.ApiError("down"))
+        self.wav = make_wav(self.path("clip2.wav"), speech(2.0))
+        with mock.patch.object(worker.time, "strftime",
+                               return_value="20260820-120000"):
+            self.run_chain(transcribe_error=api.ApiError("down"))
+            self.wav = make_wav(self.path("clip3.wav"), speech(2.0))
+            self.run_chain(transcribe_error=api.ApiError("down"))
+        self.assertEqual(len(list(cfg.RECORDINGS_DIR.glob("*.wav"))), 3)
+
+    def test_the_history_row_says_whether_cleanup_actually_ran(self):
+        """The ask path cleans under its own setting; the record follows the
+        run, not the dictation gate."""
+        self.conf["cleanup_enabled"] = False
+        self.conf["assistant_cleanup"] = True
+        self.run_chain(ask=True)
+        row = cfg.read_history()[0]
+        self.assertNotEqual(row["cleanup_model"], "")
+        cfg.clear_history()
+        self.conf["cleanup_enabled"] = True
+        self.conf["assistant_cleanup"] = False
+        self.run_chain(ask=True)
+        self.assertEqual(cfg.read_history()[0]["cleanup_model"], "")
 
     def test_the_transcription_is_told_the_language_and_the_glossary(self):
         self.conf["language"] = "tr"