From fbdedfb131e24e85447ed4b366101f8f55ff2f27 Mon Sep 17 00:00:00 2001
From: Fireblade <fireblade5234@gmail.com>
Date: Sun, 9 Mar 2025 15:16:45 -0400
Subject: [PATCH] Combine the language code checks

---
 api/src/routers/openai_compatible.py | 40 ++++++++++------------------
 1 file changed, 14 insertions(+), 26 deletions(-)

diff --git a/api/src/routers/openai_compatible.py b/api/src/routers/openai_compatible.py
index ed77766..6d4b92a 100644
--- a/api/src/routers/openai_compatible.py
+++ b/api/src/routers/openai_compatible.py
@@ -144,25 +144,13 @@ async def stream_audio_chunks(
     if hasattr(request, "return_timestamps"):
         unique_properties["return_timestamps"]=request.return_timestamps
     
-    # Determine language code with proper fallback
-    lang_code = request.lang_code
-    if not lang_code:
-        # Use default_voice_code from settings if available
-        lang_code = settings.default_voice_code
-        # Otherwise, use first letter of voice name
-        if not lang_code and voice_name:
-            lang_code = voice_name[0].lower()
-    
-    # Log the language code being used
-    logger.info(f"Starting audio generation with lang_code: {lang_code}")
-    
     try:
         async for chunk_data in tts_service.generate_audio_stream(
             text=request.input,
             voice=voice_name,
             speed=request.speed,
             output_format=request.response_format,
-            lang_code=lang_code,
+            lang_code=request.lang_code,
             normalization_options=request.normalization_options,
             return_timestamps=unique_properties["return_timestamps"],
         ):
@@ -215,6 +203,17 @@ async def create_speech(
             "pcm": "audio/pcm",
         }.get(request.response_format, f"audio/{request.response_format}")
 
+        # Determine language code with proper fallback
+        if not request.lang_code:
+            # Use default_voice_code from settings if available
+            request.lang_code = settings.default_voice_code
+            # Otherwise, use first letter of voice name
+            if not request.lang_code and voice_name:
+                request.lang_code = voice_name[0].lower()
+
+        # Log the language code being used
+        logger.info(f"Starting audio generation with lang_code: {request.lang_code}")
+
         # Check if streaming is requested (default for OpenAI client)
         if request.stream:
             # Create generator but don't start it yet
@@ -304,25 +303,14 @@ async def create_speech(
             )
         else:
             # Generate complete audio using public interface
-            
-            # Determine language code with proper fallback
-            lang_code = request.lang_code
-            if not lang_code:
-                # Use default_voice_code from settings if available
-                lang_code = settings.default_voice_code
-                # Otherwise, use first letter of voice name
-                if not lang_code and voice_name:
-                    lang_code = voice_name[0].lower()
-            
-            # Log the language code being used
-            logger.info(f"Starting audio generation with lang_code: {lang_code}")
+
             
             audio_data = await tts_service.generate_audio(
                 text=request.input,
                 voice=voice_name,
                 speed=request.speed,
                 normalization_options=request.normalization_options,
-                lang_code=lang_code,
+                lang_code=request.lang_code,
             )
 
             audio_data = await AudioService.convert_audio(