From fe764e260030cfee2b2ce474a033a085c0c4ff94 Mon Sep 17 00:00:00 2001 From: vivek Date: Fri, 21 Jul 2023 11:36:40 -0400 Subject: [PATCH 1/2] --api option was not working correctly even when a good API key was provided. --- TranscriberModels.py | 2 ++ main.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/TranscriberModels.py b/TranscriberModels.py index 2c3a724..0c80ebe 100644 --- a/TranscriberModels.py +++ b/TranscriberModels.py @@ -2,6 +2,7 @@ import whisper import os import torch +import GlobalVars def get_model(use_api: bool, model: str = None): @@ -61,6 +62,7 @@ def load_model(self): class APIWhisperTranscriber: def __init__(self): print('Using Open AI API for transcription.') + openai.api_key = GlobalVars.TranscriptionGlobals().api_key # lang parameter is not required for API invocation. This exists solely # to support --api option from command line. # A better solution is to create a base class for APIWhisperTranscriber, diff --git a/main.py b/main.py index c5b45a0..6f0baf6 100644 --- a/main.py +++ b/main.py @@ -64,8 +64,8 @@ def main(): except ConnectionError: print('Operating as a standalone client') - global_vars = GlobalVars.TranscriptionGlobals() config = configuration.Config().get_data() + global_vars = GlobalVars.TranscriptionGlobals(key=config["OpenAI"]["api_key"]) # Command line arg for api_key takes preference over api_key specified in parameters.yaml file if args.api_key is not None: @@ -120,7 +120,7 @@ def main(): ui_cb = ui.ui_callbacks() global_vars.freeze_button.configure(command=ui_cb.freeze_unfreeze) - update_interval_slider_label.configure(text=f"Update interval: \ + update_interval_slider_label.configure(text=f"Update Response interval: \ {update_interval_slider.get()} \ seconds") From a7dcd9591c20c686880607da89b2b574752c693f Mon Sep 17 00:00:00 2001 From: vivek Date: Fri, 21 Jul 2023 12:07:39 -0400 Subject: [PATCH 2/2] Review comments --- main.py | 7 +++---- ui.py | 5 ++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/main.py b/main.py index 6f0baf6..10e2826 100644 --- a/main.py +++ b/main.py @@ -3,12 +3,12 @@ from argparse import RawTextHelpFormatter import time import requests +import subprocess from requests.exceptions import ConnectionError from AudioTranscriber import AudioTranscriber from GPTResponder import GPTResponder import customtkinter as ctk import TranscriberModels -import subprocess import interactions import ui from language import LANGUAGES_DICT @@ -120,9 +120,8 @@ def main(): ui_cb = ui.ui_callbacks() global_vars.freeze_button.configure(command=ui_cb.freeze_unfreeze) - update_interval_slider_label.configure(text=f"Update Response interval: \ - {update_interval_slider.get()} \ - seconds") + label_text = f'Update Response interval: {update_interval_slider.get()} seconds' + update_interval_slider_label.configure(text=label_text) lang_combobox.configure(command=model.change_lang) diff --git a/ui.py b/ui.py index 5ccb542..fd8cac8 100644 --- a/ui.py +++ b/ui.py @@ -81,9 +81,8 @@ def update_response_ui(responder, textbox, update_interval_slider_label, textbox.configure(state="disabled") update_interval = int(update_interval_slider.get()) - responder.update_response_interval(update_interval) - update_interval_slider_label.configure(text=f"Update interval: \ - {update_interval} seconds") + responder.set_response_interval(update_interval) + update_interval_slider_label.configure(text=f"Update Response interval: {update_interval} seconds") textbox.after(300, update_response_ui, responder, textbox, update_interval_slider_label, update_interval_slider,