Merge pull request #2421 from EightyOliveira/fix_catch_order

fix:exception handling order error
This commit is contained in:
Daniel.y 2025-11-25 17:52:56 +08:00 committed by GitHub
commit d2cd1c0722
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -309,6 +309,10 @@ async def openai_complete_if_cache(
response = await openai_async_client.chat.completions.create(
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:
logger.error(f"OpenAI API Connection Error: {e}")
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}")
await openai_async_client.close() # Ensure client is closed
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:
logger.error(
f"OpenAI API Call Failed,\nModel: {model},\nParams: {kwargs}, Got: {e}"