google-genai 1.56.0__py3-none-any.whl → 1.58.0__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- google/genai/_api_client.py +49 -26
- google/genai/_interactions/__init__.py +3 -0
- google/genai/_interactions/_base_client.py +1 -1
- google/genai/_interactions/_client.py +57 -3
- google/genai/_interactions/_client_adapter.py +48 -0
- google/genai/_interactions/types/__init__.py +6 -0
- google/genai/_interactions/types/audio_content.py +2 -0
- google/genai/_interactions/types/audio_content_param.py +2 -0
- google/genai/_interactions/types/content.py +65 -0
- google/genai/_interactions/types/content_delta.py +10 -2
- google/genai/_interactions/types/content_param.py +63 -0
- google/genai/_interactions/types/content_start.py +5 -46
- google/genai/_interactions/types/content_stop.py +1 -2
- google/genai/_interactions/types/document_content.py +2 -0
- google/genai/_interactions/types/document_content_param.py +2 -0
- google/genai/_interactions/types/error_event.py +1 -2
- google/genai/_interactions/types/file_search_call_content.py +32 -0
- google/genai/_interactions/types/file_search_call_content_param.py +31 -0
- google/genai/_interactions/types/generation_config.py +4 -0
- google/genai/_interactions/types/generation_config_param.py +4 -0
- google/genai/_interactions/types/image_config.py +31 -0
- google/genai/_interactions/types/image_config_param.py +30 -0
- google/genai/_interactions/types/image_content.py +2 -0
- google/genai/_interactions/types/image_content_param.py +2 -0
- google/genai/_interactions/types/interaction.py +6 -52
- google/genai/_interactions/types/interaction_create_params.py +4 -22
- google/genai/_interactions/types/interaction_event.py +1 -2
- google/genai/_interactions/types/interaction_sse_event.py +5 -3
- google/genai/_interactions/types/interaction_status_update.py +1 -2
- google/genai/_interactions/types/model.py +1 -0
- google/genai/_interactions/types/model_param.py +1 -0
- google/genai/_interactions/types/turn.py +3 -44
- google/genai/_interactions/types/turn_param.py +4 -40
- google/genai/_interactions/types/usage.py +1 -1
- google/genai/_interactions/types/usage_param.py +1 -1
- google/genai/_interactions/types/video_content.py +2 -0
- google/genai/_interactions/types/video_content_param.py +2 -0
- google/genai/_live_converters.py +118 -34
- google/genai/_local_tokenizer_loader.py +1 -0
- google/genai/_tokens_converters.py +14 -14
- google/genai/_transformers.py +15 -21
- google/genai/batches.py +27 -22
- google/genai/caches.py +42 -42
- google/genai/chats.py +0 -2
- google/genai/client.py +61 -55
- google/genai/files.py +224 -0
- google/genai/live.py +1 -1
- google/genai/models.py +56 -44
- google/genai/tests/__init__.py +21 -0
- google/genai/tests/afc/__init__.py +21 -0
- google/genai/tests/afc/test_convert_if_exist_pydantic_model.py +309 -0
- google/genai/tests/afc/test_convert_number_values_for_function_call_args.py +63 -0
- google/genai/tests/afc/test_find_afc_incompatible_tool_indexes.py +240 -0
- google/genai/tests/afc/test_generate_content_stream_afc.py +530 -0
- google/genai/tests/afc/test_generate_content_stream_afc_thoughts.py +77 -0
- google/genai/tests/afc/test_get_function_map.py +176 -0
- google/genai/tests/afc/test_get_function_response_parts.py +277 -0
- google/genai/tests/afc/test_get_max_remote_calls_for_afc.py +130 -0
- google/genai/tests/afc/test_invoke_function_from_dict_args.py +241 -0
- google/genai/tests/afc/test_raise_error_for_afc_incompatible_config.py +159 -0
- google/genai/tests/afc/test_should_append_afc_history.py +53 -0
- google/genai/tests/afc/test_should_disable_afc.py +214 -0
- google/genai/tests/batches/__init__.py +17 -0
- google/genai/tests/batches/test_cancel.py +77 -0
- google/genai/tests/batches/test_create.py +78 -0
- google/genai/tests/batches/test_create_with_bigquery.py +113 -0
- google/genai/tests/batches/test_create_with_file.py +82 -0
- google/genai/tests/batches/test_create_with_gcs.py +125 -0
- google/genai/tests/batches/test_create_with_inlined_requests.py +255 -0
- google/genai/tests/batches/test_delete.py +86 -0
- google/genai/tests/batches/test_embedding.py +157 -0
- google/genai/tests/batches/test_get.py +78 -0
- google/genai/tests/batches/test_list.py +79 -0
- google/genai/tests/caches/__init__.py +17 -0
- google/genai/tests/caches/constants.py +29 -0
- google/genai/tests/caches/test_create.py +210 -0
- google/genai/tests/caches/test_create_custom_url.py +105 -0
- google/genai/tests/caches/test_delete.py +54 -0
- google/genai/tests/caches/test_delete_custom_url.py +52 -0
- google/genai/tests/caches/test_get.py +94 -0
- google/genai/tests/caches/test_get_custom_url.py +52 -0
- google/genai/tests/caches/test_list.py +68 -0
- google/genai/tests/caches/test_update.py +70 -0
- google/genai/tests/caches/test_update_custom_url.py +58 -0
- google/genai/tests/chats/__init__.py +1 -0
- google/genai/tests/chats/test_get_history.py +598 -0
- google/genai/tests/chats/test_send_message.py +844 -0
- google/genai/tests/chats/test_validate_response.py +90 -0
- google/genai/tests/client/__init__.py +17 -0
- google/genai/tests/client/test_async_stream.py +427 -0
- google/genai/tests/client/test_client_close.py +197 -0
- google/genai/tests/client/test_client_initialization.py +1687 -0
- google/genai/tests/client/test_client_requests.py +221 -0
- google/genai/tests/client/test_custom_client.py +104 -0
- google/genai/tests/client/test_http_options.py +178 -0
- google/genai/tests/client/test_replay_client_equality.py +168 -0
- google/genai/tests/client/test_retries.py +846 -0
- google/genai/tests/client/test_upload_errors.py +136 -0
- google/genai/tests/common/__init__.py +17 -0
- google/genai/tests/common/test_common.py +954 -0
- google/genai/tests/conftest.py +162 -0
- google/genai/tests/documents/__init__.py +17 -0
- google/genai/tests/documents/test_delete.py +51 -0
- google/genai/tests/documents/test_get.py +85 -0
- google/genai/tests/documents/test_list.py +72 -0
- google/genai/tests/errors/__init__.py +1 -0
- google/genai/tests/errors/test_api_error.py +417 -0
- google/genai/tests/file_search_stores/__init__.py +17 -0
- google/genai/tests/file_search_stores/test_create.py +66 -0
- google/genai/tests/file_search_stores/test_delete.py +64 -0
- google/genai/tests/file_search_stores/test_get.py +94 -0
- google/genai/tests/file_search_stores/test_import_file.py +112 -0
- google/genai/tests/file_search_stores/test_list.py +57 -0
- google/genai/tests/file_search_stores/test_upload_to_file_search_store.py +141 -0
- google/genai/tests/files/__init__.py +17 -0
- google/genai/tests/files/test_delete.py +46 -0
- google/genai/tests/files/test_download.py +85 -0
- google/genai/tests/files/test_get.py +46 -0
- google/genai/tests/files/test_list.py +72 -0
- google/genai/tests/files/test_register.py +272 -0
- google/genai/tests/files/test_register_table.py +70 -0
- google/genai/tests/files/test_upload.py +255 -0
- google/genai/tests/imports/test_no_optional_imports.py +28 -0
- google/genai/tests/interactions/test_auth.py +476 -0
- google/genai/tests/interactions/test_integration.py +84 -0
- google/genai/tests/interactions/test_paths.py +105 -0
- google/genai/tests/live/__init__.py +16 -0
- google/genai/tests/live/test_live.py +2143 -0
- google/genai/tests/live/test_live_music.py +362 -0
- google/genai/tests/live/test_live_response.py +163 -0
- google/genai/tests/live/test_send_client_content.py +147 -0
- google/genai/tests/live/test_send_realtime_input.py +268 -0
- google/genai/tests/live/test_send_tool_response.py +222 -0
- google/genai/tests/local_tokenizer/__init__.py +17 -0
- google/genai/tests/local_tokenizer/test_local_tokenizer.py +343 -0
- google/genai/tests/local_tokenizer/test_local_tokenizer_loader.py +235 -0
- google/genai/tests/mcp/__init__.py +17 -0
- google/genai/tests/mcp/test_has_mcp_tool_usage.py +89 -0
- google/genai/tests/mcp/test_mcp_to_gemini_tools.py +191 -0
- google/genai/tests/mcp/test_parse_config_for_mcp_sessions.py +201 -0
- google/genai/tests/mcp/test_parse_config_for_mcp_usage.py +130 -0
- google/genai/tests/mcp/test_set_mcp_usage_header.py +72 -0
- google/genai/tests/models/__init__.py +17 -0
- google/genai/tests/models/constants.py +8 -0
- google/genai/tests/models/test_compute_tokens.py +120 -0
- google/genai/tests/models/test_count_tokens.py +159 -0
- google/genai/tests/models/test_delete.py +107 -0
- google/genai/tests/models/test_edit_image.py +264 -0
- google/genai/tests/models/test_embed_content.py +94 -0
- google/genai/tests/models/test_function_call_streaming.py +442 -0
- google/genai/tests/models/test_generate_content.py +2501 -0
- google/genai/tests/models/test_generate_content_cached_content.py +132 -0
- google/genai/tests/models/test_generate_content_config_zero_value.py +103 -0
- google/genai/tests/models/test_generate_content_from_apikey.py +44 -0
- google/genai/tests/models/test_generate_content_http_options.py +40 -0
- google/genai/tests/models/test_generate_content_image_generation.py +143 -0
- google/genai/tests/models/test_generate_content_mcp.py +343 -0
- google/genai/tests/models/test_generate_content_media_resolution.py +97 -0
- google/genai/tests/models/test_generate_content_model.py +139 -0
- google/genai/tests/models/test_generate_content_part.py +821 -0
- google/genai/tests/models/test_generate_content_thought.py +76 -0
- google/genai/tests/models/test_generate_content_tools.py +1761 -0
- google/genai/tests/models/test_generate_images.py +191 -0
- google/genai/tests/models/test_generate_videos.py +759 -0
- google/genai/tests/models/test_get.py +104 -0
- google/genai/tests/models/test_list.py +233 -0
- google/genai/tests/models/test_recontext_image.py +189 -0
- google/genai/tests/models/test_segment_image.py +148 -0
- google/genai/tests/models/test_update.py +95 -0
- google/genai/tests/models/test_upscale_image.py +157 -0
- google/genai/tests/operations/__init__.py +17 -0
- google/genai/tests/operations/test_get.py +38 -0
- google/genai/tests/public_samples/__init__.py +17 -0
- google/genai/tests/public_samples/test_gemini_text_only.py +34 -0
- google/genai/tests/pytest_helper.py +246 -0
- google/genai/tests/shared/__init__.py +16 -0
- google/genai/tests/shared/batches/__init__.py +14 -0
- google/genai/tests/shared/batches/test_create_delete.py +57 -0
- google/genai/tests/shared/batches/test_create_get_cancel.py +56 -0
- google/genai/tests/shared/batches/test_list.py +40 -0
- google/genai/tests/shared/caches/__init__.py +14 -0
- google/genai/tests/shared/caches/test_create_get_delete.py +67 -0
- google/genai/tests/shared/caches/test_create_update_get.py +71 -0
- google/genai/tests/shared/caches/test_list.py +40 -0
- google/genai/tests/shared/chats/__init__.py +14 -0
- google/genai/tests/shared/chats/test_send_message.py +48 -0
- google/genai/tests/shared/chats/test_send_message_stream.py +50 -0
- google/genai/tests/shared/files/__init__.py +14 -0
- google/genai/tests/shared/files/test_list.py +41 -0
- google/genai/tests/shared/files/test_upload_get_delete.py +54 -0
- google/genai/tests/shared/models/__init__.py +14 -0
- google/genai/tests/shared/models/test_compute_tokens.py +41 -0
- google/genai/tests/shared/models/test_count_tokens.py +40 -0
- google/genai/tests/shared/models/test_edit_image.py +67 -0
- google/genai/tests/shared/models/test_embed.py +40 -0
- google/genai/tests/shared/models/test_generate_content.py +39 -0
- google/genai/tests/shared/models/test_generate_content_stream.py +54 -0
- google/genai/tests/shared/models/test_generate_images.py +40 -0
- google/genai/tests/shared/models/test_generate_videos.py +38 -0
- google/genai/tests/shared/models/test_list.py +37 -0
- google/genai/tests/shared/models/test_recontext_image.py +55 -0
- google/genai/tests/shared/models/test_segment_image.py +52 -0
- google/genai/tests/shared/models/test_upscale_image.py +52 -0
- google/genai/tests/shared/tunings/__init__.py +16 -0
- google/genai/tests/shared/tunings/test_create.py +46 -0
- google/genai/tests/shared/tunings/test_create_get_cancel.py +56 -0
- google/genai/tests/shared/tunings/test_list.py +39 -0
- google/genai/tests/tokens/__init__.py +16 -0
- google/genai/tests/tokens/test_create.py +154 -0
- google/genai/tests/transformers/__init__.py +17 -0
- google/genai/tests/transformers/test_blobs.py +84 -0
- google/genai/tests/transformers/test_bytes.py +15 -0
- google/genai/tests/transformers/test_duck_type.py +96 -0
- google/genai/tests/transformers/test_function_responses.py +72 -0
- google/genai/tests/transformers/test_schema.py +653 -0
- google/genai/tests/transformers/test_t_batch.py +286 -0
- google/genai/tests/transformers/test_t_content.py +160 -0
- google/genai/tests/transformers/test_t_contents.py +398 -0
- google/genai/tests/transformers/test_t_part.py +85 -0
- google/genai/tests/transformers/test_t_parts.py +87 -0
- google/genai/tests/transformers/test_t_tool.py +157 -0
- google/genai/tests/transformers/test_t_tools.py +195 -0
- google/genai/tests/tunings/__init__.py +16 -0
- google/genai/tests/tunings/test_cancel.py +39 -0
- google/genai/tests/tunings/test_end_to_end.py +106 -0
- google/genai/tests/tunings/test_get.py +67 -0
- google/genai/tests/tunings/test_list.py +75 -0
- google/genai/tests/tunings/test_tune.py +268 -0
- google/genai/tests/types/__init__.py +16 -0
- google/genai/tests/types/test_bytes_internal.py +271 -0
- google/genai/tests/types/test_bytes_type.py +152 -0
- google/genai/tests/types/test_future.py +101 -0
- google/genai/tests/types/test_optional_types.py +36 -0
- google/genai/tests/types/test_part_type.py +616 -0
- google/genai/tests/types/test_schema_from_json_schema.py +417 -0
- google/genai/tests/types/test_schema_json_schema.py +468 -0
- google/genai/tests/types/test_types.py +2903 -0
- google/genai/types.py +631 -488
- google/genai/version.py +1 -1
- {google_genai-1.56.0.dist-info → google_genai-1.58.0.dist-info}/METADATA +6 -11
- google_genai-1.58.0.dist-info/RECORD +358 -0
- google_genai-1.56.0.dist-info/RECORD +0 -162
- /google/genai/{_interactions/py.typed → tests/interactions/__init__.py} +0 -0
- {google_genai-1.56.0.dist-info → google_genai-1.58.0.dist-info}/WHEEL +0 -0
- {google_genai-1.56.0.dist-info → google_genai-1.58.0.dist-info}/licenses/LICENSE +0 -0
- {google_genai-1.56.0.dist-info → google_genai-1.58.0.dist-info}/top_level.txt +0 -0
|
@@ -0,0 +1,309 @@
|
|
|
1
|
+
# Copyright 2025 Google LLC
|
|
2
|
+
#
|
|
3
|
+
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
4
|
+
# you may not use this file except in compliance with the License.
|
|
5
|
+
# You may obtain a copy of the License at
|
|
6
|
+
#
|
|
7
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
|
8
|
+
#
|
|
9
|
+
# Unless required by applicable law or agreed to in writing, software
|
|
10
|
+
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
11
|
+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
12
|
+
# See the License for the specific language governing permissions and
|
|
13
|
+
# limitations under the License.
|
|
14
|
+
#
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
"""Test convert_if_exist_pydantic_model."""
|
|
18
|
+
|
|
19
|
+
import inspect
|
|
20
|
+
from typing import Optional, Union
|
|
21
|
+
import pydantic
|
|
22
|
+
import pytest
|
|
23
|
+
import sys
|
|
24
|
+
from ... import errors
|
|
25
|
+
from ..._extra_utils import convert_if_exist_pydantic_model
|
|
26
|
+
|
|
27
|
+
|
|
28
|
+
def test_builtin_types():
|
|
29
|
+
assert convert_if_exist_pydantic_model(1, int, 'param_name', 'func_name') == 1
|
|
30
|
+
assert (
|
|
31
|
+
convert_if_exist_pydantic_model(1.0, float, 'param_name', 'func_name')
|
|
32
|
+
== 1.0
|
|
33
|
+
)
|
|
34
|
+
assert (
|
|
35
|
+
convert_if_exist_pydantic_model('1.0', str, 'param_name', 'func_name')
|
|
36
|
+
== '1.0'
|
|
37
|
+
)
|
|
38
|
+
assert (
|
|
39
|
+
convert_if_exist_pydantic_model(True, bool, 'param_name', 'func_name')
|
|
40
|
+
is True
|
|
41
|
+
)
|
|
42
|
+
assert convert_if_exist_pydantic_model(
|
|
43
|
+
[1], list, 'param_name', 'func_name'
|
|
44
|
+
) == [1]
|
|
45
|
+
assert convert_if_exist_pydantic_model(
|
|
46
|
+
{'key1': 1}, dict, 'param_name', 'func_name'
|
|
47
|
+
) == {'key1': 1}
|
|
48
|
+
assert convert_if_exist_pydantic_model(
|
|
49
|
+
{'key1': 1, 'key2': 2}, dict[str, int], 'param_name', 'func_name'
|
|
50
|
+
) == {'key1': 1, 'key2': 2}
|
|
51
|
+
|
|
52
|
+
|
|
53
|
+
def test_value_int_annotation_float():
|
|
54
|
+
assert (
|
|
55
|
+
convert_if_exist_pydantic_model(1, float, 'param_name', 'func_name')
|
|
56
|
+
== 1.0
|
|
57
|
+
)
|
|
58
|
+
|
|
59
|
+
|
|
60
|
+
def test_union_types():
|
|
61
|
+
assert (
|
|
62
|
+
convert_if_exist_pydantic_model(
|
|
63
|
+
1, Union[int, float], 'param_name', 'func_name'
|
|
64
|
+
)
|
|
65
|
+
== 1
|
|
66
|
+
)
|
|
67
|
+
assert (
|
|
68
|
+
convert_if_exist_pydantic_model(
|
|
69
|
+
1.0, Union[int, float], 'param_name', 'func_name'
|
|
70
|
+
)
|
|
71
|
+
== 1.0
|
|
72
|
+
)
|
|
73
|
+
assert (
|
|
74
|
+
convert_if_exist_pydantic_model(
|
|
75
|
+
'1.0', Union[str, float], 'param_name', 'func_name'
|
|
76
|
+
)
|
|
77
|
+
== '1.0'
|
|
78
|
+
)
|
|
79
|
+
assert (
|
|
80
|
+
convert_if_exist_pydantic_model(
|
|
81
|
+
True, Union[bool, str], 'param_name', 'func_name'
|
|
82
|
+
)
|
|
83
|
+
is True
|
|
84
|
+
)
|
|
85
|
+
|
|
86
|
+
# | in 3.10+
|
|
87
|
+
if sys.version_info >= (3, 10):
|
|
88
|
+
assert (
|
|
89
|
+
convert_if_exist_pydantic_model(1, int | float, 'param_name', 'func_name')
|
|
90
|
+
== 1
|
|
91
|
+
)
|
|
92
|
+
|
|
93
|
+
|
|
94
|
+
def test_nested_pydantic_model():
|
|
95
|
+
class SimpleModel(pydantic.BaseModel):
|
|
96
|
+
key1_simple: int
|
|
97
|
+
key2_simple: float
|
|
98
|
+
|
|
99
|
+
class ComplexModel(pydantic.BaseModel):
|
|
100
|
+
key1_complex: SimpleModel
|
|
101
|
+
key2_complex: list[SimpleModel]
|
|
102
|
+
key3_complex: dict[str, SimpleModel]
|
|
103
|
+
|
|
104
|
+
def foo(_: ComplexModel):
|
|
105
|
+
pass
|
|
106
|
+
|
|
107
|
+
annotation = inspect.signature(foo).parameters['_'].annotation
|
|
108
|
+
original_args = {
|
|
109
|
+
'key1_complex': {'key1_simple': 1, 'key2_simple': 1.0},
|
|
110
|
+
'key2_complex': [
|
|
111
|
+
{'key1_simple': 2, 'key2_simple': 2.0},
|
|
112
|
+
{'key1_simple': 3, 'key2_simple': 3.0},
|
|
113
|
+
],
|
|
114
|
+
'key3_complex': {
|
|
115
|
+
'key1_simple': {'key1_simple': 4, 'key2_simple': 4.0},
|
|
116
|
+
'key2_simple': {'key1_simple': 5, 'key2_simple': 5.0},
|
|
117
|
+
},
|
|
118
|
+
}
|
|
119
|
+
|
|
120
|
+
converted_args = convert_if_exist_pydantic_model(
|
|
121
|
+
original_args, annotation, 'param_name', 'func_name'
|
|
122
|
+
)
|
|
123
|
+
assert isinstance(converted_args, ComplexModel)
|
|
124
|
+
assert isinstance(converted_args.key1_complex, SimpleModel)
|
|
125
|
+
assert isinstance(converted_args.key2_complex[0], SimpleModel)
|
|
126
|
+
assert isinstance(converted_args.key2_complex[1], SimpleModel)
|
|
127
|
+
assert isinstance(converted_args.key3_complex['key1_simple'], SimpleModel)
|
|
128
|
+
assert isinstance(converted_args.key3_complex['key2_simple'], SimpleModel)
|
|
129
|
+
assert converted_args.model_dump() == original_args
|
|
130
|
+
|
|
131
|
+
|
|
132
|
+
def test_pydantic_model_in_list_union_type():
|
|
133
|
+
class SimpleModel(pydantic.BaseModel):
|
|
134
|
+
key1_simple: int
|
|
135
|
+
key2_simple: float
|
|
136
|
+
|
|
137
|
+
def foo(_: list[Union[int, SimpleModel]]):
|
|
138
|
+
pass
|
|
139
|
+
|
|
140
|
+
annotation = inspect.signature(foo).parameters['_'].annotation
|
|
141
|
+
original_args = [1, {'key1_simple': 1, 'key2_simple': 1.0}]
|
|
142
|
+
|
|
143
|
+
converted_args = convert_if_exist_pydantic_model(
|
|
144
|
+
original_args, annotation, 'param_name', 'func_name'
|
|
145
|
+
)
|
|
146
|
+
|
|
147
|
+
assert isinstance(converted_args, list)
|
|
148
|
+
assert len(converted_args) == 2
|
|
149
|
+
assert isinstance(converted_args[0], int)
|
|
150
|
+
assert isinstance(converted_args[1], SimpleModel)
|
|
151
|
+
assert converted_args[0] == original_args[0]
|
|
152
|
+
assert converted_args[1].model_dump() == original_args[1]
|
|
153
|
+
|
|
154
|
+
|
|
155
|
+
def test_generic_list_type():
|
|
156
|
+
def foo(_: Optional[list[Union[int, float]]]):
|
|
157
|
+
pass
|
|
158
|
+
|
|
159
|
+
annotation = inspect.signature(foo).parameters['_'].annotation
|
|
160
|
+
original_args = [1, 1.5]
|
|
161
|
+
|
|
162
|
+
converted_args = convert_if_exist_pydantic_model(
|
|
163
|
+
original_args, annotation, 'param_name', 'func_name'
|
|
164
|
+
)
|
|
165
|
+
|
|
166
|
+
assert isinstance(converted_args, list)
|
|
167
|
+
assert len(converted_args) == 2
|
|
168
|
+
assert isinstance(converted_args[0], int)
|
|
169
|
+
assert isinstance(converted_args[1], float)
|
|
170
|
+
assert converted_args[0] == original_args[0]
|
|
171
|
+
|
|
172
|
+
|
|
173
|
+
@pytest.mark.skipif(sys.version_info < (3, 10), reason='need python 3.10+')
|
|
174
|
+
def test_pydantic_model_with_union_and_generic_type():
|
|
175
|
+
class Model1(pydantic.BaseModel):
|
|
176
|
+
arg1: Union[int, float]
|
|
177
|
+
arg2: list[str]
|
|
178
|
+
arg3: int | float # python 3.9+
|
|
179
|
+
arg4: Union[list[str], str]
|
|
180
|
+
|
|
181
|
+
def foo(_: Optional[list[Union[int, Model1]]]):
|
|
182
|
+
pass
|
|
183
|
+
|
|
184
|
+
annotation = inspect.signature(foo).parameters['_'].annotation
|
|
185
|
+
original_args = [1, {'arg1': 1, 'arg2': ['a'], 'arg3': 1.0, 'arg4': '1.0'}]
|
|
186
|
+
|
|
187
|
+
converted_args = convert_if_exist_pydantic_model(
|
|
188
|
+
original_args, annotation, 'param_name', 'func_name'
|
|
189
|
+
)
|
|
190
|
+
|
|
191
|
+
assert isinstance(converted_args, list)
|
|
192
|
+
assert len(converted_args) == 2
|
|
193
|
+
assert isinstance(converted_args[0], int)
|
|
194
|
+
assert isinstance(converted_args[1], Model1)
|
|
195
|
+
assert converted_args[0] == original_args[0]
|
|
196
|
+
|
|
197
|
+
|
|
198
|
+
def test_unknown_pydantic_model_argument_error():
|
|
199
|
+
class SimpleModel(pydantic.BaseModel):
|
|
200
|
+
key1_simple: int
|
|
201
|
+
key2_simple: float
|
|
202
|
+
|
|
203
|
+
def foo(_: SimpleModel):
|
|
204
|
+
pass
|
|
205
|
+
|
|
206
|
+
annotation = inspect.signature(foo).parameters['_'].annotation
|
|
207
|
+
original_args = {'key3_simple': 1, 'key2_simple': 1.0}
|
|
208
|
+
|
|
209
|
+
with pytest.raises(errors.UnknownFunctionCallArgumentError):
|
|
210
|
+
convert_if_exist_pydantic_model(
|
|
211
|
+
original_args, annotation, 'param_name', 'func_name'
|
|
212
|
+
)
|
|
213
|
+
|
|
214
|
+
|
|
215
|
+
def test_unknown_pydantic_model_argument_error_with_union_type():
|
|
216
|
+
class SimpleModel1(pydantic.BaseModel):
|
|
217
|
+
key1_simple: int
|
|
218
|
+
key2_simple: float
|
|
219
|
+
|
|
220
|
+
class SimpleModel2(pydantic.BaseModel):
|
|
221
|
+
key3_simple: str
|
|
222
|
+
key4_simple: float
|
|
223
|
+
|
|
224
|
+
def foo(_: Union[SimpleModel1, SimpleModel2]):
|
|
225
|
+
pass
|
|
226
|
+
|
|
227
|
+
annotation = inspect.signature(foo).parameters['_'].annotation
|
|
228
|
+
original_args = {'key5_simple': 1, 'key4_simple': 1.0}
|
|
229
|
+
|
|
230
|
+
with pytest.raises(errors.UnknownFunctionCallArgumentError):
|
|
231
|
+
convert_if_exist_pydantic_model(
|
|
232
|
+
original_args, annotation, 'param_name', 'func_name'
|
|
233
|
+
)
|
|
234
|
+
|
|
235
|
+
|
|
236
|
+
def test_unknown_pydantic_model_argument_error_with_union_type_and_builtin_type():
|
|
237
|
+
class SimpleModel1(pydantic.BaseModel):
|
|
238
|
+
key1_simple: int
|
|
239
|
+
key2_simple: float
|
|
240
|
+
|
|
241
|
+
def foo(_: Union[SimpleModel1, int]):
|
|
242
|
+
pass
|
|
243
|
+
|
|
244
|
+
annotation = inspect.signature(foo).parameters['_'].annotation
|
|
245
|
+
original_args = {'key5_simple': 1, 'key4_simple': 1.0}
|
|
246
|
+
|
|
247
|
+
with pytest.raises(errors.UnknownFunctionCallArgumentError):
|
|
248
|
+
convert_if_exist_pydantic_model(
|
|
249
|
+
original_args, annotation, 'param_name', 'func_name'
|
|
250
|
+
)
|
|
251
|
+
|
|
252
|
+
|
|
253
|
+
def test_incompatible_value_and_annotation():
|
|
254
|
+
with pytest.raises(errors.UnknownFunctionCallArgumentError):
|
|
255
|
+
convert_if_exist_pydantic_model(
|
|
256
|
+
{'key1_simple': 1, 'key2_simple': 1.0},
|
|
257
|
+
int,
|
|
258
|
+
'param_name',
|
|
259
|
+
'func_name',
|
|
260
|
+
)
|
|
261
|
+
with pytest.raises(errors.UnknownFunctionCallArgumentError):
|
|
262
|
+
convert_if_exist_pydantic_model(
|
|
263
|
+
{'key1_simple': 1, 'key2_simple': 1.0},
|
|
264
|
+
float,
|
|
265
|
+
'param_name',
|
|
266
|
+
'func_name',
|
|
267
|
+
)
|
|
268
|
+
with pytest.raises(errors.UnknownFunctionCallArgumentError):
|
|
269
|
+
convert_if_exist_pydantic_model(
|
|
270
|
+
1,
|
|
271
|
+
str,
|
|
272
|
+
'param_name',
|
|
273
|
+
'func_name',
|
|
274
|
+
)
|
|
275
|
+
with pytest.raises(errors.UnknownFunctionCallArgumentError):
|
|
276
|
+
convert_if_exist_pydantic_model(
|
|
277
|
+
1.0,
|
|
278
|
+
str,
|
|
279
|
+
'param_name',
|
|
280
|
+
'func_name',
|
|
281
|
+
)
|
|
282
|
+
with pytest.raises(errors.UnknownFunctionCallArgumentError):
|
|
283
|
+
convert_if_exist_pydantic_model(
|
|
284
|
+
True,
|
|
285
|
+
str,
|
|
286
|
+
'param_name',
|
|
287
|
+
'func_name',
|
|
288
|
+
)
|
|
289
|
+
with pytest.raises(errors.UnknownFunctionCallArgumentError):
|
|
290
|
+
convert_if_exist_pydantic_model(
|
|
291
|
+
[1],
|
|
292
|
+
str,
|
|
293
|
+
'param_name',
|
|
294
|
+
'func_name',
|
|
295
|
+
)
|
|
296
|
+
with pytest.raises(errors.UnknownFunctionCallArgumentError):
|
|
297
|
+
convert_if_exist_pydantic_model(
|
|
298
|
+
{'key1': 1},
|
|
299
|
+
str,
|
|
300
|
+
'param_name',
|
|
301
|
+
'func_name',
|
|
302
|
+
)
|
|
303
|
+
with pytest.raises(errors.UnknownFunctionCallArgumentError):
|
|
304
|
+
convert_if_exist_pydantic_model(
|
|
305
|
+
{'key1': 1, 'key2': 2},
|
|
306
|
+
str,
|
|
307
|
+
'param_name',
|
|
308
|
+
'func_name',
|
|
309
|
+
)
|
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
# Copyright 2025 Google LLC
|
|
2
|
+
#
|
|
3
|
+
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
4
|
+
# you may not use this file except in compliance with the License.
|
|
5
|
+
# You may obtain a copy of the License at
|
|
6
|
+
#
|
|
7
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
|
8
|
+
#
|
|
9
|
+
# Unless required by applicable law or agreed to in writing, software
|
|
10
|
+
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
11
|
+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
12
|
+
# See the License for the specific language governing permissions and
|
|
13
|
+
# limitations under the License.
|
|
14
|
+
#
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
"""Tests for convert_number_values_for_function_call_args."""
|
|
18
|
+
|
|
19
|
+
from ..._extra_utils import convert_number_values_for_function_call_args
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
def test_integer_value():
|
|
23
|
+
assert convert_number_values_for_function_call_args(1) == 1
|
|
24
|
+
|
|
25
|
+
|
|
26
|
+
def test_float_value():
|
|
27
|
+
assert convert_number_values_for_function_call_args(1.0) == 1
|
|
28
|
+
|
|
29
|
+
|
|
30
|
+
def test_string_value():
|
|
31
|
+
assert convert_number_values_for_function_call_args('1.0') == '1.0'
|
|
32
|
+
|
|
33
|
+
|
|
34
|
+
def test_boolean_value():
|
|
35
|
+
assert convert_number_values_for_function_call_args(True) is True
|
|
36
|
+
|
|
37
|
+
|
|
38
|
+
def test_none_value():
|
|
39
|
+
assert convert_number_values_for_function_call_args(None) is None
|
|
40
|
+
|
|
41
|
+
|
|
42
|
+
def test_float_value_with_decimal():
|
|
43
|
+
assert convert_number_values_for_function_call_args(1.1) == 1.1
|
|
44
|
+
|
|
45
|
+
|
|
46
|
+
def test_dict_value():
|
|
47
|
+
assert convert_number_values_for_function_call_args(
|
|
48
|
+
{'key1': 1.0, 'key2': 1.1}
|
|
49
|
+
) == {'key1': 1, 'key2': 1.1}
|
|
50
|
+
|
|
51
|
+
|
|
52
|
+
def test_list_value():
|
|
53
|
+
assert convert_number_values_for_function_call_args([1.0, 1.1, 1.2]) == [
|
|
54
|
+
1,
|
|
55
|
+
1.1,
|
|
56
|
+
1.2,
|
|
57
|
+
]
|
|
58
|
+
|
|
59
|
+
|
|
60
|
+
def test_nested_value():
|
|
61
|
+
assert convert_number_values_for_function_call_args(
|
|
62
|
+
{'key1': 1.0, 'key2': {'key3': 1.0, 'key4': [1.2, 2.0]}}
|
|
63
|
+
) == {'key1': 1, 'key2': {'key3': 1, 'key4': [1.2, 2]}}
|
|
@@ -0,0 +1,240 @@
|
|
|
1
|
+
# Copyright 2025 Google LLC
|
|
2
|
+
#
|
|
3
|
+
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
4
|
+
# you may not use this file except in compliance with the License.
|
|
5
|
+
# You may obtain a copy of the License at
|
|
6
|
+
#
|
|
7
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
|
8
|
+
#
|
|
9
|
+
# Unless required by applicable law or agreed to in writing, software
|
|
10
|
+
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
11
|
+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
12
|
+
# See the License for the specific language governing permissions and
|
|
13
|
+
# limitations under the License.
|
|
14
|
+
#
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
"""Tests for find_afc_incompatible_tool_indexes."""
|
|
18
|
+
|
|
19
|
+
from typing import Any
|
|
20
|
+
import pytest
|
|
21
|
+
from ... import types
|
|
22
|
+
from ..._extra_utils import find_afc_incompatible_tool_indexes
|
|
23
|
+
|
|
24
|
+
try:
|
|
25
|
+
from mcp import types as mcp_types
|
|
26
|
+
from mcp import ClientSession as McpClientSession
|
|
27
|
+
from ..._adapters import McpToGenAiToolAdapter
|
|
28
|
+
except ImportError as e:
|
|
29
|
+
import sys
|
|
30
|
+
|
|
31
|
+
if sys.version_info < (3, 10):
|
|
32
|
+
raise ImportError(
|
|
33
|
+
'MCP Tool requires Python 3.10 or above. Please upgrade your Python'
|
|
34
|
+
' version.'
|
|
35
|
+
) from e
|
|
36
|
+
else:
|
|
37
|
+
raise e
|
|
38
|
+
|
|
39
|
+
|
|
40
|
+
def get_weather_tool(city: str) -> str:
|
|
41
|
+
"""Get the weather in a city."""
|
|
42
|
+
return f'The weather in {city} is sunny and 100 degrees.'
|
|
43
|
+
|
|
44
|
+
|
|
45
|
+
class MockMcpClientSession(McpClientSession):
|
|
46
|
+
|
|
47
|
+
def __init__(self):
|
|
48
|
+
self._read_stream = None
|
|
49
|
+
self._write_stream = None
|
|
50
|
+
|
|
51
|
+
async def call_tool(self, name: str, arguments: dict[str, Any]) -> Any:
|
|
52
|
+
return mcp_types.CallToolResult(
|
|
53
|
+
content=[mcp_types.TextContent(type='text', text='1.01')]
|
|
54
|
+
)
|
|
55
|
+
|
|
56
|
+
mcp_to_genai_tool_adapter = McpToGenAiToolAdapter(
|
|
57
|
+
session=MockMcpClientSession(),
|
|
58
|
+
list_tools_result=mcp_types.ListToolsResult(tools=[]),
|
|
59
|
+
)
|
|
60
|
+
|
|
61
|
+
|
|
62
|
+
def test_no_config_returns_empty_list():
|
|
63
|
+
"""Verifies that an empty list is returned if the input config is None.
|
|
64
|
+
"""
|
|
65
|
+
result = find_afc_incompatible_tool_indexes(config=None)
|
|
66
|
+
assert result == []
|
|
67
|
+
|
|
68
|
+
def test_config_with_no_tools_returns_empty_list():
|
|
69
|
+
"""Verifies an empty list is returned if the config has no 'tools' attribute.
|
|
70
|
+
"""
|
|
71
|
+
result = find_afc_incompatible_tool_indexes(
|
|
72
|
+
config=types.GenerateContentConfig()
|
|
73
|
+
)
|
|
74
|
+
assert result == []
|
|
75
|
+
|
|
76
|
+
def test_empty_tools_list_returns_empty_list():
|
|
77
|
+
"""Verifies that an empty list is returned if the 'tools' list is empty."""
|
|
78
|
+
result = find_afc_incompatible_tool_indexes(
|
|
79
|
+
config=types.GenerateContentConfig(tools=[])
|
|
80
|
+
)
|
|
81
|
+
|
|
82
|
+
assert result == []
|
|
83
|
+
|
|
84
|
+
def test_all_compatible_tools_returns_empty_list_with_empty_fd():
|
|
85
|
+
"""Verifies that an empty list is returned when all tools are compatible.
|
|
86
|
+
A tool is compatible if it's not a `types.Tool` or if its
|
|
87
|
+
`function_declarations` attribute is empty or None from config.
|
|
88
|
+
"""
|
|
89
|
+
result = find_afc_incompatible_tool_indexes(
|
|
90
|
+
config=types.GenerateContentConfig(
|
|
91
|
+
tools=[
|
|
92
|
+
types.Tool(
|
|
93
|
+
google_search_retrieval=types.GoogleSearchRetrieval()
|
|
94
|
+
),
|
|
95
|
+
types.Tool(retrieval=types.Retrieval()),
|
|
96
|
+
types.Tool(google_search=types.GoogleSearch()),
|
|
97
|
+
types.Tool(code_execution=types.ToolCodeExecution()),
|
|
98
|
+
types.Tool(google_maps=types.GoogleMaps()),
|
|
99
|
+
types.Tool(url_context=types.UrlContext()),
|
|
100
|
+
types.Tool(computer_use=types.ComputerUse()),
|
|
101
|
+
types.Tool(code_execution=types.ToolCodeExecution()),
|
|
102
|
+
types.Tool(function_declarations=[]),
|
|
103
|
+
mcp_types.Tool(
|
|
104
|
+
name='get_weather',
|
|
105
|
+
description='Get the weather in a city.',
|
|
106
|
+
inputSchema={
|
|
107
|
+
'type': 'object',
|
|
108
|
+
'properties': {'location': {'type': 'string'}},
|
|
109
|
+
},
|
|
110
|
+
),
|
|
111
|
+
get_weather_tool,
|
|
112
|
+
mcp_to_genai_tool_adapter,
|
|
113
|
+
]
|
|
114
|
+
)
|
|
115
|
+
)
|
|
116
|
+
|
|
117
|
+
assert result == []
|
|
118
|
+
|
|
119
|
+
def test_all_compatible_tools_returns_empty_list_with_none_fd():
|
|
120
|
+
"""Verifies that an empty list is returned when all tools are compatible.
|
|
121
|
+
A tool is compatible if it's not a `types.Tool` or if its
|
|
122
|
+
`function_declarations` attribute is empty or None from config.
|
|
123
|
+
"""
|
|
124
|
+
result = find_afc_incompatible_tool_indexes(
|
|
125
|
+
config=types.GenerateContentConfig(
|
|
126
|
+
tools=[
|
|
127
|
+
types.Tool(
|
|
128
|
+
google_search_retrieval=types.GoogleSearchRetrieval()
|
|
129
|
+
),
|
|
130
|
+
types.Tool(retrieval=types.Retrieval()),
|
|
131
|
+
types.Tool(google_search=types.GoogleSearch()),
|
|
132
|
+
types.Tool(code_execution=types.ToolCodeExecution()),
|
|
133
|
+
types.Tool(google_maps=types.GoogleMaps()),
|
|
134
|
+
types.Tool(url_context=types.UrlContext()),
|
|
135
|
+
types.Tool(computer_use=types.ComputerUse()),
|
|
136
|
+
types.Tool(code_execution=types.ToolCodeExecution()),
|
|
137
|
+
types.Tool(function_declarations=None),
|
|
138
|
+
mcp_types.Tool(
|
|
139
|
+
name='get_weather',
|
|
140
|
+
description='Get the weather in a city.',
|
|
141
|
+
inputSchema={
|
|
142
|
+
'type': 'object',
|
|
143
|
+
'properties': {'location': {'type': 'string'}},
|
|
144
|
+
},
|
|
145
|
+
),
|
|
146
|
+
get_weather_tool,
|
|
147
|
+
mcp_to_genai_tool_adapter,
|
|
148
|
+
]
|
|
149
|
+
)
|
|
150
|
+
)
|
|
151
|
+
|
|
152
|
+
assert result == []
|
|
153
|
+
|
|
154
|
+
def test_all_compatible_tools_returns_empty_list():
|
|
155
|
+
"""Verifies that an empty list is returned when all tools are compatible.
|
|
156
|
+
A tool is compatible if it's not a `types.Tool` or if its
|
|
157
|
+
`function_declarations` attribute is empty or None from config.
|
|
158
|
+
"""
|
|
159
|
+
result = find_afc_incompatible_tool_indexes(
|
|
160
|
+
config=types.GenerateContentConfig(
|
|
161
|
+
tools=[
|
|
162
|
+
types.Tool(
|
|
163
|
+
google_search_retrieval=types.GoogleSearchRetrieval()
|
|
164
|
+
),
|
|
165
|
+
types.Tool(retrieval=types.Retrieval()),
|
|
166
|
+
types.Tool(google_search=types.GoogleSearch()),
|
|
167
|
+
types.Tool(code_execution=types.ToolCodeExecution()),
|
|
168
|
+
types.Tool(google_maps=types.GoogleMaps()),
|
|
169
|
+
types.Tool(url_context=types.UrlContext()),
|
|
170
|
+
types.Tool(computer_use=types.ComputerUse()),
|
|
171
|
+
types.Tool(code_execution=types.ToolCodeExecution()),
|
|
172
|
+
types.Tool(function_declarations=[]),
|
|
173
|
+
mcp_types.Tool(
|
|
174
|
+
name='get_weather',
|
|
175
|
+
description='Get the weather in a city.',
|
|
176
|
+
inputSchema={
|
|
177
|
+
'type': 'object',
|
|
178
|
+
'properties': {'location': {'type': 'string'}},
|
|
179
|
+
},
|
|
180
|
+
),
|
|
181
|
+
get_weather_tool,
|
|
182
|
+
mcp_to_genai_tool_adapter,
|
|
183
|
+
]
|
|
184
|
+
)
|
|
185
|
+
)
|
|
186
|
+
|
|
187
|
+
assert result == []
|
|
188
|
+
|
|
189
|
+
def test_single_incompatible_tool():
|
|
190
|
+
"""Verifies that the correct index is returned for a single incompatible
|
|
191
|
+
tool.
|
|
192
|
+
"""
|
|
193
|
+
result = find_afc_incompatible_tool_indexes(
|
|
194
|
+
config=types.GenerateContentConfig(
|
|
195
|
+
tools=[
|
|
196
|
+
types.Tool(
|
|
197
|
+
google_search_retrieval=types.GoogleSearchRetrieval()
|
|
198
|
+
),
|
|
199
|
+
types.Tool(retrieval=types.Retrieval()),
|
|
200
|
+
types.Tool(
|
|
201
|
+
function_declarations=[
|
|
202
|
+
types.FunctionDeclaration(name='test_function')
|
|
203
|
+
]
|
|
204
|
+
),
|
|
205
|
+
get_weather_tool,
|
|
206
|
+
mcp_to_genai_tool_adapter,
|
|
207
|
+
]
|
|
208
|
+
)
|
|
209
|
+
)
|
|
210
|
+
assert result == [2]
|
|
211
|
+
|
|
212
|
+
|
|
213
|
+
def test_multiple_incompatible_tools():
|
|
214
|
+
"""Verifies that all correct indexes are returned for multiple incompatible
|
|
215
|
+
tools. """
|
|
216
|
+
result = find_afc_incompatible_tool_indexes(
|
|
217
|
+
config=types.GenerateContentConfig(
|
|
218
|
+
tools=[
|
|
219
|
+
types.Tool(
|
|
220
|
+
google_search_retrieval=types.GoogleSearchRetrieval()
|
|
221
|
+
),
|
|
222
|
+
types.Tool(retrieval=types.Retrieval()),
|
|
223
|
+
types.Tool(
|
|
224
|
+
function_declarations=[
|
|
225
|
+
types.FunctionDeclaration(name='test_function')
|
|
226
|
+
]
|
|
227
|
+
),
|
|
228
|
+
types.Tool(computer_use=types.ComputerUse()),
|
|
229
|
+
types.Tool(code_execution=types.ToolCodeExecution()),
|
|
230
|
+
types.Tool(
|
|
231
|
+
function_declarations=[
|
|
232
|
+
types.FunctionDeclaration(name='test_function_2')
|
|
233
|
+
]
|
|
234
|
+
),
|
|
235
|
+
get_weather_tool,
|
|
236
|
+
mcp_to_genai_tool_adapter,
|
|
237
|
+
]
|
|
238
|
+
)
|
|
239
|
+
)
|
|
240
|
+
assert result == [2, 5]
|