fix:exception handling order error

This commit is contained in:
EightyOliveira 2025-11-25 16:36:41 +08:00
parent 2539b4e2c8
commit 8994c70f2f

View file

@ -309,6 +309,10 @@ async def openai_complete_if_cache(
response = await openai_async_client.chat.completions.create( response = await openai_async_client.chat.completions.create(
model=api_model, messages=messages, **kwargs model=api_model, messages=messages, **kwargs
) )
except APITimeoutError as e:
logger.error(f"OpenAI API Timeout Error: {e}")
await openai_async_client.close() # Ensure client is closed
raise
except APIConnectionError as e: except APIConnectionError as e:
logger.error(f"OpenAI API Connection Error: {e}") logger.error(f"OpenAI API Connection Error: {e}")
await openai_async_client.close() # Ensure client is closed await openai_async_client.close() # Ensure client is closed
@ -317,10 +321,6 @@ async def openai_complete_if_cache(
logger.error(f"OpenAI API Rate Limit Error: {e}") logger.error(f"OpenAI API Rate Limit Error: {e}")
await openai_async_client.close() # Ensure client is closed await openai_async_client.close() # Ensure client is closed
raise raise
except APITimeoutError as e:
logger.error(f"OpenAI API Timeout Error: {e}")
await openai_async_client.close() # Ensure client is closed
raise
except Exception as e: except Exception as e:
logger.error( logger.error(
f"OpenAI API Call Failed,\nModel: {model},\nParams: {kwargs}, Got: {e}" f"OpenAI API Call Failed,\nModel: {model},\nParams: {kwargs}, Got: {e}"