From 2953f5c7fb287562834054cdf63a8f74a7c55761 Mon Sep 17 00:00:00 2001 From: misyaguziya <53165965+misyaguziya@users.noreply.github.com> Date: Tue, 4 Feb 2025 21:04:34 +0900 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B[bugfix]=20Model=20:=20=E5=A4=89?= =?UTF-8?q?=E6=95=B0=E3=81=AE=E5=88=9D=E6=9C=9F=E5=8C=96=E5=87=A6=E7=90=86?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src-python/model.py | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/src-python/model.py b/src-python/model.py index 251d9869..8a18a838 100644 --- a/src-python/model.py +++ b/src-python/model.py @@ -72,12 +72,15 @@ class Model: self.th_check_device = None self.mic_print_transcript = None self.mic_audio_recorder = None + self.mic_transcriber = None self.mic_energy_recorder = None self.mic_energy_plot_progressbar = None self.speaker_print_transcript = None self.speaker_audio_recorder = None + self.speaker_transcriber = None self.speaker_energy_recorder = None self.speaker_energy_plot_progressbar = None + self.previous_send_message = "" self.previous_receive_message = "" self.translator = Translator() @@ -426,13 +429,14 @@ class Model: selected_your_languages = config.SELECTED_YOUR_LANGUAGES[config.SELECTED_TAB_NO] languages = [data["language"] for data in selected_your_languages.values() if data["enable"] is True] countries = [data["country"] for data in selected_your_languages.values() if data["enable"] is True] - res = self.mic_transcriber.transcribeAudioQueue( - self.mic_audio_queue, - languages, - countries, - config.MIC_AVG_LOGPROB, - config.MIC_NO_SPEECH_PROB - ) + if isinstance(self.mic_transcriber, AudioTranscriber) is True: + res = self.mic_transcriber.transcribeAudioQueue( + self.mic_audio_queue, + languages, + countries, + config.MIC_AVG_LOGPROB, + config.MIC_NO_SPEECH_PROB + ) if res: result = self.mic_transcriber.getTranscript() fnc(result) @@ -444,7 +448,7 @@ class Model: self.mic_audio_queue.get() # while not self.mic_energy_queue.empty(): # self.mic_energy_queue.get() - del self.mic_transcriber + self.mic_transcriber = None gc.collect() # def sendMicEnergy(): @@ -593,13 +597,14 @@ class Model: selected_target_languages = config.SELECTED_TARGET_LANGUAGES[config.SELECTED_TAB_NO] languages = [data["language"] for data in selected_target_languages.values() if data["enable"] is True] countries = [data["country"] for data in selected_target_languages.values() if data["enable"] is True] - res = self.speaker_transcriber.transcribeAudioQueue( - speaker_audio_queue, - languages, - countries, - config.SPEAKER_AVG_LOGPROB, - config.SPEAKER_NO_SPEECH_PROB - ) + if isinstance(self.speaker_transcriber, AudioTranscriber) is True: + res = self.speaker_transcriber.transcribeAudioQueue( + speaker_audio_queue, + languages, + countries, + config.SPEAKER_AVG_LOGPROB, + config.SPEAKER_NO_SPEECH_PROB + ) if res: result = self.speaker_transcriber.getTranscript() fnc(result) @@ -611,7 +616,7 @@ class Model: speaker_audio_queue.get() # while not speaker_energy_queue.empty(): # speaker_energy_queue.get() - del self.speaker_transcriber + self.speaker_transcriber = None gc.collect() # def sendSpeakerEnergy():