Skip to content

Add genai.errors handling in GoogleModel #3139

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

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Add genai.errors handling in GoogleModel #3139

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ae45a9b
Add genai.errors handling in GoogleModel
timothy-jeong Oct 11, 2025
eecaa4a
Refactor: simplify `ModelHTTPError` handling
timothy-jeong Oct 17, 2025
b584e8c
Merge branch 'main' into add-googlemodel-google-specific-error-handling
Kludex Oct 17, 2025
6f6f917
Merge branch 'pydantic:main' into add-googlemodel-google-specific-err…
timothy-jeong Oct 25, 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
11 changes: 8 additions & 3 deletions pydantic_ai_slim/pydantic_ai/models/google.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from .._output import OutputObjectDefinition
from .._run_context import RunContext
from ..builtin_tools import CodeExecutionTool, ImageGenerationTool, UrlContextTool, WebSearchTool
from ..exceptions import UserError
from ..exceptions import ModelHTTPError, UserError
from ..messages import (
BinaryContent,
BuiltinToolCallPart,
Expand Down Expand Up @@ -50,7 +50,7 @@
)

try:
from google.genai import Client
from google.genai import Client, errors
from google.genai.types import (
BlobDict,
CodeExecutionResult,
Expand Down Expand Up @@ -385,7 +385,12 @@ async def _generate_content(
) -> GenerateContentResponse | Awaitable[AsyncIterator[GenerateContentResponse]]:
contents, config = await self._build_content_and_config(messages, model_settings, model_request_parameters)
func = self.client.aio.models.generate_content_stream if stream else self.client.aio.models.generate_content
return await func(model=self._model_name, contents=contents, config=config) # type: ignore
try:
return await func(model=self._model_name, contents=contents, config=config) # type: ignore
except errors.APIError as e:
if (status_code := e.code) >= 400:
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bug: Unhandled Exception in Error Handling

The try...except block can raise a TypeError if e.code is None for an APIError. The comparison (status_code := e.code) >= 400 attempts to compare None with an integer, causing an unhandled exception when an APIError lacks a status code.

Fix in Cursor Fix in Web

raise ModelHTTPError(status_code=status_code, model_name=self._model_name, body=e.details) from e
raise # pragma: lax no cover

async def _build_content_and_config(
self,
Expand Down
Loading