Skip to content

Improve null handling for Gemini #608

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

Merged
merged 1 commit into from
Jan 6, 2025
Merged

Improve null handling for Gemini #608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions pydantic_ai_slim/pydantic_ai/models/gemini.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -693,7 +693,7 @@ def simplify(self) -> dict[str, Any]:

def _simplify(self, schema: dict[str, Any], refs_stack: tuple[str, ...]) -> None:
schema.pop('title', None)
default = schema.pop('default', _utils.UNSET)
schema.pop('default', None)
Copy link
Contributor Author

@dmontagu dmontagu Jan 3, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

I'm not sure why we are currently requiring the default to be None in order to remove the the {'type': 'null'} from the schema, that condition doesn't seem to me to be necessary, so I removed it here. (And we don't use the value of the default at all, so I removed the variable that was holding its value, and changed the .pop call to fall back to None to be consistent with the previous line which is also unused.)

if ref := schema.pop('$ref', None):
# noinspection PyTypeChecker
key = re.sub(r'^#/\$defs/', '', ref)
Expand All @@ -708,11 +708,12 @@ def _simplify(self, schema: dict[str, Any], refs_stack: tuple[str, ...]) -> None
if any_of := schema.get('anyOf'):
for item_schema in any_of:
self._simplify(item_schema, refs_stack)
if len(any_of) == 2 and {'type': 'null'} in any_of and default is None:
if len(any_of) == 2 and {'type': 'null'} in any_of:
for item_schema in any_of:
if item_schema != {'type': 'null'}:
schema.clear()
schema.update(item_schema)
schema['nullable'] = True
return

type_ = schema.get('type')
Expand Down
1 change: 1 addition & 0 deletions tests/models/test_gemini.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,7 @@ class Locations(BaseModel):
'lng': {'type': 'number'},
},
'required': ['lat', 'lng'],
'nullable': True,
'type': 'object',
}
},
Expand Down
Loading