google-genai 1.19.0__py3-none-any.whl → 1.21.0__py3-none-any.whl

google/genai/chats.py

@@ -63,13 +63,8 @@ def _extract_curated_history(
   """Extracts the curated (valid) history from a comprehensive history.
 
   The comprehensive history contains all turns (user input and model responses),
-  including any invalid or rejected model outputs.  This function filters
-  that history to return only the valid turns.
-
-  A "turn" starts with one user input (a single content) and then follows by
-  corresponding model response (which may consist of multiple contents).
-  Turns are assumed to alternate: user input, model output, user input, model
-  output, etc.
+  including any invalid or rejected model outputs. This function filters that
+  history to return only the valid turns.
 
   Args:
       comprehensive_history: A list representing the complete chat history.
@@ -84,8 +79,6 @@ def _extract_curated_history(
   length = len(comprehensive_history)
   i = 0
   current_input = comprehensive_history[i]
-  if current_input.role != "user":
-    raise ValueError("History must start with a user turn.")
   while i < length:
     if comprehensive_history[i].role not in ["user", "model"]:
       raise ValueError(
@@ -94,6 +87,7 @@ def _extract_curated_history(
 
     if comprehensive_history[i].role == "user":
       current_input = comprehensive_history[i]
+      curated_history.append(current_input)
       i += 1
     else:
       current_output = []
@@ -104,8 +98,9 @@ def _extract_curated_history(
           is_valid = False
         i += 1
       if is_valid:
-        curated_history.append(current_input)
         curated_history.extend(current_output)
+      elif curated_history:
+        curated_history.pop()
   return curated_history
 
 
@@ -255,7 +250,7 @@ class Chat(_BaseChat):
           f"Message must be a valid part type: {types.PartUnion} or"
           f" {types.PartUnionDict}, got {type(message)}"
       )
-    input_content = t.t_content(self._modules._api_client, message)
+    input_content = t.t_content(message)
     response = self._modules.generate_content(
         model=self._model,
         contents=self._curated_history + [input_content],  # type: ignore[arg-type]
@@ -308,7 +303,7 @@ class Chat(_BaseChat):
           f"Message must be a valid part type: {types.PartUnion} or"
           f" {types.PartUnionDict}, got {type(message)}"
       )
-    input_content = t.t_content(self._modules._api_client, message)
+    input_content = t.t_content(message)
     output_contents = []
     finish_reason = None
     is_valid = True
@@ -417,7 +412,7 @@ class AsyncChat(_BaseChat):
           f"Message must be a valid part type: {types.PartUnion} or"
           f" {types.PartUnionDict}, got {type(message)}"
       )
-    input_content = t.t_content(self._modules._api_client, message)
+    input_content = t.t_content(message)
     response = await self._modules.generate_content(
         model=self._model,
         contents=self._curated_history + [input_content],  # type: ignore[arg-type]
@@ -469,7 +464,7 @@ class AsyncChat(_BaseChat):
           f"Message must be a valid part type: {types.PartUnion} or"
           f" {types.PartUnionDict}, got {type(message)}"
       )
-    input_content = t.t_content(self._modules._api_client, message)
+    input_content = t.t_content(message)
 
     async def async_generator():  # type: ignore[no-untyped-def]
       output_contents = []

google/genai/client.py

@@ -31,7 +31,7 @@ from .models import AsyncModels, Models
 from .operations import AsyncOperations, Operations
 from .tokens import AsyncTokens, Tokens
 from .tunings import AsyncTunings, Tunings
-from .types import HttpOptions, HttpOptionsDict
+from .types import HttpOptions, HttpOptionsDict, HttpRetryOptions
 
 
 class AsyncClient:

google/genai/errors.py

@@ -22,6 +22,7 @@ import json
 
 if TYPE_CHECKING:
   from .replay_api_client import ReplayResponse
+  import aiohttp
 
 
 class APIError(Exception):
@@ -36,7 +37,9 @@ class APIError(Exception):
       self,
       code: int,
       response_json: Any,
-      response: Optional[Union['ReplayResponse', httpx.Response]] = None,
+      response: Optional[
+          Union['ReplayResponse', httpx.Response, 'aiohttp.ClientResponse']
+      ] = None,
   ):
     self.response = response
     self.details = response_json
@@ -106,12 +109,17 @@ class APIError(Exception):
 
   @classmethod
   async def raise_for_async_response(
-      cls, response: Union['ReplayResponse', httpx.Response]
+      cls,
+      response: Union[
+          'ReplayResponse', httpx.Response, 'aiohttp.ClientResponse'
+      ],
   ) -> None:
     """Raises an error with detailed error message if the response has an error status."""
-    if response.status_code == 200:
-      return
+    status_code = 0
+    response_json = None
     if isinstance(response, httpx.Response):
+      if response.status_code == 200:
+        return
       try:
         await response.aread()
         response_json = response.json()
@@ -121,10 +129,28 @@ class APIError(Exception):
             'message': message,
             'status': response.reason_phrase,
         }
+      status_code = response.status_code
     else:
-      response_json = response.body_segments[0].get('error', {})
+      try:
+        import aiohttp  # pylint: disable=g-import-not-at-top
+
+        if isinstance(response, aiohttp.ClientResponse):
+          if response.status == 200:
+            return
+          try:
+            response_json = await response.json()
+          except aiohttp.client_exceptions.ContentTypeError:
+            message = await response.text()
+            response_json = {
+                'message': message,
+                'status': response.reason,
+            }
+          status_code = response.status
+        else:
+          response_json = response.body_segments[0].get('error', {})
+      except ImportError:
+        response_json = response.body_segments[0].get('error', {})
 
-    status_code = response.status_code
     if 400 <= status_code < 500:
       raise ClientError(status_code, response_json, response)
     elif 500 <= status_code < 600:

google/genai/files.py

@@ -16,17 +16,17 @@
 # Code generated by the Google Gen AI SDK generator DO NOT EDIT.
 
 import io
+import json
 import logging
 import mimetypes
 import os
-import pathlib
 from typing import Any, Optional, Union
 from urllib.parse import urlencode
+
 from . import _api_module
 from . import _common
 from . import _transformers as t
 from . import types
-from ._api_client import BaseApiClient
 from ._common import get_value_by_path as getv
 from ._common import set_value_by_path as setv
 from .pagers import AsyncPager, Pager
@@ -35,7 +35,6 @@ logger = logging.getLogger('google_genai.files')
 
 
 def _ListFilesConfig_to_mldev(
-    api_client: BaseApiClient,
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
@@ -57,7 +56,6 @@ def _ListFilesConfig_to_mldev(
 
 
 def _ListFilesParameters_to_mldev(
-    api_client: BaseApiClient,
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
@@ -66,16 +64,13 @@ def _ListFilesParameters_to_mldev(
     setv(
         to_object,
         ['config'],
-        _ListFilesConfig_to_mldev(
-            api_client, getv(from_object, ['config']), to_object
-        ),
+        _ListFilesConfig_to_mldev(getv(from_object, ['config']), to_object),
     )
 
   return to_object
 
 
 def _FileStatus_to_mldev(
-    api_client: BaseApiClient,
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
@@ -93,7 +88,6 @@ def _FileStatus_to_mldev(
 
 
 def _File_to_mldev(
-    api_client: BaseApiClient,
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
@@ -141,16 +135,13 @@ def _File_to_mldev(
     setv(
         to_object,
         ['error'],
-        _FileStatus_to_mldev(
-            api_client, getv(from_object, ['error']), to_object
-        ),
+        _FileStatus_to_mldev(getv(from_object, ['error']), to_object),
     )
 
   return to_object
 
 
 def _CreateFileParameters_to_mldev(
-    api_client: BaseApiClient,
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
@@ -159,7 +150,7 @@ def _CreateFileParameters_to_mldev(
     setv(
         to_object,
         ['file'],
-        _File_to_mldev(api_client, getv(from_object, ['file']), to_object),
+        _File_to_mldev(getv(from_object, ['file']), to_object),
     )
 
   if getv(from_object, ['config']) is not None:
@@ -169,16 +160,13 @@ def _CreateFileParameters_to_mldev(
 
 
 def _GetFileParameters_to_mldev(
-    api_client: BaseApiClient,
     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, ['name']) is not None:
     setv(
-        to_object,
-        ['_url', 'file'],
-        t.t_file_name(api_client, getv(from_object, ['name'])),
+        to_object, ['_url', 'file'], t.t_file_name(getv(from_object, ['name']))
     )
 
   if getv(from_object, ['config']) is not None:
@@ -188,16 +176,13 @@ def _GetFileParameters_to_mldev(
 
 
 def _DeleteFileParameters_to_mldev(
-    api_client: BaseApiClient,
     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, ['name']) is not None:
     setv(
-        to_object,
-        ['_url', 'file'],
-        t.t_file_name(api_client, getv(from_object, ['name'])),
+        to_object, ['_url', 'file'], t.t_file_name(getv(from_object, ['name']))
     )
 
   if getv(from_object, ['config']) is not None:
@@ -207,7 +192,6 @@ def _DeleteFileParameters_to_mldev(
 
 
 def _FileStatus_from_mldev(
-    api_client: BaseApiClient,
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
@@ -225,7 +209,6 @@ def _FileStatus_from_mldev(
 
 
 def _File_from_mldev(
-    api_client: BaseApiClient,
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
@@ -273,16 +256,13 @@ def _File_from_mldev(
     setv(
         to_object,
         ['error'],
-        _FileStatus_from_mldev(
-            api_client, getv(from_object, ['error']), to_object
-        ),
+        _FileStatus_from_mldev(getv(from_object, ['error']), to_object),
     )
 
   return to_object
 
 
 def _ListFilesResponse_from_mldev(
-    api_client: BaseApiClient,
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
@@ -295,7 +275,7 @@ def _ListFilesResponse_from_mldev(
         to_object,
         ['files'],
         [
-            _File_from_mldev(api_client, item, to_object)
+            _File_from_mldev(item, to_object)
             for item in getv(from_object, ['files'])
         ],
     )
@@ -304,19 +284,15 @@ def _ListFilesResponse_from_mldev(
 
 
 def _CreateFileResponse_from_mldev(
-    api_client: BaseApiClient,
     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, ['httpHeaders']) is not None:
-    setv(to_object, ['http_headers'], getv(from_object, ['httpHeaders']))
 
   return to_object
 
 
 def _DeleteFileResponse_from_mldev(
-    api_client: BaseApiClient,
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
@@ -357,9 +333,7 @@ class Files(_api_module.BaseModule):
           'This method is only supported in the Gemini Developer client.'
       )
     else:
-      request_dict = _ListFilesParameters_to_mldev(
-          self._api_client, parameter_model
-      )
+      request_dict = _ListFilesParameters_to_mldev(parameter_model)
       request_url_dict = request_dict.get('_url')
       if request_url_dict:
         path = 'files'.format_map(request_url_dict)
@@ -382,14 +356,12 @@ class Files(_api_module.BaseModule):
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.encode_unserializable_types(request_dict)
 
-    response_dict = self._api_client.request(
-        'get', path, request_dict, http_options
-    )
+    response = self._api_client.request('get', path, request_dict, http_options)
+
+    response_dict = '' if not response.body else json.loads(response.body)
 
     if not self._api_client.vertexai:
-      response_dict = _ListFilesResponse_from_mldev(
-          self._api_client, response_dict
-      )
+      response_dict = _ListFilesResponse_from_mldev(response_dict)
 
     return_value = types.ListFilesResponse._from_response(
         response=response_dict, kwargs=parameter_model.model_dump()
@@ -414,9 +386,7 @@ class Files(_api_module.BaseModule):
           'This method is only supported in the Gemini Developer client.'
       )
     else:
-      request_dict = _CreateFileParameters_to_mldev(
-          self._api_client, parameter_model
-      )
+      request_dict = _CreateFileParameters_to_mldev(parameter_model)
       request_url_dict = request_dict.get('_url')
       if request_url_dict:
         path = 'upload/v1beta/files'.format_map(request_url_dict)
@@ -439,14 +409,20 @@ class Files(_api_module.BaseModule):
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.encode_unserializable_types(request_dict)
 
-    response_dict = self._api_client.request(
+    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.CreateFileResponse(sdk_http_response=response)
+      return return_value
+
+    response_dict = '' if not response.body else json.loads(response.body)
+
     if not self._api_client.vertexai:
-      response_dict = _CreateFileResponse_from_mldev(
-          self._api_client, response_dict
-      )
+      response_dict = _CreateFileResponse_from_mldev(response_dict)
 
     return_value = types.CreateFileResponse._from_response(
         response=response_dict, kwargs=parameter_model.model_dump()
@@ -485,9 +461,7 @@ class Files(_api_module.BaseModule):
           'This method is only supported in the Gemini Developer client.'
       )
     else:
-      request_dict = _GetFileParameters_to_mldev(
-          self._api_client, parameter_model
-      )
+      request_dict = _GetFileParameters_to_mldev(parameter_model)
       request_url_dict = request_dict.get('_url')
       if request_url_dict:
         path = 'files/{file}'.format_map(request_url_dict)
@@ -510,12 +484,12 @@ class Files(_api_module.BaseModule):
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.encode_unserializable_types(request_dict)
 
-    response_dict = self._api_client.request(
-        'get', path, request_dict, http_options
-    )
+    response = self._api_client.request('get', path, request_dict, http_options)
+
+    response_dict = '' if not response.body else json.loads(response.body)
 
     if not self._api_client.vertexai:
-      response_dict = _File_from_mldev(self._api_client, response_dict)
+      response_dict = _File_from_mldev(response_dict)
 
     return_value = types.File._from_response(
         response=response_dict, kwargs=parameter_model.model_dump()
@@ -553,9 +527,7 @@ class Files(_api_module.BaseModule):
           'This method is only supported in the Gemini Developer client.'
       )
     else:
-      request_dict = _DeleteFileParameters_to_mldev(
-          self._api_client, parameter_model
-      )
+      request_dict = _DeleteFileParameters_to_mldev(parameter_model)
       request_url_dict = request_dict.get('_url')
       if request_url_dict:
         path = 'files/{file}'.format_map(request_url_dict)
@@ -578,14 +550,14 @@ class Files(_api_module.BaseModule):
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.encode_unserializable_types(request_dict)
 
-    response_dict = self._api_client.request(
+    response = self._api_client.request(
         'delete', path, request_dict, http_options
     )
 
+    response_dict = '' if not response.body else json.loads(response.body)
+
     if not self._api_client.vertexai:
-      response_dict = _DeleteFileResponse_from_mldev(
-          self._api_client, response_dict
-      )
+      response_dict = _DeleteFileResponse_from_mldev(response_dict)
 
     return_value = types.DeleteFileResponse._from_response(
         response=response_dict, kwargs=parameter_model.model_dump()
@@ -596,7 +568,7 @@ class Files(_api_module.BaseModule):
   def upload(
       self,
       *,
-      file: Union[str, pathlib.Path, os.PathLike[str], io.IOBase],
+      file: Union[str, os.PathLike[str], io.IOBase],
       config: Optional[types.UploadFileConfigOrDict] = None,
   ) -> types.File:
     """Calls the API to upload a file using a supported file service.
@@ -678,18 +650,22 @@ class Files(_api_module.BaseModule):
           },
       )
     response = self._create(
-        file=file_obj, config=types.CreateFileConfig(http_options=http_options)
+        file=file_obj,
+        config=types.CreateFileConfig(
+            http_options=http_options, should_return_http_response=True
+        ),
     )
 
     if (
-        response.http_headers is None
-        or 'x-goog-upload-url' not in response.http_headers
+        response.sdk_http_response is None
+        or response.sdk_http_response.headers is None
+        or 'x-goog-upload-url' not in response.sdk_http_response.headers
     ):
       raise KeyError(
           'Failed to create file. Upload URL did not returned from the create'
           ' file request.'
       )
