google-genai 1.55.0__py3-none-any.whl → 1.57.0__py3-none-any.whl

google/genai/files.py

@@ -22,6 +22,9 @@ import os
 from typing import Any, Optional, Union
 from urllib.parse import urlencode
 
+import google.auth
+
+from . import _api_client
 from . import _api_module
 from . import _common
 from . import _extra_utils
@@ -149,6 +152,33 @@ def _ListFilesResponse_from_mldev(
   return to_object
 
 
+def _RegisterFilesParameters_to_mldev(
+    from_object: Union[dict[str, Any], object],
+    parent_object: Optional[dict[str, Any]] = None,
+) -> dict[str, Any]:
+  to_object: dict[str, Any] = {}
+  if getv(from_object, ['uris']) is not None:
+    setv(to_object, ['uris'], getv(from_object, ['uris']))
+
+  return to_object
+
+
+def _RegisterFilesResponse_from_mldev(
+    from_object: Union[dict[str, Any], object],
+    parent_object: Optional[dict[str, Any]] = None,
+) -> dict[str, Any]:
+  to_object: dict[str, Any] = {}
+  if getv(from_object, ['sdkHttpResponse']) is not None:
+    setv(
+        to_object, ['sdk_http_response'], getv(from_object, ['sdkHttpResponse'])
+    )
+
+  if getv(from_object, ['files']) is not None:
+    setv(to_object, ['files'], [item for item in getv(from_object, ['files'])])
+
+  return to_object
+
+
 class Files(_api_module.BaseModule):
 
   def _list(
@@ -402,6 +432,69 @@ class Files(_api_module.BaseModule):
     self._api_client._verify_response(return_value)
     return return_value
 
+  def _register_files(
+      self,
+      *,
+      uris: list[str],
+      config: Optional[types.RegisterFilesConfigOrDict] = None,
+  ) -> types.RegisterFilesResponse:
+    parameter_model = types._RegisterFilesParameters(
+        uris=uris,
+        config=config,
+    )
+
+    request_url_dict: Optional[dict[str, str]]
+    if self._api_client.vertexai:
+      raise ValueError(
+          'This method is only supported in the Gemini Developer client.'
+      )
+    else:
+      request_dict = _RegisterFilesParameters_to_mldev(parameter_model)
+      request_url_dict = request_dict.get('_url')
+      if request_url_dict:
+        path = 'files:register'.format_map(request_url_dict)
+      else:
+        path = 'files:register'
+
+    query_params = request_dict.get('_query')
+    if query_params:
+      path = f'{path}?{urlencode(query_params)}'
+    # TODO: remove the hack that pops config.
+    request_dict.pop('config', None)
+
+    http_options: Optional[types.HttpOptions] = None
+    if (
+        parameter_model.config is not None
+        and parameter_model.config.http_options is not None
+    ):
+      http_options = parameter_model.config.http_options
+
+    request_dict = _common.convert_to_dict(request_dict)
+    request_dict = _common.encode_unserializable_types(request_dict)
+
+    response = self._api_client.request(
+        'post', path, request_dict, http_options
+    )
+
+    if config is not None and getattr(
+        config, 'should_return_http_response', None
+    ):
+      return_value = types.RegisterFilesResponse(sdk_http_response=response)
+      self._api_client._verify_response(return_value)
+      return return_value
+
+    response_dict = {} if not response.body else json.loads(response.body)
+
+    if not self._api_client.vertexai:
+      response_dict = _RegisterFilesResponse_from_mldev(response_dict)
+
+    return_value = types.RegisterFilesResponse._from_response(
+        response=response_dict, kwargs=parameter_model.model_dump()
+    )
+
+    self._api_client._verify_response(return_value)
+    return return_value
+
   def upload(
       self,
       *,
@@ -559,6 +652,39 @@ class Files(_api_module.BaseModule):
 
     return data
 
+  def register_files(
+      self,
+      *,
+      auth: google.auth.credentials.Credentials,
+      uris: list[str],
+      config: Optional[types.RegisterFilesConfigOrDict] = None,
+  ) -> types.RegisterFilesResponse:
+    """Registers gcs files with the file service."""
+    if not isinstance(auth, google.auth.credentials.Credentials):
+      raise ValueError(
+          'auth must be a google.auth.credentials.Credentials object.'
+      )
+    if config is None:
+      config = types.RegisterFilesConfig()
+    else:
+      config = types.RegisterFilesConfig.model_validate(config)
+      config = config.model_copy(deep=True)
+
+    http_options = config.http_options or types.HttpOptions()
+    headers = http_options.headers or {}
+    headers = {k.lower(): v for k, v in headers.items()}
+
+    token = _api_client.get_token_from_credentials(self._api_client, auth)
+    headers['authorization'] = f'Bearer {token}'
+
+    if auth.quota_project_id:
+      headers['x-goog-user-project'] = auth.quota_project_id
+
+    http_options.headers = headers
+    config.http_options = http_options
+
+    return self._register_files(uris=uris, config=config)
+
   def list(
       self, *, config: Optional[types.ListFilesConfigOrDict] = None
   ) -> Pager[types.File]:
@@ -845,6 +971,69 @@ class AsyncFiles(_api_module.BaseModule):
     self._api_client._verify_response(return_value)
     return return_value
 
+  async def _register_files(
+      self,
+      *,
+      uris: list[str],
+      config: Optional[types.RegisterFilesConfigOrDict] = None,
+  ) -> types.RegisterFilesResponse:
+    parameter_model = types._RegisterFilesParameters(
+        uris=uris,
+        config=config,
+    )
+
+    request_url_dict: Optional[dict[str, str]]
+    if self._api_client.vertexai:
+      raise ValueError(
+          'This method is only supported in the Gemini Developer client.'
+      )
+    else:
+      request_dict = _RegisterFilesParameters_to_mldev(parameter_model)
+      request_url_dict = request_dict.get('_url')
+      if request_url_dict:
+        path = 'files:register'.format_map(request_url_dict)
+      else:
+        path = 'files:register'
+
+    query_params = request_dict.get('_query')
+    if query_params:
+      path = f'{path}?{urlencode(query_params)}'
+    # TODO: remove the hack that pops config.
+    request_dict.pop('config', None)
+
+    http_options: Optional[types.HttpOptions] = None
+    if (
+        parameter_model.config is not None
+        and parameter_model.config.http_options is not None
+    ):
+      http_options = parameter_model.config.http_options
+
+    request_dict = _common.convert_to_dict(request_dict)
+    request_dict = _common.encode_unserializable_types(request_dict)
+
+    response = await self._api_client.async_request(
+        'post', path, request_dict, http_options
+    )
+
+    if config is not None and getattr(
+        config, 'should_return_http_response', None
+    ):
+      return_value = types.RegisterFilesResponse(sdk_http_response=response)
+      self._api_client._verify_response(return_value)
+      return return_value
+
+    response_dict = {} if not response.body else json.loads(response.body)
+
+    if not self._api_client.vertexai:
+      response_dict = _RegisterFilesResponse_from_mldev(response_dict)
+
+    return_value = types.RegisterFilesResponse._from_response(
+        response=response_dict, kwargs=parameter_model.model_dump()
+    )
+
+    self._api_client._verify_response(return_value)
+    return return_value
+
   async def upload(
       self,
       *,
@@ -992,6 +1181,41 @@ class AsyncFiles(_api_module.BaseModule):
 
     return data
 
+  async def register_files(
+      self,
+      *,
+      auth: google.auth.credentials.Credentials,
+      uris: list[str],
+      config: Optional[types.RegisterFilesConfigOrDict] = None,
+  ) -> types.RegisterFilesResponse:
+    """Registers gcs files with the file service."""
+    if not isinstance(auth, google.auth.credentials.Credentials):
+      raise ValueError(
+          'auth must be a google.auth.credentials.Credentials object.'
+      )
+    if config is None:
+      config = types.RegisterFilesConfig()
+    else:
+      config = types.RegisterFilesConfig.model_validate(config)
+      config = config.model_copy(deep=True)
+
+    http_options = config.http_options or types.HttpOptions()
+    headers = http_options.headers or {}
+    headers = {k.lower(): v for k, v in headers.items()}
+
+    token = await _api_client.async_get_token_from_credentials(
+        self._api_client, auth
+    )
+    headers['authorization'] = f'Bearer {token}'
+
+    if auth.quota_project_id:
+      headers['x-goog-user-project'] = auth.quota_project_id
+
+    http_options.headers = headers
+    config.http_options = http_options
+
+    return await self._register_files(uris=uris, config=config)
+
   async def list(
       self, *, config: Optional[types.ListFilesConfigOrDict] = None
   ) -> AsyncPager[types.File]:

google/genai/models.py

@@ -891,9 +891,6 @@ def _FunctionCallingConfig_to_mldev(
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
   to_object: dict[str, Any] = {}
-  if getv(from_object, ['mode']) is not None:
-    setv(to_object, ['mode'], getv(from_object, ['mode']))
-
   if getv(from_object, ['allowed_function_names']) is not None:
     setv(
         to_object,
@@ -901,6 +898,9 @@ def _FunctionCallingConfig_to_mldev(
         getv(from_object, ['allowed_function_names']),
     )
 
+  if getv(from_object, ['mode']) is not None:
+    setv(to_object, ['mode'], getv(from_object, ['mode']))
+
   if getv(from_object, ['stream_function_call_arguments']) is not None:
     raise ValueError(
         'stream_function_call_arguments parameter is not supported in Gemini'
@@ -915,9 +915,6 @@ def _FunctionDeclaration_to_vertex(
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
   to_object: dict[str, Any] = {}
-  if getv(from_object, ['behavior']) is not None:
-    raise ValueError('behavior parameter is not supported in Vertex AI.')
-
   if getv(from_object, ['description']) is not None:
     setv(to_object, ['description'], getv(from_object, ['description']))
 
@@ -944,6 +941,9 @@ def _FunctionDeclaration_to_vertex(
         getv(from_object, ['response_json_schema']),
     )
 
+  if getv(from_object, ['behavior']) is not None:
+    raise ValueError('behavior parameter is not supported in Vertex AI.')
+
   return to_object
 
 
@@ -1258,9 +1258,7 @@ def _GenerateContentConfig_to_vertex(
     setv(
         to_object,
         ['speechConfig'],
-        _SpeechConfig_to_vertex(
-            t.t_speech_config(getv(from_object, ['speech_config'])), to_object
-        ),
+        t.t_speech_config(getv(from_object, ['speech_config'])),
     )
 
   if getv(from_object, ['audio_timestamp']) is not None:
@@ -2446,13 +2444,7 @@ def _GenerationConfig_to_vertex(
     setv(to_object, ['seed'], getv(from_object, ['seed']))
 
   if getv(from_object, ['speech_config']) is not None:
-    setv(
-        to_object,
-        ['speechConfig'],
-        _SpeechConfig_to_vertex(
-            getv(from_object, ['speech_config']), to_object
-        ),
-    )
+    setv(to_object, ['speechConfig'], getv(from_object, ['speech_config']))
 
   if getv(from_object, ['stop_sequences']) is not None:
     setv(to_object, ['stopSequences'], getv(from_object, ['stop_sequences']))
@@ -2557,6 +2549,11 @@ def _ImageConfig_to_mldev(
   if getv(from_object, ['image_size']) is not None:
     setv(to_object, ['imageSize'], getv(from_object, ['image_size']))
 
+  if getv(from_object, ['person_generation']) is not None:
+    raise ValueError(
+        'person_generation parameter is not supported in Gemini API.'
+    )
+
   if getv(from_object, ['output_mime_type']) is not None:
     raise ValueError(
         'output_mime_type parameter is not supported in Gemini API.'
@@ -2581,6 +2578,13 @@ def _ImageConfig_to_vertex(
   if getv(from_object, ['image_size']) is not None:
     setv(to_object, ['imageSize'], getv(from_object, ['image_size']))
 
+  if getv(from_object, ['person_generation']) is not None:
+    setv(
+        to_object,
+        ['personGeneration'],
+        getv(from_object, ['person_generation']),
+    )
+
   if getv(from_object, ['output_mime_type']) is not None:
     setv(
         to_object,
@@ -3427,30 +3431,16 @@ def _SegmentImageSource_to_vertex(
   return to_object
 
 
-def _SpeechConfig_to_vertex(
+def _ToolConfig_to_mldev(
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
   to_object: dict[str, Any] = {}
-  if getv(from_object, ['voice_config']) is not None:
-    setv(to_object, ['voiceConfig'], getv(from_object, ['voice_config']))
-
-  if getv(from_object, ['language_code']) is not None:
-    setv(to_object, ['languageCode'], getv(from_object, ['language_code']))
-
-  if getv(from_object, ['multi_speaker_voice_config']) is not None:
-    raise ValueError(
-        'multi_speaker_voice_config parameter is not supported in Vertex AI.'
+  if getv(from_object, ['retrieval_config']) is not None:
+    setv(
+        to_object, ['retrievalConfig'], getv(from_object, ['retrieval_config'])
     )
 
-  return to_object
-
-
-def _ToolConfig_to_mldev(
-    from_object: Union[dict[str, Any], object],
-    parent_object: Optional[dict[str, Any]] = None,
-) -> dict[str, Any]:
-  to_object: dict[str, Any] = {}
   if getv(from_object, ['function_calling_config']) is not None:
     setv(
         to_object,
@@ -3460,11 +3450,6 @@ def _ToolConfig_to_mldev(
         ),
     )
 
-  if getv(from_object, ['retrieval_config']) is not None:
-    setv(
-        to_object, ['retrievalConfig'], getv(from_object, ['retrieval_config'])
-    )
-
   return to_object
 
 
@@ -3473,23 +3458,9 @@ def _Tool_to_mldev(
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
   to_object: dict[str, Any] = {}
-  if getv(from_object, ['function_declarations']) is not None:
-    setv(
-        to_object,
-        ['functionDeclarations'],
-        [item for item in getv(from_object, ['function_declarations'])],
-    )
-
   if getv(from_object, ['retrieval']) is not None:
     raise ValueError('retrieval parameter is not supported in Gemini API.')
 
-  if getv(from_object, ['google_search_retrieval']) is not None:
-    setv(
-        to_object,
-        ['googleSearchRetrieval'],
-        getv(from_object, ['google_search_retrieval']),
-    )
-
   if getv(from_object, ['computer_use']) is not None:
     setv(to_object, ['computerUse'], getv(from_object, ['computer_use']))
 
@@ -3504,6 +3475,13 @@ def _Tool_to_mldev(
         'enterprise_web_search parameter is not supported in Gemini API.'
     )
 
+  if getv(from_object, ['function_declarations']) is not None:
+    setv(
+        to_object,
+        ['functionDeclarations'],
+        [item for item in getv(from_object, ['function_declarations'])],
+    )
+
   if getv(from_object, ['google_maps']) is not None:
     setv(
         to_object,
@@ -3518,6 +3496,13 @@ def _Tool_to_mldev(
         _GoogleSearch_to_mldev(getv(from_object, ['google_search']), to_object),
     )
 
+  if getv(from_object, ['google_search_retrieval']) is not None:
+    setv(
+        to_object,
+        ['googleSearchRetrieval'],
+        getv(from_object, ['google_search_retrieval']),
+    )
+
   if getv(from_object, ['url_context']) is not None:
     setv(to_object, ['urlContext'], getv(from_object, ['url_context']))
 
@@ -3529,26 +3514,9 @@ def _Tool_to_vertex(
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
   to_object: dict[str, Any] = {}
-  if getv(from_object, ['function_declarations']) is not None:
-    setv(
-        to_object,
-        ['functionDeclarations'],
-        [
-            _FunctionDeclaration_to_vertex(item, to_object)
-            for item in getv(from_object, ['function_declarations'])
-        ],
-    )
-
   if getv(from_object, ['retrieval']) is not None:
     setv(to_object, ['retrieval'], getv(from_object, ['retrieval']))
 
-  if getv(from_object, ['google_search_retrieval']) is not None:
-    setv(
-        to_object,
-        ['googleSearchRetrieval'],
-        getv(from_object, ['google_search_retrieval']),
-    )
-
   if getv(from_object, ['computer_use']) is not None:
     setv(to_object, ['computerUse'], getv(from_object, ['computer_use']))
 
@@ -3565,12 +3533,29 @@ def _Tool_to_vertex(
         getv(from_object, ['enterprise_web_search']),
     )
 
+  if getv(from_object, ['function_declarations']) is not None:
+    setv(
+        to_object,
+        ['functionDeclarations'],
+        [
+            _FunctionDeclaration_to_vertex(item, to_object)
+            for item in getv(from_object, ['function_declarations'])
+        ],
+    )
+
   if getv(from_object, ['google_maps']) is not None:
     setv(to_object, ['googleMaps'], getv(from_object, ['google_maps']))
 
   if getv(from_object, ['google_search']) is not None:
     setv(to_object, ['googleSearch'], getv(from_object, ['google_search']))
 
+  if getv(from_object, ['google_search_retrieval']) is not None:
+    setv(
+        to_object,
+        ['googleSearchRetrieval'],
+        getv(from_object, ['google_search_retrieval']),
+    )
+
   if getv(from_object, ['url_context']) is not None:
     setv(to_object, ['urlContext'], getv(from_object, ['url_context']))
 
@@ -4454,7 +4439,7 @@ class Models(_api_module.BaseModule):
       image = product_recontext_response.generated_images[0].image
 
       virtual_try_on_response = client.models.recontext_image(
-          model="virtual-try-on-preview-08-04",
+          model="virtual-try-on-001",
           source=types.RecontextImageSource(
               person_image=types.Image.from_file(IMAGE1_FILE_PATH),
               product_images=[types.ProductImage.from_file(IMAGE2_FILE_PATH)],
@@ -6298,7 +6283,7 @@ class AsyncModels(_api_module.BaseModule):
       image = product_recontext_response.generated_images[0].image
 
       virtual_try_on_response = client.models.recontext_image(
-          model="virtual-try-on-preview-08-04",
+          model="virtual-try-on-001",
           source=types.RecontextImageSource(
               person_image=types.Image.from_file(IMAGE1_FILE_PATH),
               product_images=[types.ProductImage.from_file(IMAGE2_FILE_PATH)],

google/genai/tests/chats/test_get_history.py

@@ -55,7 +55,7 @@ def mock_api_client(vertexai=False):
 
 
 @pytest.fixture
-def mock_generate_content_invalid_content():
+def mock_generate_content_with_empty_text_part():
   with mock.patch.object(
       models.Models, 'generate_content'
   ) as mock_generate_content:
@@ -84,7 +84,7 @@ def mock_generate_content_empty_content():
 
 
 @pytest.fixture
-def mock_generate_content_stream_invalid_content():
+def mock_generate_content_stream_with_empty_text_part():
   with mock.patch.object(
       models.Models, 'generate_content_stream'
   ) as mock_generate_content:
@@ -95,7 +95,8 @@ def mock_generate_content_stream_invalid_content():
                     content=types.Content(
                         role='model',
                         parts=[types.Part(text='')],
-                    )
+                    ),
+                    finish_reason=types.FinishReason.STOP,
                 )
             ]
         )
@@ -481,7 +482,7 @@ def test_history_with_invalid_turns():
   assert chat.get_history(curated=True) == curated_history
 
 
-def test_chat_with_invalid_content(mock_generate_content_invalid_content):
+def test_chat_with_empty_text_part(mock_generate_content_with_empty_text_part):
   models_module = models.Models(mock_api_client)
   chats_module = chats.Chats(modules=models_module)
   chat = chats_module.create(model='gemini-2.5-flash')
@@ -496,7 +497,7 @@ def test_chat_with_invalid_content(mock_generate_content_invalid_content):
       ),
   ]
   assert chat.get_history() == expected_comprehensive_history
-  assert not chat.get_history(curated=True)
+  assert chat.get_history(curated=True) == expected_comprehensive_history
 
 
 def test_chat_with_empty_content(mock_generate_content_empty_content):
@@ -517,8 +518,8 @@ def test_chat_with_empty_content(mock_generate_content_empty_content):
   assert not chat.get_history(curated=True)
 
 
-def test_chat_stream_with_invalid_content(
-    mock_generate_content_stream_invalid_content,
+def test_chat_stream_with_empty_text_part(
+    mock_generate_content_stream_with_empty_text_part,
 ):
   models_module = models.Models(mock_api_client)
   chats_module = chats.Chats(modules=models_module)
@@ -536,7 +537,7 @@ def test_chat_stream_with_invalid_content(
       ),
   ]
   assert chat.get_history() == expected_comprehensive_history
-  assert not chat.get_history(curated=True)
+  assert chat.get_history(curated=True) == expected_comprehensive_history
 
 
 def test_chat_stream_with_empty_content(

google/genai/tests/chats/test_validate_response.py

@@ -53,7 +53,7 @@ def test_validate_response_part_with_empty_text():
       ]
   )
 
-  assert not _validate_response(response)
+  assert _validate_response(response)
 
 
 def test_validate_response_part_with_text():