Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Save settings #401

Merged
merged 7 commits into from
Apr 10, 2023
Merged

Save settings #401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
733d7dd
Save settings
chidiwilliams Apr 10, 2023
83bdbc6
Updates
chidiwilliams Apr 10, 2023
538eca1
Updates
chidiwilliams Apr 10, 2023
61fb6d2
Updates
chidiwilliams Apr 10, 2023
53809a9
Updates
chidiwilliams Apr 10, 2023
5234670
Updates
chidiwilliams Apr 10, 2023
de129f5
Updates
chidiwilliams Apr 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 50 additions & 6 deletions buzz/gui.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@
from .__version__ import VERSION
from .model_loader import ModelLoader, WhisperModelSize, ModelType, TranscriptionModel
from .recording import RecordingAmplitudeListener
from .settings import Settings, APP_NAME
from .transcriber import (SUPPORTED_OUTPUT_FORMATS, FileTranscriptionOptions, OutputFormat,
Task,
get_default_output_file_path, segments_to_text, write_output, TranscriptionOptions,
FileTranscriberQueueWorker, FileTranscriptionTask, RecordingTranscriber, LOADED_WHISPER_DLL)

APP_NAME = 'Buzz'
FileTranscriberQueueWorker, FileTranscriptionTask, RecordingTranscriber, LOADED_WHISPER_DLL,
DEFAULT_WHISPER_TEMPERATURE)


def get_asset_path(path: str):
Expand Down Expand Up @@ -228,6 +228,7 @@ class FileTranscriberWidget(QWidget):
# (TranscriptionOptions, FileTranscriptionOptions, str)
triggered = pyqtSignal(tuple)
openai_access_token_changed = pyqtSignal(str)
settings = Settings()