-    upload_url = response.http_headers['x-goog-upload-url']
+    upload_url = response.sdk_http_response.headers['x-goog-upload-url']
 
     if isinstance(file, io.IOBase):
       return_file = self._api_client.upload_file(
@@ -701,7 +677,7 @@ class Files(_api_module.BaseModule):
       )
 
     return types.File._from_response(
-        response=_File_from_mldev(self._api_client, return_file.json['file']),
+        response=_File_from_mldev(return_file.json['file']),
         kwargs=config_model.model_dump() if config else {},
     )
 
@@ -774,7 +750,7 @@ class Files(_api_module.BaseModule):
           'downloaded. You can tell which files are downloadable by checking '
           'the `source` or `download_uri` property.'
       )
-    name = t.t_file_name(self._api_client, file)
+    name = t.t_file_name(file)
 
     path = f'files/{name}:download'
 
@@ -829,9 +805,7 @@ class AsyncFiles(_api_module.BaseModule):
           'This method is only supported in the Gemini Developer client.'
       )
     else:
-      request_dict = _ListFilesParameters_to_mldev(
-          self._api_client, parameter_model
-      )
+      request_dict = _ListFilesParameters_to_mldev(parameter_model)
       request_url_dict = request_dict.get('_url')
       if request_url_dict:
         path = 'files'.format_map(request_url_dict)
