Skip to content

fix: reject unsupported response schemas on Vertex AI #2896

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

Draft
medisean wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix: reject unsupported response schemas on Vertex AI #2896

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
14 changes: 6 additions & 8 deletions google/genai/_transformers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,15 +643,13 @@ def _raise_for_unsupported_schema_type(origin: Any) -> None:
def _raise_for_unsupported_mldev_properties(
schema: Any, client: Optional[_api_client.BaseApiClient]
) -> None:
if (
client
and not client.vertexai
and (
schema.get('additionalProperties')
or schema.get('additional_properties')
)
if client and (
schema.get('additionalProperties') or schema.get('additional_properties')
):
raise ValueError('additionalProperties is only supported in Gemini Enterprise Agent Platform mode, , not in Gemini Developer API mode.')
raise ValueError(
'additionalProperties is only supported in Gemini Enterprise Agent '
'Platform mode, not in Gemini Developer API or Vertex AI mode.'
)


def process_schema(
Expand Down
27 changes: 2 additions & 25 deletions google/genai/tests/transformers/test_schema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,34 +532,11 @@ def test_process_schema_order_properties_propagates_into_additional_properties(
},
},
}
schema_without_property_ordering = copy.deepcopy(schema)
schema_with_property_ordering = {
'type': 'OBJECT',
'additionalProperties': {
'type': 'OBJECT',
'properties': {
'foo': {'type': 'STRING'},
'bar': {'type': 'STRING'},
},
'property_ordering': ['foo', 'bar'],
},
}

if client.vertexai:
with pytest.raises(ValueError) as e:
_transformers.process_schema(
schema, client, order_properties=order_properties
)

if order_properties:
assert schema == schema_with_property_ordering
else:
assert schema == schema_without_property_ordering
else:
with pytest.raises(ValueError) as e:
_transformers.process_schema(
schema, client, order_properties=order_properties
)
assert 'additionalProperties is only supported in Gemini Enterprise Agent Platform mode' in str(e)
assert 'additionalProperties is only supported in Gemini Enterprise Agent Platform mode' in str(e.value)


@pytest.mark.parametrize(
Expand Down