def __init__(self, file_paths: List[str], openai_access_token: Optional[str] = None,
parent: Optional[QWidget] = None, flags: Qt.WindowType = Qt.WindowType.Widget) -> None:
Expand All @@ -236,7 +237,17 @@ def __init__(self, file_paths: List[str], openai_access_token: Optional[str] = N
self.setWindowTitle(file_paths_as_title(file_paths))

self.file_paths = file_paths
self.transcription_options = TranscriptionOptions(openai_access_token=openai_access_token)
default_language = self.settings.value(key=Settings.Key.FILE_TRANSCRIBER_LANGUAGE, default_value='')
self.transcription_options = TranscriptionOptions(
openai_access_token=openai_access_token,
model=self.settings.value(key=Settings.Key.FILE_TRANSCRIBER_MODEL, default_value=TranscriptionModel()),
task=self.settings.value(key=Settings.Key.FILE_TRANSCRIBER_TASK, default_value=Task.TRANSCRIBE),
language=default_language if default_language != '' else None,
initial_prompt=self.settings.value(key=Settings.Key.FILE_TRANSCRIBER_INITIAL_PROMPT, default_value=''),
temperature=self.settings.value(key=Settings.Key.FILE_TRANSCRIBER_TEMPERATURE,
default_value=DEFAULT_WHISPER_TEMPERATURE),
word_level_timings=self.settings.value(key=Settings.Key.FILE_TRANSCRIBER_WORD_LEVEL_TIMINGS,
default_value=False))
self.file_transcription_options = FileTranscriptionOptions(
file_paths=self.file_paths)

Expand All @@ -248,15 +259,20 @@ def __init__(self, file_paths: List[str], openai_access_token: Optional[str] = N
self.on_transcription_options_changed)

self.word_level_timings_checkbox = QCheckBox(_('Word-level timings'))
self.word_level_timings_checkbox.setChecked(
self.settings.value(key=Settings.Key.FILE_TRANSCRIBER_WORD_LEVEL_TIMINGS, default_value=False))
self.word_level_timings_checkbox.stateChanged.connect(
self.on_word_level_timings_changed)

file_transcription_layout = QFormLayout()
file_transcription_layout.addRow('', self.word_level_timings_checkbox)

export_format_layout = QHBoxLayout()
default_export_format_states: List[str] = self.settings.value(key=Settings.Key.FILE_TRANSCRIBER_EXPORT_FORMATS,
default_value=[])
for output_format in OutputFormat:
export_format_checkbox = QCheckBox(f'{output_format.value.upper()}', parent=self)
export_format_checkbox.setChecked(output_format.value in default_export_format_states)
export_format_checkbox.stateChanged.connect(self.get_on_checkbox_state_changed_callback(output_format))
export_format_layout.addWidget(export_format_checkbox)

Expand Down Expand Up @@ -352,6 +368,18 @@ def on_word_level_timings_changed(self, value: int):
def closeEvent(self, event: QtGui.QCloseEvent) -> None:
if self.transcriber_thread is not None:
self.transcriber_thread.wait()

self.settings.set_value(Settings.Key.FILE_TRANSCRIBER_LANGUAGE, self.transcription_options.language)
self.settings.set_value(Settings.Key.FILE_TRANSCRIBER_TASK, self.transcription_options.task)
self.settings.set_value(Settings.Key.FILE_TRANSCRIBER_TEMPERATURE, self.transcription_options.temperature)
self.settings.set_value(Settings.Key.FILE_TRANSCRIBER_INITIAL_PROMPT, self.transcription_options.initial_prompt)
self.settings.set_value(Settings.Key.FILE_TRANSCRIBER_MODEL, self.transcription_options.model)
self.settings.set_value(key=Settings.Key.FILE_TRANSCRIBER_WORD_LEVEL_TIMINGS,
value=self.transcription_options.word_level_timings)
self.settings.set_value(key=Settings.Key.FILE_TRANSCRIBER_EXPORT_FORMATS,
value=[export_format.value for export_format in
self.file_transcription_options.output_formats])

super().closeEvent(event)


Expand Down Expand Up @@ -505,9 +533,17 @@ def __init__(self, parent: Optional[QWidget] = None, flags: Optional[Qt.WindowTy
self.current_status = self.RecordingStatus.STOPPED
self.setWindowTitle(_('Live Recording'))

self.settings = Settings()
default_language = self.settings.value(key=Settings.Key.RECORDING_TRANSCRIBER_LANGUAGE, default_value='')
self.transcription_options = TranscriptionOptions(
model=TranscriptionModel(model_type=ModelType.WHISPER_CPP if LOADED_WHISPER_DLL else ModelType.WHISPER,
whisper_model_size=WhisperModelSize.TINY))
model=self.settings.value(key=Settings.Key.RECORDING_TRANSCRIBER_MODEL, default_value=TranscriptionModel(
model_type=ModelType.WHISPER_CPP if LOADED_WHISPER_DLL else ModelType.WHISPER,
whisper_model_size=WhisperModelSize.TINY)),
task=self.settings.value(key=Settings.Key.RECORDING_TRANSCRIBER_TASK, default_value=Task.TRANSCRIBE),
language=default_language if default_language != '' else None,
initial_prompt=self.settings.value(key=Settings.Key.RECORDING_TRANSCRIBER_INITIAL_PROMPT, default_value=''),
temperature=self.settings.value(key=Settings.Key.RECORDING_TRANSCRIBER_TEMPERATURE,
default_value=DEFAULT_WHISPER_TEMPERATURE), word_level_timings=False)

self.audio_devices_combo_box = AudioDevicesComboBox(self)
self.audio_devices_combo_box.device_changed.connect(
Expand Down Expand Up @@ -698,6 +734,14 @@ def closeEvent(self, event: QCloseEvent) -> None:
if self.recording_amplitude_listener is not None:
self.recording_amplitude_listener.stop_recording()
self.recording_amplitude_listener.deleteLater()

self.settings.set_value(Settings.Key.RECORDING_TRANSCRIBER_LANGUAGE, self.transcription_options.language)
self.settings.set_value(Settings.Key.RECORDING_TRANSCRIBER_TASK, self.transcription_options.task)
self.settings.set_value(Settings.Key.RECORDING_TRANSCRIBER_TEMPERATURE, self.transcription_options.temperature)
self.settings.set_value(Settings.Key.RECORDING_TRANSCRIBER_INITIAL_PROMPT,
self.transcription_options.initial_prompt)
self.settings.set_value(Settings.Key.RECORDING_TRANSCRIBER_MODEL, self.transcription_options.model)

return super().closeEvent(event)


Expand Down
32 changes: 32 additions & 0 deletions buzz/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import enum
import typing

from PyQt6.QtCore import QSettings

APP_NAME = 'Buzz'


class Settings:
settings = QSettings(APP_NAME)

class Key(enum.Enum):
RECORDING_TRANSCRIBER_TASK = 'recording-transcriber/task'
RECORDING_TRANSCRIBER_MODEL = 'recording-transcriber/model'
RECORDING_TRANSCRIBER_LANGUAGE = 'recording-transcriber/language'
RECORDING_TRANSCRIBER_TEMPERATURE = 'recording-transcriber/temperature'
RECORDING_TRANSCRIBER_INITIAL_PROMPT = 'recording-transcriber/initial-prompt'

FILE_TRANSCRIBER_TASK = 'file-transcriber/task'
FILE_TRANSCRIBER_MODEL = 'file-transcriber/model'
FILE_TRANSCRIBER_LANGUAGE = 'file-transcriber/language'
FILE_TRANSCRIBER_TEMPERATURE = 'file-transcriber/temperature'
FILE_TRANSCRIBER_INITIAL_PROMPT = 'file-transcriber/initial-prompt'
FILE_TRANSCRIBER_WORD_LEVEL_TIMINGS = 'file-transcriber/word-level-timings'
FILE_TRANSCRIBER_EXPORT_FORMATS = 'file-transcriber/export-formats'

def set_value(self, key: Key, value: typing.Any) -> None:
self.settings.setValue(key.value, value)

def value(self, key: Key, default_value: typing.Any, value_type: typing.Optional[type] = None) -> typing.Any:
return self.settings.value(key.value, default_value,
value_type if value_type is not None else type(default_value))