Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Better OpenAI invoke error handling #2244

Merged
merged 3 commits into from
Feb 27, 2025
Merged

Better OpenAI invoke error handling #2244

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4b3e111
UPdate
dirkbrnd Feb 27, 2025
eb39dbc
Merge branch 'main' into openai-error-handling
dirkbrnd Feb 27, 2025
c29c94a
update
dirkbrnd Feb 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 56 additions & 8 deletions libs/agno/agno/models/openai/chat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,8 +320,14 @@ def invoke(self, messages: List[Message]) -> Union[ChatCompletion, ParsedChatCom
)
except RateLimitError as e:
logger.error(f"Rate limit error from OpenAI API: {e}")
error_message = e.response.json().get("error", {})
error_message = (
error_message.get("message", "Unknown model error")
if isinstance(error_message, dict)
else error_message
)
raise ModelProviderError(
message=e.response.json().get("error", {}).get("message", "Unknown model error"),
message=error_message,
status_code=e.response.status_code,
model_name=self.name,
model_id=self.id,
Expand All @@ -331,8 +337,14 @@ def invoke(self, messages: List[Message]) -> Union[ChatCompletion, ParsedChatCom
raise ModelProviderError(message=str(e), model_name=self.name, model_id=self.id) from e
except APIStatusError as e:
logger.error(f"API status error from OpenAI API: {e}")
error_message = e.response.json().get("error", {})
error_message = (
error_message.get("message", "Unknown model error")
if isinstance(error_message, dict)
else error_message
)
raise ModelProviderError(
message=e.response.json().get("error", {}).get("message", "Unknown model error"),
message=error_message,
status_code=e.response.status_code,
model_name=self.name,
model_id=self.id,
Expand Down Expand Up @@ -368,8 +380,14 @@ async def ainvoke(self, messages: List[Message]) -> Union[ChatCompletion, Parsed
)
except RateLimitError as e:
logger.error(f"Rate limit error from OpenAI API: {e}")
error_message = e.response.json().get("error", {})
error_message = (
error_message.get("message", "Unknown model error")
if isinstance(error_message, dict)
else error_message
)
raise ModelProviderError(
message=e.response.json().get("error", {}).get("message", "Unknown model error"),
message=error_message,
status_code=e.response.status_code,
model_name=self.name,
model_id=self.id,
Expand All @@ -379,8 +397,14 @@ async def ainvoke(self, messages: List[Message]) -> Union[ChatCompletion, Parsed
raise ModelProviderError(message=str(e), model_name=self.name, model_id=self.id) from e
except APIStatusError as e:
logger.error(f"API status error from OpenAI API: {e}")
error_message = e.response.json().get("error", {})
error_message = (
error_message.get("message", "Unknown model error")
if isinstance(error_message, dict)
else error_message
)
raise ModelProviderError(
message=e.response.json().get("error", {}).get("message", "Unknown model error"),
message=error_message,
status_code=e.response.status_code,
model_name=self.name,
model_id=self.id,
Expand Down Expand Up @@ -409,8 +433,14 @@ def invoke_stream(self, messages: List[Message]) -> Iterator[ChatCompletionChunk
) # type: ignore
except RateLimitError as e:
logger.error(f"Rate limit error from OpenAI API: {e}")
error_message = e.response.json().get("error", {})
error_message = (
error_message.get("message", "Unknown model error")
if isinstance(error_message, dict)
else error_message
)
raise ModelProviderError(
message=e.response.json().get("error", {}).get("message", "Unknown model error"),
message=error_message,
status_code=e.response.status_code,
model_name=self.name,
model_id=self.id,
Expand All @@ -420,8 +450,14 @@ def invoke_stream(self, messages: List[Message]) -> Iterator[ChatCompletionChunk
raise ModelProviderError(message=str(e), model_name=self.name, model_id=self.id) from e
except APIStatusError as e:
logger.error(f"API status error from OpenAI API: {e}")
error_message = e.response.json().get("error", {})
error_message = (
error_message.get("message", "Unknown model error")
if isinstance(error_message, dict)
else error_message
)
raise ModelProviderError(
message=e.response.json().get("error", {}).get("message", "Unknown model error"),
message=error_message,
status_code=e.response.status_code,
model_name=self.name,
model_id=self.id,
Expand Down Expand Up @@ -452,8 +488,14 @@ async def ainvoke_stream(self, messages: List[Message]) -> AsyncIterator[ChatCom
yield chunk
except RateLimitError as e:
logger.error(f"Rate limit error from OpenAI API: {e}")
error_message = e.response.json().get("error", {})
error_message = (
error_message.get("message", "Unknown model error")
if isinstance(error_message, dict)
else error_message
)
raise ModelProviderError(
message=e.response.json().get("error", {}).get("message", "Unknown model error"),
message=error_message,
status_code=e.response.status_code,
model_name=self.name,
model_id=self.id,
Expand All @@ -463,8 +505,14 @@ async def ainvoke_stream(self, messages: List[Message]) -> AsyncIterator[ChatCom
raise ModelProviderError(message=str(e), model_name=self.name, model_id=self.id) from e
except APIStatusError as e:
logger.error(f"API status error from OpenAI API: {e}")
error_message = e.response.json().get("error", {})
error_message = (
error_message.get("message", "Unknown model error")
if isinstance(error_message, dict)
else error_message
)
raise ModelProviderError(
message=e.response.json().get("error", {}).get("message", "Unknown model error"),
message=error_message,
status_code=e.response.status_code,
model_name=self.name,
model_id=self.id,
Expand Down