mirror of
https://github.com/yusufipk/dikte.git
synced 2026-09-12 03:16:19 +00:00
Merge master into the reliability branch
The paste block was rewritten by both sides: master taught press() to put the remembered application back in front (focus), this branch moved the history write ahead of the paste and stopped restoring the old clipboard over a transcript the key press refused. Kept this branch's order and error handling, and handed press() the focus it now takes.
This commit is contained in:
+1
-1
@@ -10,4 +10,4 @@ business loading Qt to answer one question.
|
||||
# both the .dmg's Info.plist and the AppImage's file name are built from it. A
|
||||
# build off master rather than off a tag appends the commit to it, so that a
|
||||
# bug report from someone running "latest" names a commit.
|
||||
__version__ = "1.0.0"
|
||||
__version__ = "1.0.2"
|
||||
|
||||
+17
-4
@@ -58,10 +58,20 @@ def timestamp_model(provider, selected=""):
|
||||
return "openai/whisper-1" if provider == "openrouter" else "whisper-1"
|
||||
|
||||
|
||||
# What a gateway in front of the model answers of its own accord: the request
|
||||
# never reached the model, or the model was still working when the connection
|
||||
# was given up on. Trying again is the only thing that fixes any of them, and
|
||||
# with a long file it is worth the second try rather than losing the run.
|
||||
RETRY_STATUS = frozenset({408, 429, 500, 502, 503, 504})
|
||||
|
||||
|
||||
class ApiError(Exception):
|
||||
def __init__(self, message, status=None):
|
||||
def __init__(self, message, status=None, retryable=None):
|
||||
super().__init__(message)
|
||||
self.status = status
|
||||
# Anything not on that list is the request itself being wrong, and it
|
||||
# will be just as wrong the second time.
|
||||
self.retryable = status in RETRY_STATUS if retryable is None else retryable
|
||||
|
||||
|
||||
class Aborted(Exception):
|
||||
@@ -218,7 +228,7 @@ def explain(exc, service):
|
||||
if exc.status == 429:
|
||||
return ApiError(t("{service} is rate limiting you (HTTP 429). Try again in "
|
||||
"a moment.", service=service), exc.status)
|
||||
return ApiError(f"{service}: {exc}", exc.status)
|
||||
return ApiError(f"{service}: {exc}", exc.status, retryable=exc.retryable)
|
||||
|
||||
|
||||
def _request(url, data, headers, timeout=120, aborter=None):
|
||||
@@ -234,8 +244,11 @@ def _request(url, data, headers, timeout=120, aborter=None):
|
||||
# not the network failing. URLError is an OSError, so both land here.
|
||||
if aborter is not None and aborter.aborted:
|
||||
raise Aborted from None
|
||||
# A connection that dropped or timed out is the same bad minute as a
|
||||
# 502, so it is worth the same second try.
|
||||
raise ApiError(t("Could not connect: {reason}",
|
||||
reason=getattr(exc, "reason", exc))) from exc
|
||||
reason=getattr(exc, "reason", exc)),
|
||||
retryable=True) from exc
|
||||
except json.JSONDecodeError as exc:
|
||||
raise ApiError(t("Could not parse the response: {error}", error=exc)) from exc
|
||||
|
||||
@@ -318,7 +331,7 @@ def local_failure(service, server, exc):
|
||||
"""
|
||||
detail = server.error()
|
||||
return ApiError(f"{service}: {exc}" + (f" ({detail})" if detail else ""),
|
||||
exc.status)
|
||||
exc.status, retryable=exc.retryable)
|
||||
|
||||
|
||||
def _transcribe_request(target, audio_path, language, prompt, response_format,
|
||||
|
||||
+202
-4
@@ -34,8 +34,9 @@ if sys.platform == "darwin":
|
||||
os.environ.get("PATH", "")) if part
|
||||
)
|
||||
|
||||
from PyQt6.QtCore import QTimer, QElapsedTimer, QSocketNotifier # noqa: E402
|
||||
from PyQt6.QtGui import QAction, QIcon # noqa: E402
|
||||
from PyQt6.QtCore import (QObject, QTimer, QElapsedTimer, QSocketNotifier, # noqa: E402
|
||||
QUrl, pyqtSignal)
|
||||
from PyQt6.QtGui import QAction, QDesktopServices, QIcon # noqa: E402
|
||||
from PyQt6.QtNetwork import QLocalServer, QLocalSocket # noqa: E402
|
||||
from PyQt6.QtWidgets import QApplication, QMenu, QSystemTrayIcon # noqa: E402
|
||||
|
||||
@@ -45,11 +46,14 @@ from . import cli # noqa: E402
|
||||
from . import config as cfg # noqa: E402
|
||||
from . import ggml # noqa: E402
|
||||
from . import hotkey # noqa: E402
|
||||
from . import hub # noqa: E402
|
||||
from . import i18n # noqa: E402
|
||||
from . import integrate # noqa: E402
|
||||
from . import ipc # noqa: E402
|
||||
from . import mac_window # noqa: E402
|
||||
from . import meeting # noqa: E402
|
||||
from . import trayicon # noqa: E402
|
||||
from . import update # noqa: E402
|
||||
from .i18n import t # noqa: E402
|
||||
from .meeting import MeetingPipeline # noqa: E402
|
||||
from .overlay import Overlay # noqa: E402
|
||||
@@ -78,6 +82,37 @@ ECHO_MS = 2000
|
||||
# short enough not to sit in the corner for the rest of the hour.
|
||||
PEEK_MS = 12000
|
||||
|
||||
# When the releases page is looked at, and how often it is thought about after
|
||||
# that. The delay is there so that a check never shares the first seconds of a
|
||||
# start with the model being loaded and the desktop drawing the tray; the
|
||||
# interval is not the interval between checks, which update.py holds at a day,
|
||||
# but how often that clock is read, so that a machine left running for a week
|
||||
# still asks once a day rather than once a boot.
|
||||
UPDATE_DELAY_MS = 20000
|
||||
UPDATE_POLL_MS = 3 * 3600 * 1000
|
||||
|
||||
|
||||
class UpdateCheck(QObject):
|
||||
"""One look at the releases page, off the interface thread.
|
||||
|
||||
An object of its own because the application is not one: a plain thread
|
||||
cannot touch a widget, and a signal is the only way back onto the thread
|
||||
that may.
|
||||
"""
|
||||
|
||||
# The newer release, or None when there is nothing to say, and the reason
|
||||
# nothing could be found out instead.
|
||||
done = pyqtSignal(object, str)
|
||||
|
||||
def start(self):
|
||||
def work():
|
||||
try:
|
||||
self.done.emit(update.check(), "")
|
||||
except hub.HubError as exc:
|
||||
self.done.emit(None, str(exc))
|
||||
|
||||
threading.Thread(target=work, daemon=True).start()
|
||||
|
||||
|
||||
class Dikte:
|
||||
def __init__(self, app):
|
||||
@@ -116,6 +151,12 @@ class Dikte:
|
||||
# Which recording is the current one, so a timer set for the run that
|
||||
# started it cannot stop the one that came after.
|
||||
self._run_id = 0
|
||||
# The application that was in front when the recording started, which
|
||||
# is where the transcript is meant to go, and the timer watching for
|
||||
# the moment it has to be put back there. macOS only; see
|
||||
# _give_the_front_back.
|
||||
self.front_before = None
|
||||
self._front_watch = None
|
||||
|
||||
self.overlay = Overlay(self.conf["overlay_corner"])
|
||||
# The agent's indicator sits on top of the dictation one when both are
|
||||
@@ -171,6 +212,17 @@ class Dikte:
|
||||
self.meeting_ticker.setInterval(500)
|
||||
self.meeting_ticker.timeout.connect(self._meeting_tick)
|
||||
|
||||
# What the last check found, read from disk rather than asked for, so
|
||||
# that a tray built in the next line already knows to say so.
|
||||
self.update_release = update.pending()
|
||||
self.updates = UpdateCheck()
|
||||
self.updates.done.connect(self._on_update_checked)
|
||||
self.update_ticker = QTimer()
|
||||
self.update_ticker.setInterval(UPDATE_POLL_MS)
|
||||
self.update_ticker.timeout.connect(self._look_for_update)
|
||||
self.update_ticker.start()
|
||||
QTimer.singleShot(UPDATE_DELAY_MS, self._look_for_update)
|
||||
|
||||
self.tray = QSystemTrayIcon()
|
||||
self._apply_settings()
|
||||
self.tray.show()
|
||||
@@ -223,6 +275,11 @@ class Dikte:
|
||||
self.menu.addAction(self.meeting_cancel_action)
|
||||
self.menu.addSeparator()
|
||||
|
||||
# Named in _refresh_update, and hidden until a check has found one.
|
||||
self.update_action = QAction("", self.menu)
|
||||
self.update_action.triggered.connect(self.open_release_page)
|
||||
self.menu.addAction(self.update_action)
|
||||
|
||||
self.settings_action = QAction(t("Settings…"), self.menu)
|
||||
self.settings_action.triggered.connect(self.open_settings)
|
||||
self.menu.addAction(self.settings_action)
|
||||
@@ -239,6 +296,7 @@ class Dikte:
|
||||
self.tray.setContextMenu(self.menu)
|
||||
self.tray.setToolTip(t("Dikte: ready"))
|
||||
self.tray.activated.connect(self._tray_clicked)
|
||||
self._refresh_update()
|
||||
self._set_icon("audio-input-microphone")
|
||||
|
||||
def _tray_clicked(self, reason):
|
||||
@@ -578,9 +636,19 @@ class Dikte:
|
||||
timer.restart()
|
||||
return False
|
||||
|
||||
def _the_front(self):
|
||||
"""The application a recording is about to start from, or None.
|
||||
|
||||
Asked before the indicator goes up rather than alongside the
|
||||
microphone: putting a window on screen can take the front as well, and
|
||||
once it has, the only answer left to the question is Dikte.
|
||||
"""
|
||||
return mac_window.frontmost_pid() if sys.platform == "darwin" else None
|
||||
|
||||
def start(self):
|
||||
if self.state != IDLE or self.recording:
|
||||
return
|
||||
self.front_before = self._the_front()
|
||||
self.overlay.show_recording()
|
||||
self._begin_recording(DICTATION)
|
||||
# A recorder that could not start has already said so, synchronously,
|
||||
@@ -594,6 +662,7 @@ class Dikte:
|
||||
def start_ask(self):
|
||||
if self.ask_state != IDLE or self.recording:
|
||||
return
|
||||
self.front_before = self._the_front()
|
||||
self.ask_overlay.show_recording(asking=True)
|
||||
self._begin_recording(ASK)
|
||||
if not self.recorder.active:
|
||||
@@ -608,6 +677,80 @@ class Dikte:
|
||||
self.elapsed.restart()
|
||||
self.ticker.start()
|
||||
self.recorder.start(self.conf["mic_target"], self.conf["max_seconds"])
|
||||
self._give_the_front_back(self.front_before)
|
||||
|
||||
def _give_the_front_back(self, was_in_front):
|
||||
"""Hand the front back to whoever had it when the recording started.
|
||||
|
||||
On macOS a recording goes through ffmpeg's avfoundation input, and
|
||||
opening a capture session there brings the process that did it to the
|
||||
front. ffmpeg is a child of Dikte with no bundle of its own, so the
|
||||
system credits the move to Dikte: the window the user was typing in
|
||||
loses the front, its caret stops, its title bar greys out, and the
|
||||
Cmd+V at the end of the dictation has nowhere to land. Measured with a
|
||||
TextEdit document in front:
|
||||
|
||||
press the shortcut front = TextEdit
|
||||
recorder.start returns front = TextEdit
|
||||
89 ms later front = Dikte
|
||||
|
||||
Nothing about the capture session can be asked not to do this. It is
|
||||
not a window of ours and no flag reaches it. Starting ffmpeg in its own
|
||||
session, and clearing __CFBundleIdentifier from its environment, were
|
||||
both tried and both measured to make no difference. So it is undone
|
||||
instead. The move lands a moment after the process starts rather than
|
||||
during the call, hence the short watch rather than one attempt: it
|
||||
gives up as soon as it has put the front back, and in any case after a
|
||||
second and a half, which is longer than the microphone has ever taken
|
||||
to open.
|
||||
|
||||
Silent off macOS, and silent when the recording started from Dikte
|
||||
itself: there is nothing to give back.
|
||||
"""
|
||||
# One watch at a time. A second recording started before the first
|
||||
# watch had finished would otherwise leave two of them running, and the
|
||||
# older one would put the front back where the older recording
|
||||
# started, which by then is the wrong window.
|
||||
if self._front_watch is not None:
|
||||
self._front_watch.stop()
|
||||
self._front_watch = None
|
||||
if not was_in_front or was_in_front == os.getpid():
|
||||
return
|
||||
deadline = time.monotonic() + 1.5
|
||||
watch = QTimer(self.app)
|
||||
# Ten milliseconds because the front is already gone by the time this
|
||||
# notices, and every tick it waits is a tick of the user's window drawn
|
||||
# inactive: at forty the title bar visibly blinks, at ten it does not.
|
||||
# Two messages to AppKit per tick, for at most a second and a half.
|
||||
watch.setInterval(10)
|
||||
# activateWithOptions: answers whether macOS accepted the request, not
|
||||
# whether the other application is already back in front. Keep the
|
||||
# watch alive until that asynchronous handoff is observable; on Intel
|
||||
# Macs it can take hundreds of milliseconds after the call returned.
|
||||
restore_requested = False
|
||||
|
||||
def look():
|
||||
nonlocal restore_requested
|
||||
if time.monotonic() > deadline:
|
||||
self._stop_watching_the_front()
|
||||
return
|
||||
if mac_window.is_frontmost():
|
||||
if not restore_requested:
|
||||
restore_requested = mac_window.activate(was_in_front)
|
||||
elif restore_requested:
|
||||
# The request has landed. Stop only now, rather than as soon
|
||||
# as AppKit accepted it, so a delayed or failed handoff stays
|
||||
# under observation until the deadline guard above.
|
||||
self._stop_watching_the_front()
|
||||
|
||||
watch.timeout.connect(look)
|
||||
self._front_watch = watch
|
||||
watch.start()
|
||||
|
||||
def _stop_watching_the_front(self):
|
||||
if self._front_watch is not None:
|
||||
self._front_watch.stop()
|
||||
self._front_watch = None
|
||||
|
||||
def stop(self):
|
||||
if self.state != RECORDING:
|
||||
@@ -725,6 +868,12 @@ class Dikte:
|
||||
return
|
||||
base = meeting.new_base()
|
||||
_, wav_path = cfg.meeting_paths(base)
|
||||
# A meeting opens the same capture as a dictation does, and takes the
|
||||
# front the same way: whoever is being recorded is in a call, and
|
||||
# having their window go inactive mid-sentence is worse here than
|
||||
# anywhere else. Kept as a local rather than on self: a dictation may
|
||||
# already be waiting on its own note for where to paste.
|
||||
was_in_front = self._the_front()
|
||||
self.meeting_recorder.start(
|
||||
str(wav_path),
|
||||
self.conf["meeting_mic_target"] or self.conf["mic_target"],
|
||||
@@ -733,6 +882,7 @@ class Dikte:
|
||||
)
|
||||
if not self.meeting_recorder.active:
|
||||
return # start() has already said what went wrong
|
||||
self._give_the_front_back(was_in_front)
|
||||
self.meeting_base = base
|
||||
self.meeting_elapsed.restart()
|
||||
self.meeting_ticker.start()
|
||||
@@ -859,11 +1009,13 @@ class Dikte:
|
||||
def _on_recorded(self, wav_path, duration, rms_values):
|
||||
owner, self.recorder_owner = self.recorder_owner, None
|
||||
wants_paste = self.paste_override.pop(owner, None)
|
||||
focus, self.front_before = self.front_before, None
|
||||
if owner == ASK:
|
||||
self.ask_pipeline.run(wav_path, duration, rms_values, ask=True,
|
||||
paste=wants_paste)
|
||||
paste=wants_paste, focus=focus)
|
||||
else:
|
||||
self.pipeline.run(wav_path, duration, rms_values, paste=wants_paste)
|
||||
self.pipeline.run(wav_path, duration, rms_values,
|
||||
paste=wants_paste, focus=focus)
|
||||
|
||||
def _on_finished(self, _raw, text, warning):
|
||||
if warning:
|
||||
@@ -954,12 +1106,58 @@ class Dikte:
|
||||
if len(message) > len(first_line):
|
||||
self.tray.showMessage("Dikte", message, QSystemTrayIcon.MessageIcon.Warning, 8000)
|
||||
|
||||
# ---- updates ----------------------------------------------------------
|
||||
|
||||
def _look_for_update(self):
|
||||
"""The timer. update.py decides whether this is a request or a memory."""
|
||||
if not self.conf["update_check"]:
|
||||
return
|
||||
self.updates.start()
|
||||
|
||||
def _on_update_checked(self, release, error):
|
||||
if error:
|
||||
# Nobody asked for this, so nobody is waiting to be told it failed.
|
||||
# A machine that is offline, or a GitHub that is rate-limiting the
|
||||
# address, is not a thing to interrupt a dictation about.
|
||||
print(f"dikte: update check: {error}", file=sys.stderr)
|
||||
return
|
||||
if release is None:
|
||||
return
|
||||
self._found_update(release)
|
||||
# Once per version. A check that runs every day must not be a
|
||||
# notification every day for an update somebody has decided to skip.
|
||||
if update.announced() != release.version:
|
||||
update.mark_announced(release.version)
|
||||
self.tray.showMessage(
|
||||
"Dikte",
|
||||
t("Dikte {version} is out. The tray menu has the release page.",
|
||||
version=release.version),
|
||||
QSystemTrayIcon.MessageIcon.Information, 8000,
|
||||
)
|
||||
|
||||
def _found_update(self, release):
|
||||
self.update_release = release
|
||||
self._refresh_update()
|
||||
|
||||
def _refresh_update(self):
|
||||
release = self.update_release
|
||||
self.update_action.setVisible(release is not None)
|
||||
if release is not None:
|
||||
self.update_action.setText(
|
||||
t("Dikte {version} is out…", version=release.version))
|
||||
|
||||
def open_release_page(self):
|
||||
release = self.update_release
|
||||
QDesktopServices.openUrl(
|
||||
QUrl(release.url if release is not None else update.RELEASES_PAGE))
|
||||
|
||||
# ---- settings ---------------------------------------------------------
|
||||
|
||||
def open_settings(self):
|
||||
if self.settings_window is None:
|
||||
self.settings_window = SettingsWindow(self.conf, self.meetings)
|
||||
self.settings_window.applied.connect(self._apply_settings)
|
||||
self.settings_window.update_found.connect(self._found_update)
|
||||
self.settings_window.finished.connect(self._settings_closed)
|
||||
self.settings_window.show()
|
||||
self.settings_window.raise_()
|
||||
|
||||
@@ -20,6 +20,7 @@ import signal
|
||||
import subprocess
|
||||
import sys
|
||||
import time
|
||||
import webbrowser
|
||||
|
||||
from PyQt6.QtCore import QCoreApplication, QTimer
|
||||
|
||||
@@ -30,10 +31,12 @@ from . import cleanup
|
||||
from . import config as cfg
|
||||
from . import filetranscribe
|
||||
from . import hotkey
|
||||
from . import hub
|
||||
from . import ipc
|
||||
from . import integrate
|
||||
from . import meeting
|
||||
from . import paste
|
||||
from . import update
|
||||
from . import __version__
|
||||
|
||||
NOT_RUNNING = 3
|
||||
@@ -786,6 +789,33 @@ def cmd_integrate(opts):
|
||||
f"{verb}:\n{listing}" if paths else "Nothing to change.")
|
||||
|
||||
|
||||
def cmd_update(opts):
|
||||
"""Whether a newer Dikte has been released, and where it is.
|
||||
|
||||
It looks and nothing more: what to do about the answer is a download page,
|
||||
because the AppImage, the disk image, the Windows setup and a checkout are
|
||||
four different installations and only their owner knows which one this is.
|
||||
"""
|
||||
try:
|
||||
release = update.latest(refresh=True)
|
||||
except hub.HubError as exc:
|
||||
return fail(opts, exc)
|
||||
# Written down even when there is nothing new, so that the application does
|
||||
# not go and ask the same question an hour later.
|
||||
update.remember(release)
|
||||
waiting = update.newer(release.version)
|
||||
payload = {"ok": True, "current": __version__, "latest": release.version,
|
||||
"update": waiting, "url": release.url}
|
||||
if not waiting:
|
||||
return out(opts, payload,
|
||||
f"Dikte {__version__} is the newest release.")
|
||||
if opts.open:
|
||||
webbrowser.open(release.url)
|
||||
return out(opts, payload,
|
||||
f"Dikte {release.version} is out; this is {__version__}.\n"
|
||||
f"{release.url}")
|
||||
|
||||
|
||||
def cmd_status(opts):
|
||||
reply = ipc.send("status")
|
||||
if reply is None:
|
||||
@@ -1114,6 +1144,11 @@ def build_parser():
|
||||
integrated.set_defaults(func=cmd_integrate)
|
||||
|
||||
# --- the application --------------------------------------------------
|
||||
updates = leaf(subs, "update", "whether a newer Dikte has been released")
|
||||
updates.add_argument("--open", action="store_true",
|
||||
help="open the release page in a browser")
|
||||
updates.set_defaults(func=cmd_update)
|
||||
|
||||
leaf(subs, "status", "what it is doing right now").set_defaults(func=cmd_status)
|
||||
for name, help_text in (("settings", "open the settings window"),
|
||||
("restart", "reload the running instance"),
|
||||
|
||||
@@ -459,6 +459,9 @@ DEFAULTS = {
|
||||
"overlay_corner": "bottom-left",
|
||||
"keep_audio": False,
|
||||
"history_limit": 200,
|
||||
# A look at the releases page once a day, and nothing more than a look:
|
||||
# what is found opens a browser, never an installer.
|
||||
"update_check": True,
|
||||
"file_timestamps": False,
|
||||
"file_cleanup": True,
|
||||
"file_cleanup_prompt": "", # empty -> language-specific default
|
||||
|
||||
+101
-39
@@ -1,15 +1,19 @@
|
||||
"""Transcribe an existing audio/video file with the same models.
|
||||
|
||||
ffmpeg converts whatever comes in to 16 kHz mono WAV, and for a hosted API to
|
||||
mp3 on top of that. The upload limit is the only reason a file is ever cut up,
|
||||
and uncompressed audio reaches it after ten minutes where mp3 takes an hour.
|
||||
mp3 on top of that. Two things decide where a file is cut up: the upload limit,
|
||||
which uncompressed audio reaches after ten minutes where mp3 takes an hour, and
|
||||
the clock. An hour of audio in one request is minutes of work at the other end,
|
||||
and the gateway in front of the model hangs up long before the answer comes
|
||||
back, which arrives here as a 502 with the whole chunk lost. So a chunk is also
|
||||
capped at MAX_CHUNK_SECONDS however small it is on disk.
|
||||
|
||||
That is worth the encoder, because a cut is not free. Whisper hears in thirty
|
||||
second windows and decides for itself where one cue ends and the next begins; a
|
||||
chunk that starts in the middle of a sentence can come back as one cue per
|
||||
window, twenty seconds of text at a time, for the whole rest of the chunk. So
|
||||
the file is cut as rarely as the limit allows, what is cut overlaps, and
|
||||
stitch() drops the half that was heard twice.
|
||||
A cut is not free, which is what the encoder buys and why nothing is cut more
|
||||
finely than that. Whisper hears in thirty second windows and decides for itself
|
||||
where one cue ends and the next begins; a chunk that starts in the middle of a
|
||||
sentence can come back as one cue per window, twenty seconds of text at a time,
|
||||
for the whole rest of the chunk. So what is cut overlaps, and stitch() drops
|
||||
the half that was heard twice.
|
||||
"""
|
||||
|
||||
import contextlib
|
||||
@@ -19,6 +23,7 @@ import shutil
|
||||
import subprocess
|
||||
import tempfile
|
||||
import threading
|
||||
import time
|
||||
import wave
|
||||
|
||||
from PyQt6.QtCore import QObject, pyqtSignal
|
||||
@@ -30,10 +35,14 @@ from . import paths
|
||||
from .i18n import t
|
||||
|
||||
UPLOAD_LIMIT = 24 * 1024 * 1024 # the APIs take 25 MB; leave the form its room
|
||||
MAX_CHUNK_SECONDS = 900 # as much audio as a hosted request can outlive
|
||||
MP3_BITRATE = "48k" # mono speech at 16 kHz: whisper hears nothing less
|
||||
OVERLAP_SECONDS = 30 # a whisper window: how far back a chunk starts
|
||||
WAV_CHUNK_SECONDS = 600 # 19 MB, for the caller that uploads the WAV itself
|
||||
CLEANUP_CHUNK_CHARS = 12000 # keep each cleanup call comfortably small
|
||||
HOSTED_TIMEOUT = 600 # a quarter hour of audio, with room for the upload
|
||||
RETRIES = 3 # how many times one chunk is asked for in all
|
||||
RETRY_WAIT = 5 # seconds before the second try, doubled after that
|
||||
RATE = 16000
|
||||
MIN_SUBTITLE_SECONDS = 1.5 # how long a cue with no end time of its own stays up
|
||||
|
||||
@@ -87,9 +96,40 @@ class FileTranscriber(QObject):
|
||||
def _check(self):
|
||||
self._abort.check()
|
||||
|
||||
def _wait(self, seconds):
|
||||
"""Sleep on it, with the Stop button still able to get through."""
|
||||
deadline = time.monotonic() + seconds
|
||||
while time.monotonic() < deadline:
|
||||
self._check()
|
||||
time.sleep(0.25)
|
||||
self._check()
|
||||
|
||||
def _attempt(self, call, stage):
|
||||
"""`call`, asked again when what failed was the network rather than us.
|
||||
|
||||
One chunk is a quarter hour of audio that took a minute to encode and a
|
||||
minute to upload, so a gateway having a bad moment is worth waiting out
|
||||
rather than throwing the run away over. `stage` is what the status line
|
||||
said before the failure, put back once the wait is over.
|
||||
"""
|
||||
for attempt in range(1, RETRIES + 1):
|
||||
self._check()
|
||||
try:
|
||||
return call()
|
||||
except api.ApiError as exc:
|
||||
if attempt == RETRIES or not exc.retryable:
|
||||
raise
|
||||
self.progress.emit(t(
|
||||
"{error} Trying again ({attempt}/{total})…",
|
||||
error=exc, attempt=attempt + 1, total=RETRIES))
|
||||
self._wait(RETRY_WAIT * 2 ** (attempt - 1))
|
||||
self.progress.emit(stage)
|
||||
|
||||
def _work(self, path, timestamps, do_cleanup):
|
||||
conf = self.conf
|
||||
workdir = None
|
||||
pieces = []
|
||||
segments = []
|
||||
try:
|
||||
if not shutil.which("ffmpeg"):
|
||||
raise api.ApiError(t("ffmpeg not found. Install it to transcribe files."))
|
||||
@@ -105,39 +145,36 @@ class FileTranscriber(QObject):
|
||||
if len(chunks) > 1:
|
||||
self.progress.emit(t("Splitting into {count} chunks…", count=len(chunks)))
|
||||
|
||||
pieces = []
|
||||
segments = []
|
||||
for index, (chunk_path, offset) in enumerate(chunks, start=1):
|
||||
self._check()
|
||||
self.progress.emit(
|
||||
t("Transcribing chunk {index}/{count}…",
|
||||
index=index, count=len(chunks))
|
||||
if len(chunks) > 1 else t("Transcribing…")
|
||||
)
|
||||
stage = (t("Transcribing chunk {index}/{count}…",
|
||||
index=index, count=len(chunks))
|
||||
if len(chunks) > 1 else t("Transcribing…"))
|
||||
self.progress.emit(stage)
|
||||
if timestamps:
|
||||
segments = stitch(segments, [
|
||||
(start + offset, end + offset, line)
|
||||
for start, end, line in api.transcribe_segments(
|
||||
target,
|
||||
chunk_path,
|
||||
language=conf["language"],
|
||||
prompt=conf["transcribe_prompt"],
|
||||
aborter=self._abort,
|
||||
)
|
||||
])
|
||||
else:
|
||||
pieces.append(api.transcribe(
|
||||
heard = self._attempt(lambda: api.transcribe_segments(
|
||||
target,
|
||||
chunk_path,
|
||||
language=conf["language"],
|
||||
prompt=conf["transcribe_prompt"],
|
||||
timeout=HOSTED_TIMEOUT,
|
||||
aborter=self._abort,
|
||||
))
|
||||
), stage)
|
||||
segments = stitch(segments, [
|
||||
(start + offset, end + offset, line)
|
||||
for start, end, line in heard
|
||||
])
|
||||
else:
|
||||
pieces.append(self._attempt(lambda: api.transcribe(
|
||||
target,
|
||||
chunk_path,
|
||||
language=conf["language"],
|
||||
prompt=conf["transcribe_prompt"],
|
||||
timeout=HOSTED_TIMEOUT,
|
||||
aborter=self._abort,
|
||||
), stage))
|
||||
|
||||
if timestamps:
|
||||
pieces = [f"[{format_timestamp(start)}] {line}"
|
||||
for start, _, line in segments]
|
||||
text = "\n".join(pieces) if timestamps else " ".join(pieces)
|
||||
text = _joined(pieces, segments, timestamps)
|
||||
|
||||
if do_cleanup and text:
|
||||
self._check()
|
||||
@@ -149,7 +186,16 @@ class FileTranscriber(QObject):
|
||||
except Cancelled:
|
||||
self.progress.emit(t("Stopped."))
|
||||
except (api.ApiError, OSError, subprocess.SubprocessError, wave.Error) as exc:
|
||||
self.failed.emit(str(exc))
|
||||
# An hour of a long file already heard is not worth throwing away
|
||||
# because the chunk after it failed, or because cleanup did. Hand
|
||||
# over what there is, and say in the same breath where it stops.
|
||||
partial = _joined(pieces, segments, timestamps)
|
||||
if partial:
|
||||
self.finished.emit(partial, segments)
|
||||
self.failed.emit(t("{error} The transcript up to there is below.",
|
||||
error=exc))
|
||||
else:
|
||||
self.failed.emit(str(exc))
|
||||
finally:
|
||||
self._local = None
|
||||
if workdir:
|
||||
@@ -182,12 +228,21 @@ class FileTranscriber(QObject):
|
||||
self._local = ggml.llm if cleanup.provider(conf) == "local" else None
|
||||
prompt = conf.cleanup_prompt(with_timestamps=timestamps, subtitles=True)
|
||||
out = []
|
||||
stage = t("Cleaning up…")
|
||||
for block in split_text(text, timestamps):
|
||||
self._check()
|
||||
out.append(cleanup.run(block, conf, prompt, aborter=self._abort))
|
||||
out.append(self._attempt(
|
||||
lambda: cleanup.run(block, conf, prompt, aborter=self._abort), stage))
|
||||
return ("\n" if timestamps else "\n\n").join(out)
|
||||
|
||||
|
||||
def _joined(pieces, segments, timestamps):
|
||||
"""The transcript as one string, out of whichever of the two is holding it."""
|
||||
if timestamps:
|
||||
pieces = [f"[{format_timestamp(start)}] {line}" for start, _, line in segments]
|
||||
return "\n".join(pieces) if timestamps else " ".join(pieces)
|
||||
|
||||
|
||||
def format_timestamp(seconds):
|
||||
seconds = int(seconds)
|
||||
hours, rest = divmod(seconds, 3600)
|
||||
@@ -313,13 +368,20 @@ def wav_seconds(wav_path):
|
||||
def chunk_seconds(path, duration):
|
||||
"""How many seconds of this audio fit in one request, or 0 when all of it does.
|
||||
|
||||
Measured rather than worked out: what an encoder makes of an hour of speech
|
||||
depends on the speech, and the file on disk is the only honest answer.
|
||||
Whichever of the two limits bites first. How much fits under the upload
|
||||
limit is measured rather than worked out: what an encoder makes of an hour
|
||||
of speech depends on the speech, and the file on disk is the only honest
|
||||
answer. The other limit is MAX_CHUNK_SECONDS, and it is the one that catches
|
||||
a long file at this bitrate: an hour and a half of mp3 is two chunks by size
|
||||
and one of them is an hour of audio in a single request, which no hosted
|
||||
gateway stays on the line for.
|
||||
"""
|
||||
size = os.path.getsize(path)
|
||||
if size <= UPLOAD_LIMIT or duration <= 0:
|
||||
if duration <= 0:
|
||||
return 0.0
|
||||
return max(60.0, duration * UPLOAD_LIMIT / size * 0.95)
|
||||
size = os.path.getsize(path)
|
||||
fits = duration * UPLOAD_LIMIT / size * 0.95 if size > UPLOAD_LIMIT else duration
|
||||
seconds = max(60.0, min(fits, MAX_CHUNK_SECONDS))
|
||||
return 0.0 if seconds >= duration else seconds
|
||||
|
||||
|
||||
def split_wav(wav_path, workdir, seconds=WAV_CHUNK_SECONDS, overlap=OVERLAP_SECONDS):
|
||||
|
||||
@@ -134,6 +134,22 @@ def release(repo, tag="latest", refresh=False):
|
||||
return data.get("tag_name") or tag, assets
|
||||
|
||||
|
||||
def newest_release(repo, refresh=False):
|
||||
"""(tag, page, published) for the newest release of a repository.
|
||||
|
||||
release() above is for taking a file out of one and insists on there being
|
||||
files to take; this is for the number, which a release with nothing
|
||||
attached answers just as well. GitHub keeps prereleases out of "latest" on
|
||||
its own, which is what leaves the nightly build off this answer.
|
||||
"""
|
||||
data = _fetch(f"gh-newest-{repo}",
|
||||
f"{GITHUB_API}/repos/{repo}/releases/latest", refresh=refresh)
|
||||
if not isinstance(data, dict) or not data.get("tag_name"):
|
||||
raise HubError(t("{repo} has published no release.", repo=repo))
|
||||
return (data["tag_name"], data.get("html_url") or "",
|
||||
data.get("published_at") or "")
|
||||
|
||||
|
||||
def files(repo, revision="main", refresh=False):
|
||||
"""[Item] for every file in a Hugging Face repository.
|
||||
|
||||
|
||||
@@ -192,6 +192,25 @@ TR = {
|
||||
"Silence threshold": "Sessizlik eşiği",
|
||||
"Keep audio files ({path})": "Ses kayıtlarını sakla ({path})",
|
||||
|
||||
# --- updates --------------------------------------------------------
|
||||
"Updates": "Güncelleme",
|
||||
"Look for a newer version once a day": "Günde bir kez yeni sürüm var mı diye bak",
|
||||
"Dikte only looks. What it finds opens the release page in your browser; "
|
||||
"it downloads and installs nothing by itself.":
|
||||
"Dikte yalnızca bakar. Bulduğu şey tarayıcında sürüm sayfasını açar; "
|
||||
"kendi başına hiçbir şey indirmez ve kurmaz.",
|
||||
"Check now": "Şimdi bak",
|
||||
"Looking…": "Bakılıyor…",
|
||||
"Open the release page": "Sürüm sayfasını aç",
|
||||
"This is Dikte {version}.": "Buradaki sürüm Dikte {version}.",
|
||||
"Dikte {version} is the newest release.": "En yeni sürüm zaten bu: Dikte {version}.",
|
||||
"Dikte {version} is out; this is {current}.":
|
||||
"Dikte {version} çıkmış; buradaki sürüm {current}.",
|
||||
"Dikte {version} is out…": "Dikte {version} çıkmış…",
|
||||
"Dikte {version} is out. The tray menu has the release page.":
|
||||
"Dikte {version} çıkmış. Sürüm sayfası tepsi menüsünde.",
|
||||
"{repo} has published no release.": "{repo} için yayımlanmış sürüm yok.",
|
||||
|
||||
# --- settings: api --------------------------------------------------
|
||||
"Keys": "Anahtarlar",
|
||||
"Speech to text": "Sesi yazıya çevirme",
|
||||
@@ -297,6 +316,10 @@ TR = {
|
||||
"Converting audio…": "Ses dönüştürülüyor…",
|
||||
"Splitting into {count} chunks…": "{count} parçaya bölünüyor…",
|
||||
"Transcribing chunk {index}/{count}…": "{index}/{count} parça yazıya çevriliyor…",
|
||||
"{error} Trying again ({attempt}/{total})…":
|
||||
"{error} Yeniden deneniyor ({attempt}/{total})…",
|
||||
"{error} The transcript up to there is below.":
|
||||
"{error} Oraya kadar çevrilen metin aşağıda.",
|
||||
"Done: {chars} characters.": "Bitti: {chars} karakter.",
|
||||
"Stopped.": "Durduruldu.",
|
||||
"Failed: {error}": "Başarısız: {error}",
|
||||
|
||||
@@ -0,0 +1,203 @@
|
||||
"""The parts of AppKit a dictation needs on macOS and Qt does not reach.
|
||||
|
||||
Two jobs, both about staying out of the user's way.
|
||||
|
||||
The first is keeping the indicator on screen. Qt draws it as a tool window,
|
||||
which on macOS is an NSPanel, and an NSPanel is hidden by the system the moment
|
||||
its application stops being the active one. For a dictation indicator that is
|
||||
exactly backwards: you press the shortcut inside some other program, so Dikte is
|
||||
never the active application, and the one window that has something to say
|
||||
disappears as soon as you look away from it. Three settings AppKit has and Qt
|
||||
does not expose:
|
||||
|
||||
hidesOnDeactivate = NO stay put when another application comes forward
|
||||
collectionBehavior show on whichever desktop is in front, including
|
||||
over a full screen window, and stay out of Cmd+Tab
|
||||
nonactivating panel come to the front without bringing Dikte with it
|
||||
|
||||
The second is putting the front back. Opening the microphone activates Dikte
|
||||
whatever the indicator does, so app.py watches for that and calls activate()
|
||||
here. See _give_the_front_back() there for the measurement.
|
||||
|
||||
Done through the Objective-C runtime rather than a binding, because Dikte has no
|
||||
third party Python packages and this is a handful of messages to three objects.
|
||||
The runtime is loaded in _appkit() rather than at import, the way paste.py loads
|
||||
its frameworks in _macos_api(): that is the one function a test fakes, and it is
|
||||
what lets the tests below run on a machine that has no AppKit at all.
|
||||
"""
|
||||
|
||||
import ctypes
|
||||
import ctypes.util
|
||||
import os
|
||||
|
||||
from PyQt6.QtGui import QGuiApplication
|
||||
|
||||
# NSWindowCollectionBehavior, as of the macOS these names come from:
|
||||
CAN_JOIN_ALL_SPACES = 1 << 0
|
||||
IGNORES_CYCLE = 1 << 6 # not a window Cmd+Tab should ever land on
|
||||
FULL_SCREEN_AUXILIARY = 1 << 8
|
||||
BEHAVIOUR = CAN_JOIN_ALL_SPACES | IGNORES_CYCLE | FULL_SCREEN_AUXILIARY
|
||||
|
||||
# NSWindowStyleMaskNonactivatingPanel. Without it, ordering the indicator to
|
||||
# the front brings Dikte to the front with it, and the application the user was
|
||||
# typing in loses focus the moment they start dictating: the Cmd+V at the end
|
||||
# then lands on the indicator instead of their document. Qt has no flag for
|
||||
# this; WA_ShowWithoutActivating governs the show, not what the panel does to
|
||||
# the application afterwards.
|
||||
NONACTIVATING_PANEL = 1 << 7
|
||||
|
||||
_appkit_runtime = None
|
||||
|
||||
|
||||
class _AppKit:
|
||||
"""objc_msgSend under the signatures this file sends it through.
|
||||
|
||||
It has no fixed signature of its own, and calling it through the wrong
|
||||
argument or return types is how a Mac crashes rather than raises, so each
|
||||
one is spelled out once here and used by name below.
|
||||
"""
|
||||
|
||||
def __init__(self, objc):
|
||||
self.objc = objc
|
||||
objc.sel_registerName.restype = ctypes.c_void_p
|
||||
objc.sel_registerName.argtypes = [ctypes.c_char_p]
|
||||
objc.objc_getClass.restype = ctypes.c_void_p
|
||||
objc.objc_getClass.argtypes = [ctypes.c_char_p]
|
||||
self.ask = self._as(ctypes.c_void_p)
|
||||
self.ask_bool = self._as(ctypes.c_bool)
|
||||
self.ask_pid = self._as(ctypes.c_int) # pid_t is an int32
|
||||
self.ask_unsigned = self._as(ctypes.c_ulong) # NSUInteger
|
||||
self.tell_bool = self._as(None, ctypes.c_bool)
|
||||
self.tell_unsigned = self._as(None, ctypes.c_ulong)
|
||||
self.ask_of_class = self._as(ctypes.c_bool, ctypes.c_void_p)
|
||||
self.ask_of_pid = self._as(ctypes.c_void_p, ctypes.c_int)
|
||||
self.ask_with_options = self._as(ctypes.c_bool, ctypes.c_ulong)
|
||||
|
||||
def _as(self, returns, *arguments):
|
||||
return ctypes.cast(self.objc.objc_msgSend, ctypes.CFUNCTYPE(
|
||||
returns, ctypes.c_void_p, ctypes.c_void_p, *arguments))
|
||||
|
||||
def selector(self, name):
|
||||
return self.objc.sel_registerName(name)
|
||||
|
||||
def shared(self, class_name, selector):
|
||||
"""A class's singleton, e.g. +[NSWorkspace sharedWorkspace]."""
|
||||
return ctypes.c_void_p(self.ask(
|
||||
ctypes.c_void_p(self.objc.objc_getClass(class_name)),
|
||||
self.selector(selector)))
|
||||
|
||||
|
||||
def _appkit():
|
||||
"""The Objective-C runtime, loaded the first time something needs it.
|
||||
|
||||
Loaded here rather than at import so that this module can be imported on a
|
||||
machine that has no AppKit: the tests stand on macOS from a Linux machine
|
||||
and back, and this is the one function they replace to do it.
|
||||
"""
|
||||
global _appkit_runtime
|
||||
if _appkit_runtime is None:
|
||||
_appkit_runtime = _AppKit(
|
||||
ctypes.cdll.LoadLibrary(ctypes.util.find_library("objc")))
|
||||
return _appkit_runtime
|
||||
|
||||
|
||||
def frontmost_pid():
|
||||
"""Which application is in front, by process id, or None when unasked.
|
||||
|
||||
A process id rather than the object itself: the object would have to be
|
||||
retained to survive the trip, and a number needs nothing looking after it.
|
||||
"""
|
||||
try:
|
||||
api = _appkit()
|
||||
workspace = api.shared(b"NSWorkspace", b"sharedWorkspace")
|
||||
running = ctypes.c_void_p(api.ask(
|
||||
workspace, api.selector(b"frontmostApplication")))
|
||||
if not running:
|
||||
return None
|
||||
return int(api.ask_pid(running, api.selector(b"processIdentifier")))
|
||||
except Exception:
|
||||
return None
|
||||
|
||||
|
||||
def activate(pid):
|
||||
"""Put the application with that process id back in front.
|
||||
|
||||
False when it has gone away in the meantime, or when the message could not
|
||||
be sent at all: a dictation is not worth failing over the window behind it.
|
||||
"""
|
||||
if not pid:
|
||||
return False
|
||||
try:
|
||||
api = _appkit()
|
||||
running = ctypes.c_void_p(api.ask_of_pid(
|
||||
ctypes.c_void_p(api.objc.objc_getClass(b"NSRunningApplication")),
|
||||
api.selector(b"runningApplicationWithProcessIdentifier:"),
|
||||
int(pid)))
|
||||
if not running:
|
||||
return False
|
||||
# activateWithOptions: rather than the deprecated activate, and with no
|
||||
# options: bringing every one of its windows forward is not asked for,
|
||||
# only the application it was before Dikte took the front from it.
|
||||
return bool(api.ask_with_options(
|
||||
running, api.selector(b"activateWithOptions:"), 0))
|
||||
except Exception:
|
||||
return False
|
||||
|
||||
|
||||
def is_frontmost():
|
||||
"""Whether Dikte itself is the application in front.
|
||||
|
||||
By process id rather than -[NSRunningApplication isActive] on our own
|
||||
process, which stays true once the application has ever been activated:
|
||||
measured True with another application plainly in front.
|
||||
"""
|
||||
pid = frontmost_pid()
|
||||
return pid is not None and pid == os.getpid()
|
||||
|
||||
|
||||
def _is_panel(api, window):
|
||||
"""Whether this window is an NSPanel, which is the only kind the
|
||||
nonactivating bit is legal on: setting it on a plain NSWindow raises an
|
||||
Objective-C exception, and an exception through ctypes takes the process
|
||||
down with it."""
|
||||
panel = api.objc.objc_getClass(b"NSPanel")
|
||||
if not panel:
|
||||
return False
|
||||
return bool(api.ask_of_class(window, api.selector(b"isKindOfClass:"),
|
||||
ctypes.c_void_p(panel)))
|
||||
|
||||
|
||||
def keep_on_screen(widget):
|
||||
"""Ask the window behind `widget` to stay while other programs are used.
|
||||
|
||||
Silent when anything is not as expected: an indicator that cannot be made
|
||||
to linger is still an indicator, and a dictation should not fail over the
|
||||
window it is drawn in.
|
||||
"""
|
||||
# Only the Cocoa backend hands out a real NSView. Under the offscreen
|
||||
# platform the tests run on, winId() is a number that means something else
|
||||
# entirely, and sending an Objective-C message to it is how a test run
|
||||
# turns into a crash.
|
||||
if QGuiApplication.platformName() != "cocoa":
|
||||
return False
|
||||
try:
|
||||
api = _appkit()
|
||||
view = ctypes.c_void_p(int(widget.winId()))
|
||||
window = api.ask(view, api.selector(b"window"))
|
||||
if not window:
|
||||
return False
|
||||
window = ctypes.c_void_p(window)
|
||||
api.tell_bool(window, api.selector(b"setHidesOnDeactivate:"), False)
|
||||
api.tell_unsigned(window, api.selector(b"setCollectionBehavior:"),
|
||||
BEHAVIOUR)
|
||||
# Only a panel may carry the nonactivating bit, and only a panel is
|
||||
# asked to: on anything else the message raises, and an Objective-C
|
||||
# exception through ctypes takes the process with it.
|
||||
if _is_panel(api, window):
|
||||
mask = api.ask_unsigned(window, api.selector(b"styleMask"))
|
||||
if not mask & NONACTIVATING_PANEL:
|
||||
api.tell_unsigned(window, api.selector(b"setStyleMask:"),
|
||||
mask | NONACTIVATING_PANEL)
|
||||
return True
|
||||
except (AttributeError, OSError, RuntimeError, ValueError):
|
||||
return False
|
||||
@@ -7,6 +7,8 @@ from PyQt6.QtCore import Qt, QTimer, QRectF, QPointF
|
||||
from PyQt6.QtGui import QColor, QCursor, QFont, QPainter, QPainterPath, QPen, QFontMetrics
|
||||
from PyQt6.QtWidgets import QWidget, QApplication
|
||||
|
||||
from . import mac_window
|
||||
|
||||
BARS = 22
|
||||
HEIGHT = 56
|
||||
MIN_WIDTH = 210
|
||||
@@ -202,6 +204,11 @@ class Overlay(QWidget):
|
||||
self._reposition()
|
||||
if not self.isVisible():
|
||||
self.show()
|
||||
if sys.platform == "darwin":
|
||||
# After show(), because the window it works on does not exist until
|
||||
# then, and every time, because a window Qt rebuilt has the setting
|
||||
# again at its default.
|
||||
mac_window.keep_on_screen(self)
|
||||
if self._concealed:
|
||||
self.raise_()
|
||||
self._concealed = False
|
||||
|
||||
+37
-6
@@ -147,7 +147,9 @@ def _program_keyboard(program, command, hint=""):
|
||||
def ready():
|
||||
return shutil.which(program) is not None
|
||||
|
||||
def press(shortcut, delay):
|
||||
def press(shortcut, delay, _focus=None):
|
||||
# Nothing here takes the front from the window being dictated into, so
|
||||
# there is nothing to hand back: the process id is a macOS concern.
|
||||
if not ready():
|
||||
raise PasteError(t("{tool} not found, cannot paste automatically.",
|
||||
tool=program))
|
||||
@@ -296,11 +298,27 @@ def _ask_for_permission():
|
||||
pass
|
||||
|
||||
|
||||
def _macos_press(shortcut, delay):
|
||||
def _macos_press(shortcut, delay, focus=None):
|
||||
"""Post the key down and up straight into the window system.
|
||||
|
||||
Nothing is typed anywhere until macOS has been told to trust Dikte, and it
|
||||
only asks once, when the paste it was granted for is first tried.
|
||||
|
||||
`focus` is the application that was in front when the recording began. The
|
||||
keys land wherever the window system is pointing, so a Dikte that has ended
|
||||
up in front would swallow its own transcript; when that has happened the
|
||||
front is handed back before pressing. Nothing is taken from anyone else: an
|
||||
application the user went to while the transcription ran is where they want
|
||||
the text now.
|
||||
|
||||
This runs on the transcription's own thread rather than the main one, and
|
||||
the two calls it makes are the kind AppKit documents as answering
|
||||
atomically wherever they are asked from: NSRunningApplication is thread
|
||||
safe by its own header, and the workspace lookup behind it returns a
|
||||
reference rather than anything that has to be held. Stressed with four
|
||||
threads and 32000 lookups against a running main loop without a fault; if
|
||||
one ever does happen, mac_window answers None and the press goes ahead
|
||||
where it would have gone anyway.
|
||||
"""
|
||||
keycode, flags = _macos_keys(shortcut)
|
||||
services, core = _macos_api()
|
||||
@@ -310,6 +328,12 @@ def _macos_press(shortcut, delay):
|
||||
"macOS has not been told to let Dikte press keys. Turn Dikte on "
|
||||
"under System Settings → Privacy & Security → Accessibility."
|
||||
))
|
||||
if focus:
|
||||
# Imported here rather than at the top: it reaches for QtGui, and a
|
||||
# terminal that only wants the clipboard should not pay for that.
|
||||
from . import mac_window
|
||||
if mac_window.is_frontmost():
|
||||
mac_window.activate(focus)
|
||||
|
||||
time.sleep(delay) # let the selection settle and focus come back
|
||||
down = services.CGEventCreateKeyboardEvent(None, keycode, True)
|
||||
@@ -464,11 +488,14 @@ class _WinInput(ctypes.Structure):
|
||||
_fields_ = [("type", ctypes.c_ulong), ("union", _WinInputUnion)]
|
||||
|
||||
|
||||
def _win_press(shortcut, delay):
|
||||
def _win_press(shortcut, delay, _focus=None):
|
||||
"""Post the presses and releases straight into the input queue.
|
||||
|
||||
No permission stands in front of SendInput the way Accessibility does on
|
||||
macOS: whatever window has focus receives the combination.
|
||||
|
||||
Nothing here takes the front from the window being dictated into, so the
|
||||
remembered process id has nothing to hand back to: it is a macOS concern.
|
||||
"""
|
||||
codes = _win_keys(shortcut)
|
||||
user32, _ = _win_api()
|
||||
@@ -675,7 +702,11 @@ def paste_ready():
|
||||
return desktop().ready()
|
||||
|
||||
|
||||
def press(shortcut="", delay=0.12):
|
||||
"""Press a paste combination, e.g. 'ctrl+v', or this desktop's own."""
|
||||
def press(shortcut="", delay=0.12, focus=None):
|
||||
"""Press a paste combination, e.g. 'ctrl+v', or this desktop's own.
|
||||
|
||||
`focus` is the process the keys are meant for, remembered when the
|
||||
recording started: see the macOS press for what is done with it.
|
||||
"""
|
||||
here = desktop()
|
||||
here.press(shortcut or here.shortcuts[0], delay)
|
||||
here.press(shortcut or here.shortcuts[0], delay, focus)
|
||||
|
||||
@@ -15,6 +15,7 @@ from PyQt6.QtWidgets import (
|
||||
QPushButton, QScrollArea, QSpinBox, QTabWidget, QVBoxLayout, QWidget,
|
||||
)
|
||||
|
||||
from . import __version__
|
||||
from . import api
|
||||
from . import assistant
|
||||
from . import audio
|
||||
@@ -23,9 +24,11 @@ from . import config as cfg
|
||||
from . import filetranscribe
|
||||
from . import ggml
|
||||
from . import hotkey
|
||||
from . import hub
|
||||
from . import ipc
|
||||
from . import meeting
|
||||
from . import paste
|
||||
from . import update
|
||||
from .filetranscribe import FileTranscriber
|
||||
from .i18n import t
|
||||
|
||||
@@ -526,6 +529,9 @@ class LocalModelBox(QGroupBox):
|
||||
|
||||
class SettingsWindow(QDialog):
|
||||
applied = pyqtSignal()
|
||||
# A newer release this window's own check found, so that the tray icon
|
||||
# hears about it from here rather than waiting for its own next check.
|
||||
update_found = pyqtSignal(object)
|
||||
|
||||
def _sources_once(self):
|
||||
"""One device listing per window build, shared by every combo.
|
||||
@@ -540,6 +546,8 @@ class SettingsWindow(QDialog):
|
||||
_transcribe_models_loaded = pyqtSignal(list, str)
|
||||
# Which key was tested, whether it worked, and what to write under it.
|
||||
_test_done = pyqtSignal(str, bool, str)
|
||||
# The release that was found, or None, and what went wrong instead.
|
||||
_update_checked = pyqtSignal(object, str)
|
||||
|
||||
def __init__(self, conf, meetings=None, parent=None):
|
||||
super().__init__(parent)
|
||||
@@ -556,6 +564,9 @@ class SettingsWindow(QDialog):
|
||||
self._key_fields = {}
|
||||
self._testers = {}
|
||||
self._shown_provider = ""
|
||||
# Where "Open the release page" goes: the release itself once a check
|
||||
# has named one, and the page that redirects to the newest until then.
|
||||
self._release_url = update.RELEASES_PAGE
|
||||
self.transcriber = FileTranscriber(conf, self)
|
||||
self.setWindowTitle(t("Dikte Settings"))
|
||||
|
||||
@@ -590,6 +601,7 @@ class SettingsWindow(QDialog):
|
||||
self._models_loaded.connect(self._on_models_loaded)
|
||||
self._transcribe_models_loaded.connect(self._on_transcribe_models_loaded)
|
||||
self._test_done.connect(self._on_test_done)
|
||||
self._update_checked.connect(self._on_update_checked)
|
||||
self.transcriber.progress.connect(self._on_file_progress)
|
||||
self.transcriber.finished.connect(self._on_file_finished)
|
||||
self.transcriber.failed.connect(self._on_file_failed)
|
||||
@@ -721,6 +733,23 @@ class SettingsWindow(QDialog):
|
||||
t("Keep audio files ({path})", path=str(cfg.RECORDINGS_DIR))
|
||||
)
|
||||
form.addRow("", self.keep_audio)
|
||||
|
||||
self.update_check = QCheckBox(t("Look for a newer version once a day"))
|
||||
self.update_check.setToolTip(
|
||||
t("Dikte only looks. What it finds opens the release page in your "
|
||||
"browser; it downloads and installs nothing by itself.")
|
||||
)
|
||||
form.addRow(t("Updates"), self.update_check)
|
||||
|
||||
self.update_status = WrappedLabel("")
|
||||
self.update_page = QPushButton(t("Open the release page"))
|
||||
self.update_page.clicked.connect(
|
||||
lambda: QDesktopServices.openUrl(QUrl(self._release_url))
|
||||
)
|
||||
self.update_now = QPushButton(t("Check now"))
|
||||
self.update_now.clicked.connect(self._check_for_update)
|
||||
form.addRow("", self._row(self.update_status, self.update_page,
|
||||
self.update_now))
|
||||
return page
|
||||
|
||||
def _api_tab(self):
|
||||
@@ -1591,6 +1620,8 @@ class SettingsWindow(QDialog):
|
||||
self.silence_db.setValue(int(conf["silence_db"]))
|
||||
self.filter_hallucinations.setChecked(conf["filter_hallucinations"])
|
||||
self.keep_audio.setChecked(conf["keep_audio"])
|
||||
self.update_check.setChecked(conf["update_check"])
|
||||
self._show_update(update.pending())
|
||||
|
||||
for name, who in cfg.TRANSCRIBERS.items():
|
||||
self._key_fields[name].setText(conf[who.key])
|
||||
@@ -1696,6 +1727,7 @@ class SettingsWindow(QDialog):
|
||||
conf["silence_db"] = float(self.silence_db.value())
|
||||
conf["filter_hallucinations"] = self.filter_hallucinations.isChecked()
|
||||
conf["keep_audio"] = self.keep_audio.isChecked()
|
||||
conf["update_check"] = self.update_check.isChecked()
|
||||
|
||||
provider = self.transcribe_provider.currentData() or "local"
|
||||
if provider in self._models:
|
||||
@@ -1946,6 +1978,45 @@ class SettingsWindow(QDialog):
|
||||
button.setEnabled(True)
|
||||
answer.setText(("✓ " if ok else "✗ ") + message)
|
||||
|
||||
# ---- updates ---------------------------------------------------------
|
||||
|
||||
def _check_for_update(self):
|
||||
"""The button, which asks GitHub whatever the daily clock says."""
|
||||
self.update_now.setEnabled(False)
|
||||
self.update_status.setText(t("Looking…"))
|
||||
|
||||
def work():
|
||||
try:
|
||||
self._update_checked.emit(update.check(force=True), "")
|
||||
except hub.HubError as exc:
|
||||
self._update_checked.emit(None, str(exc))
|
||||
|
||||
threading.Thread(target=work, daemon=True).start()
|
||||
|
||||
def _on_update_checked(self, release, error):
|
||||
self.update_now.setEnabled(True)
|
||||
if error:
|
||||
self.update_status.setText(error)
|
||||
return
|
||||
self._show_update(release, asked=True)
|
||||
if release is not None:
|
||||
self.update_found.emit(release)
|
||||
|
||||
def _show_update(self, release, asked=False):
|
||||
"""What the line under the checkbox says, and whether the page button
|
||||
is on it. `release` is None when this build is the newest one, and
|
||||
`asked` is what tells "nothing new" from "nobody has looked yet"."""
|
||||
self.update_page.setVisible(release is not None)
|
||||
if release is None:
|
||||
self.update_status.setText(
|
||||
t("Dikte {version} is the newest release.", version=__version__)
|
||||
if asked else t("This is Dikte {version}.", version=__version__))
|
||||
return
|
||||
self._release_url = release.url
|
||||
self.update_status.setText(
|
||||
t("Dikte {version} is out; this is {current}.",
|
||||
version=release.version, current=__version__))
|
||||
|
||||
# ---- audio file ------------------------------------------------------
|
||||
|
||||
def _choose_file(self):
|
||||
|
||||
+158
@@ -0,0 +1,158 @@
|
||||
"""Whether a newer Dikte has been published, and where to get it.
|
||||
|
||||
GitHub is asked for the newest release, its number is held against the one this
|
||||
build carries, and that is where it stops. Nothing is downloaded and nothing is
|
||||
replaced. The four downloads are installed in four different ways, and three of
|
||||
those belong to the platform rather than to Dikte: a Mac bundle is dragged into
|
||||
Applications and cannot rewrite itself while it is running, the Windows setup
|
||||
is an installer with an uninstall entry of its own, an AppImage is a single
|
||||
file kept wherever its owner keeps it, and a checkout is updated with git. A
|
||||
program that guessed at all four would be wrong on at least one of them, and
|
||||
being wrong there means an installation somebody has to repair by hand. So the
|
||||
answer ends in a browser, on the release page, where the same download that was
|
||||
installed the first time is waiting.
|
||||
|
||||
The clock is kept in a file of its own rather than in the settings. A check
|
||||
runs while the settings window may be open, and a background write into
|
||||
config.json is exactly what would overwrite a setting somebody is in the middle
|
||||
of changing.
|
||||
|
||||
Nothing here imports Qt or the rest of the application: `dikte update` at a
|
||||
terminal and the timer behind the tray icon ask the same three questions of the
|
||||
same module.
|
||||
"""
|
||||
|
||||
import collections
|
||||
import itertools
|
||||
import json
|
||||
import time
|
||||
|
||||
from . import __version__
|
||||
from . import hub
|
||||
from . import paths
|
||||
|
||||
REPO = "yusufipk/dikte"
|
||||
# Where somebody is sent. GitHub redirects this to whatever the newest release
|
||||
# is, so it stays right without anybody writing a number into it.
|
||||
RELEASES_PAGE = f"https://github.com/{REPO}/releases/latest"
|
||||
|
||||
# Once a day. A release happens every few weeks at best, and a question nobody
|
||||
# is waiting on is not one to ask GitHub on every start.
|
||||
INTERVAL = 24 * 3600
|
||||
|
||||
# When the last check was, what it found, and which version has already been
|
||||
# announced. In the data directory rather than the config one: it is not a
|
||||
# setting, nobody edits it, and losing it costs one extra request.
|
||||
STATE_FILE = paths.DATA_DIR / "update.json"
|
||||
|
||||
Release = collections.namedtuple("Release", "version url published")
|
||||
|
||||
|
||||
def _numbers(version):
|
||||
"""(1, 0, 2) for "v1.0.2", "1.0.2" and "1.0.2-dev.abc1234" alike.
|
||||
|
||||
Empty for anything that does not start with a number, which is what a tag
|
||||
naming something other than a version comes back as.
|
||||
"""
|
||||
number = str(version or "").strip().lstrip("vV").split("-")[0].split("+")[0]
|
||||
parts = []
|
||||
for piece in number.split("."):
|
||||
digits = "".join(itertools.takewhile(str.isdigit, piece))
|
||||
if not digits:
|
||||
break
|
||||
parts.append(int(digits))
|
||||
return tuple((parts + [0, 0, 0])[:3]) if parts else ()
|
||||
|
||||
|
||||
def newer(there, here=""):
|
||||
"""Whether the release numbered `there` is one this build has not got.
|
||||
|
||||
Only the numbers are compared, and what follows them is dropped. A build
|
||||
off master carries the released number with its commit after it
|
||||
(1.0.1-dev.abc1234), and that build is ahead of 1.0.1 rather than behind
|
||||
it; read as a version suffix it would be behind, and every nightly would be
|
||||
told to update to the release it was already past.
|
||||
"""
|
||||
theirs = _numbers(there)
|
||||
return bool(theirs) and theirs > _numbers(here or __version__)
|
||||
|
||||
|
||||
def state():
|
||||
"""What the last check wrote down; empty when there has never been one."""
|
||||
try:
|
||||
stored = json.loads(STATE_FILE.read_text(encoding="utf-8"))
|
||||
except (OSError, ValueError):
|
||||
return {}
|
||||
return stored if isinstance(stored, dict) else {}
|
||||
|
||||
|
||||
def _store(**changes):
|
||||
stored = state()
|
||||
stored.update(changes)
|
||||
try:
|
||||
STATE_FILE.parent.mkdir(parents=True, exist_ok=True)
|
||||
STATE_FILE.write_text(json.dumps(stored), encoding="utf-8")
|
||||
except OSError:
|
||||
pass # a check that cannot be written down still happened
|
||||
return stored
|
||||
|
||||
|
||||
def due(now=0):
|
||||
"""Whether a day has gone by since the last time anybody asked."""
|
||||
return (now or time.time()) - float(state().get("checked") or 0) >= INTERVAL
|
||||
|
||||
|
||||
def latest(refresh=False):
|
||||
"""The newest published release, asked for outright. Raises HubError."""
|
||||
tag, url, published = hub.newest_release(REPO, refresh=refresh)
|
||||
return Release(tag.lstrip("vV"), url or RELEASES_PAGE, published)
|
||||
|
||||
|
||||
def remember(release):
|
||||
"""Write down that a check has just happened, and what it found."""
|
||||
_store(checked=time.time(), version=release.version, url=release.url,
|
||||
published=release.published)
|
||||
|
||||
|
||||
def pending():
|
||||
"""The newer release the last check found, without asking anybody.
|
||||
|
||||
What the tray icon is built from: the answer has to be there the moment it
|
||||
appears, and a request on the way to the screen is a request nobody has
|
||||
time for.
|
||||
"""
|
||||
stored = state()
|
||||
version = stored.get("version") or ""
|
||||
if not newer(version):
|
||||
return None
|
||||
return Release(version, stored.get("url") or RELEASES_PAGE,
|
||||
stored.get("published") or "")
|
||||
|
||||
|
||||
def check(force=False):
|
||||
"""A newer release, or None when there is nothing to say.
|
||||
|
||||
The scheduled half: it asks only when a day has gone by, and answers from
|
||||
what the last check found in between. `force` is the button in Settings and
|
||||
the command line, which ask whatever the clock says.
|
||||
|
||||
The clock here is the only throttle. Once it has decided to ask, it asks
|
||||
for real rather than reading hub.py's few hours of cache, which is there to
|
||||
keep a settings window from fetching the same model list twice in an
|
||||
evening and would only ever answer this with something it already knew.
|
||||
"""
|
||||
if not force and not due():
|
||||
return pending()
|
||||
release = latest(refresh=True)
|
||||
remember(release)
|
||||
return release if newer(release.version) else None
|
||||
|
||||
|
||||
def announced():
|
||||
"""The version somebody has already been shown a notification about."""
|
||||
return state().get("announced") or ""
|
||||
|
||||
|
||||
def mark_announced(version):
|
||||
"""Said once. A daily check must not be a daily interruption."""
|
||||
_store(announced=version)
|
||||
+10
-5
@@ -50,16 +50,20 @@ class Pipeline(QObject):
|
||||
def busy(self):
|
||||
return self._thread is not None and self._thread.is_alive()
|
||||
|
||||
def run(self, wav_path, duration, rms_values=(), ask=False, paste=None):
|
||||
def run(self, wav_path, duration, rms_values=(), ask=False, paste=None,
|
||||
focus=None):
|
||||
"""`paste` overrides the setting for this one run, which is what a
|
||||
dictation asked for from a terminal wants: the text comes back down the
|
||||
socket, and pasting it into whatever had focus is nobody's intention."""
|
||||
socket, and pasting it into whatever had focus is nobody's intention.
|
||||
|
||||
`focus` is the application that was in front when the recording began,
|
||||
as a process id, and is where the paste is meant to land."""
|
||||
if self.busy:
|
||||
return
|
||||
self._stop.clear()
|
||||
self._thread = threading.Thread(
|
||||
target=self._work,
|
||||
args=(wav_path, duration, list(rms_values), ask, paste),
|
||||
args=(wav_path, duration, list(rms_values), ask, paste, focus),
|
||||
daemon=True,
|
||||
)
|
||||
self._thread.start()
|
||||
@@ -73,7 +77,8 @@ class Pipeline(QObject):
|
||||
"""
|
||||
self._stop.set()
|
||||
|
||||
def _work(self, wav_path, duration, rms_values, ask, paste_override=None):
|
||||
def _work(self, wav_path, duration, rms_values, ask, paste_override=None,
|
||||
focus=None):
|
||||
conf = self.conf
|
||||
started = time.monotonic()
|
||||
raw = ""
|
||||
@@ -171,7 +176,7 @@ class Pipeline(QObject):
|
||||
if wants_paste:
|
||||
self.stage.emit(t("Pasting…"))
|
||||
try:
|
||||
paste.press(conf["paste_shortcut"])
|
||||
paste.press(conf["paste_shortcut"], focus=focus)
|
||||
except paste.PasteError as exc:
|
||||
# The transcript is on the clipboard and in the history;
|
||||
# a key press that would not land is a warning, not a
|
||||
|
||||
Reference in New Issue
Block a user