From afa42dd2e4266fb4c371b403a6b73839deea4366 Mon Sep 17 00:00:00 2001 From: "Timothy J. Baek" Date: Thu, 19 Sep 2024 02:40:54 +0200 Subject: [PATCH] refac --- backend/open_webui/apps/audio/main.py | 28 +-- .../components/admin/Settings/Audio.svelte | 169 +++++++++--------- 2 files changed, 100 insertions(+), 97 deletions(-) diff --git a/backend/open_webui/apps/audio/main.py b/backend/open_webui/apps/audio/main.py index 0d389daf2..0eee533bd 100644 --- a/backend/open_webui/apps/audio/main.py +++ b/backend/open_webui/apps/audio/main.py @@ -161,7 +161,9 @@ async def update_audio_config( app.state.config.TTS_VOICE = form_data.tts.VOICE app.state.config.TTS_SPLIT_ON = form_data.tts.SPLIT_ON app.state.config.TTS_AZURE_SPEECH_REGION = form_data.tts.AZURE_SPEECH_REGION - app.state.config.TTS_AZURE_SPEECH_OUTPUT_FORMAT = form_data.tts.AZURE_SPEECH_OUTPUT_FORMAT + app.state.config.TTS_AZURE_SPEECH_OUTPUT_FORMAT = ( + form_data.tts.AZURE_SPEECH_OUTPUT_FORMAT + ) app.state.config.STT_OPENAI_API_BASE_URL = form_data.stt.OPENAI_API_BASE_URL app.state.config.STT_OPENAI_API_KEY = form_data.stt.OPENAI_API_KEY @@ -314,7 +316,7 @@ async def speech(request: Request, user=Depends(get_verified_user)): detail=error_detail, ) - elif app.state.config.TTS_ENGINE == "azurespeechservice": + elif app.state.config.TTS_ENGINE == "azure": payload = None try: payload = json.loads(body.decode("utf-8")) @@ -329,9 +331,9 @@ async def speech(request: Request, user=Depends(get_verified_user)): url = f"https://{region}.tts.speech.microsoft.com/cognitiveservices/v1" headers = { - 'Ocp-Apim-Subscription-Key': app.state.config.TTS_API_KEY, - 'Content-Type': 'application/ssml+xml', - 'X-Microsoft-OutputFormat': output_format + "Ocp-Apim-Subscription-Key": app.state.config.TTS_API_KEY, + "Content-Type": "application/ssml+xml", + "X-Microsoft-OutputFormat": output_format, } data = f""" @@ -347,9 +349,8 @@ async def speech(request: Request, user=Depends(get_verified_user)): else: log.error(f"Error synthesizing speech - {response.reason}") raise HTTPException( - status_code=500, - detail=f"Error synthesizing speech - {response.reason}") - + status_code=500, detail=f"Error synthesizing speech - {response.reason}" + ) @app.post("/transcriptions") @@ -528,23 +529,22 @@ def get_available_voices() -> dict: except Exception: # Avoided @lru_cache with exception pass - elif app.state.config.TTS_ENGINE == "azurespeechservice": + elif app.state.config.TTS_ENGINE == "azure": try: region = app.state.config.TTS_AZURE_SPEECH_REGION url = f"https://{region}.tts.speech.microsoft.com/cognitiveservices/voices/list" - headers = { - 'Ocp-Apim-Subscription-Key': app.state.config.TTS_API_KEY - } + headers = {"Ocp-Apim-Subscription-Key": app.state.config.TTS_API_KEY} response = requests.get(url, headers=headers) response.raise_for_status() voices = response.json() for voice in voices: - ret[voice['ShortName']] = f"{voice['DisplayName']} ({voice['ShortName']})" + ret[voice["ShortName"]] = ( + f"{voice['DisplayName']} ({voice['ShortName']})" + ) except requests.RequestException as e: log.error(f"Error fetching voices: {str(e)}") - return ret diff --git a/src/lib/components/admin/Settings/Audio.svelte b/src/lib/components/admin/Settings/Audio.svelte index 15db5a62d..040bc5e1a 100644 --- a/src/lib/components/admin/Settings/Audio.svelte +++ b/src/lib/components/admin/Settings/Audio.svelte @@ -91,7 +91,7 @@ VOICE: TTS_VOICE, SPLIT_ON: TTS_SPLIT_ON, AZURE_SPEECH_REGION: TTS_AZURE_SPEECH_REGION, - AZURE_SPEECH_OUTPUT_FORMAT: TTS_AZURE_SPEECH_OUTPUT_FORMAT, + AZURE_SPEECH_OUTPUT_FORMAT: TTS_AZURE_SPEECH_OUTPUT_FORMAT }, stt: { OPENAI_API_BASE_URL: STT_OPENAI_API_BASE_URL, @@ -231,7 +231,7 @@ - + @@ -260,7 +260,7 @@ /> - {:else if TTS_ENGINE === 'azurespeechservice'} + {:else if TTS_ENGINE === 'azure'}
-
+ {/if}
@@ -343,88 +343,91 @@ - {:else if TTS_ENGINE === 'elevenlabs'} -
-
-
{$i18n.t('TTS Voice')}
-
-
- - - - {#each voices as voice} - - {/each} - -
-
-
-
-
{$i18n.t('TTS Model')}
-
-
- - - - {#each models as model} - -
-
-
-
- {:else if TTS_ENGINE === 'azurespeechservice'} -
-
-
{$i18n.t('TTS Voice')}
-
-
- - - - {#each voices as voice} - - {/each} - -
-
-
-
-
- {$i18n.t('Output format')} - - {$i18n.t('Available list')} - -
-
-
- -
+ {:else if TTS_ENGINE === 'elevenlabs'} +
+
+
{$i18n.t('TTS Voice')}
+
+
+ + + + {#each voices as voice} + + {/each} +
- {/if} +
+
{$i18n.t('TTS Model')}
+
+
+ + + + {#each models as model} + +
+
+
+
+ {:else if TTS_ENGINE === 'azure'} +
+
+
{$i18n.t('TTS Voice')}
+
+
+ + + + {#each voices as voice} + + {/each} + +
+
+
+
+
+ {$i18n.t('Output format')} + + {$i18n.t('Available list')} + +
+
+
+ +
+
+
+
+ {/if}