@@ -854,14 +828,14 @@ class AsyncFiles(_api_module.BaseModule):
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.encode_unserializable_types(request_dict)
 
-    response_dict = await self._api_client.async_request(
+    response = await self._api_client.async_request(
         'get', path, request_dict, http_options
     )
 
+    response_dict = '' if not response.body else json.loads(response.body)
+
     if not self._api_client.vertexai:
-      response_dict = _ListFilesResponse_from_mldev(
-          self._api_client, response_dict
-      )
+      response_dict = _ListFilesResponse_from_mldev(response_dict)
 
     return_value = types.ListFilesResponse._from_response(
         response=response_dict, kwargs=parameter_model.model_dump()
@@ -886,9 +860,7 @@ class AsyncFiles(_api_module.BaseModule):
           'This method is only supported in the Gemini Developer client.'
       )
     else:
-      request_dict = _CreateFileParameters_to_mldev(
-          self._api_client, parameter_model
-      )
+      request_dict = _CreateFileParameters_to_mldev(parameter_model)
       request_url_dict = request_dict.get('_url')
       if request_url_dict:
         path = 'upload/v1beta/files'.format_map(request_url_dict)
@@ -911,14 +883,20 @@ class AsyncFiles(_api_module.BaseModule):
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.encode_unserializable_types(request_dict)
 
-    response_dict = await self._api_client.async_request(
+    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.CreateFileResponse(sdk_http_response=response)
+      return return_value
+
+    response_dict = '' if not response.body else json.loads(response.body)
+
     if not self._api_client.vertexai:
-      response_dict = _CreateFileResponse_from_mldev(
-          self._api_client, response_dict
-      )
+      response_dict = _CreateFileResponse_from_mldev(response_dict)
 
     return_value = types.CreateFileResponse._from_response(
         response=response_dict, kwargs=parameter_model.model_dump()
@@ -957,9 +935,7 @@ class AsyncFiles(_api_module.BaseModule):
           'This method is only supported in the Gemini Developer client.'
       )
     else:
-      request_dict = _GetFileParameters_to_mldev(
-          self._api_client, parameter_model
-      )
+      request_dict = _GetFileParameters_to_mldev(parameter_model)
       request_url_dict = request_dict.get('_url')
       if request_url_dict:
         path = 'files/{file}'.format_map(request_url_dict)
@@ -982,12 +958,14 @@ class AsyncFiles(_api_module.BaseModule):
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.encode_unserializable_types(request_dict)
 
-    response_dict = await self._api_client.async_request(
+    response = await self._api_client.async_request(
         'get', path, request_dict, http_options
     )
 
+    response_dict = '' if not response.body else json.loads(response.body)
+
     if not self._api_client.vertexai:
-      response_dict = _File_from_mldev(self._api_client, response_dict)
+      response_dict = _File_from_mldev(response_dict)
 
     return_value = types.File._from_response(
         response=response_dict, kwargs=parameter_model.model_dump()
@@ -1025,9 +1003,7 @@ class AsyncFiles(_api_module.BaseModule):
           'This method is only supported in the Gemini Developer client.'
       )
     else:
-      request_dict = _DeleteFileParameters_to_mldev(
-          self._api_client, parameter_model
-      )
+      request_dict = _DeleteFileParameters_to_mldev(parameter_model)
       request_url_dict = request_dict.get('_url')
       if request_url_dict:
         path = 'files/{file}'.format_map(request_url_dict)
@@ -1050,14 +1026,14 @@ class AsyncFiles(_api_module.BaseModule):
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.encode_unserializable_types(request_dict)
 
-    response_dict = await self._api_client.async_request(
+    response = await self._api_client.async_request(
         'delete', path, request_dict, http_options
     )
 
+    response_dict = '' if not response.body else json.loads(response.body)
+
     if not self._api_client.vertexai:
-      response_dict = _DeleteFileResponse_from_mldev(
-          self._api_client, response_dict
-      )
+      response_dict = _DeleteFileResponse_from_mldev(response_dict)
 
     return_value = types.DeleteFileResponse._from_response(
         response=response_dict, kwargs=parameter_model.model_dump()
@@ -1068,7 +1044,7 @@ class AsyncFiles(_api_module.BaseModule):
   async def upload(
       self,
       *,
-      file: Union[str, pathlib.Path, os.PathLike[str], io.IOBase],
+      file: Union[str, os.PathLike[str], io.IOBase],
       config: Optional[types.UploadFileConfigOrDict] = None,
   ) -> types.File:
     """Calls the API to upload a file asynchronously using a supported file service.
@@ -1150,17 +1126,27 @@ class AsyncFiles(_api_module.BaseModule):
           },
       )
     response = await self._create(
-        file=file_obj, config=types.CreateFileConfig(http_options=http_options)
+        file=file_obj,
+        config=types.CreateFileConfig(
+            http_options=http_options, should_return_http_response=True
+        ),
     )
     if (
-        response.http_headers is None
-        or 'x-goog-upload-url' not in response.http_headers
+        response.sdk_http_response is None
+        or response.sdk_http_response.headers is None
+        or (
+            'x-goog-upload-url' not in response.sdk_http_response.headers
+            and 'X-Goog-Upload-URL' not in response.sdk_http_response.headers
+        )
     ):
       raise KeyError(
           'Failed to create file. Upload URL did not returned from the create'
           ' file request.'
       )
-    upload_url = response.http_headers['x-goog-upload-url']
+    elif 'x-goog-upload-url' in response.sdk_http_response.headers:
+      upload_url = response.sdk_http_response.headers['x-goog-upload-url']
+    else:
+      upload_url = response.sdk_http_response.headers['X-Goog-Upload-URL']
 
     if isinstance(file, io.IOBase):
       return_file = await self._api_client.async_upload_file(
@@ -1172,7 +1158,7 @@ class AsyncFiles(_api_module.BaseModule):
       )
 
     return types.File._from_response(
-        response=_File_from_mldev(self._api_client, return_file.json['file']),
+        response=_File_from_mldev(return_file.json['file']),
         kwargs=config_model.model_dump() if config else {},
     )
 
@@ -1233,7 +1219,7 @@ class AsyncFiles(_api_module.BaseModule):
       else:
         config_model = config
 
-    name = t.t_file_name(self._api_client, file)
+    name = t.t_file_name(file)
 
     path = f'files/{name}:download'