google-genai 1.4.0__py3-none-any.whl → 1.6.0__py3-none-any.whl

google/genai/models.py

@@ -175,15 +175,9 @@ def _Schema_to_mldev(
   if getv(from_object, ['pattern']) is not None:
     raise ValueError('pattern parameter is not supported in Gemini API.')
 
-  if getv(from_object, ['minimum']) is not None:
-    raise ValueError('minimum parameter is not supported in Gemini API.')
-
   if getv(from_object, ['default']) is not None:
     raise ValueError('default parameter is not supported in Gemini API.')
 
-  if getv(from_object, ['any_of']) is not None:
-    raise ValueError('any_of parameter is not supported in Gemini API.')
-
   if getv(from_object, ['max_length']) is not None:
     raise ValueError('max_length parameter is not supported in Gemini API.')
 
@@ -196,12 +190,12 @@ def _Schema_to_mldev(
   if getv(from_object, ['min_properties']) is not None:
     raise ValueError('min_properties parameter is not supported in Gemini API.')
 
-  if getv(from_object, ['maximum']) is not None:
-    raise ValueError('maximum parameter is not supported in Gemini API.')
-
   if getv(from_object, ['max_properties']) is not None:
     raise ValueError('max_properties parameter is not supported in Gemini API.')
 
+  if getv(from_object, ['any_of']) is not None:
+    setv(to_object, ['anyOf'], getv(from_object, ['any_of']))
+
   if getv(from_object, ['description']) is not None:
     setv(to_object, ['description'], getv(from_object, ['description']))
 
@@ -217,9 +211,15 @@ def _Schema_to_mldev(
   if getv(from_object, ['max_items']) is not None:
     setv(to_object, ['maxItems'], getv(from_object, ['max_items']))
 
+  if getv(from_object, ['maximum']) is not None:
+    setv(to_object, ['maximum'], getv(from_object, ['maximum']))
+
   if getv(from_object, ['min_items']) is not None:
     setv(to_object, ['minItems'], getv(from_object, ['min_items']))
 
+  if getv(from_object, ['minimum']) is not None:
+    setv(to_object, ['minimum'], getv(from_object, ['minimum']))
+
   if getv(from_object, ['nullable']) is not None:
     setv(to_object, ['nullable'], getv(from_object, ['nullable']))
 
@@ -254,15 +254,9 @@ def _Schema_to_vertex(
   if getv(from_object, ['pattern']) is not None:
     setv(to_object, ['pattern'], getv(from_object, ['pattern']))
 
-  if getv(from_object, ['minimum']) is not None:
-    setv(to_object, ['minimum'], getv(from_object, ['minimum']))
-
   if getv(from_object, ['default']) is not None:
     setv(to_object, ['default'], getv(from_object, ['default']))
 
-  if getv(from_object, ['any_of']) is not None:
-    setv(to_object, ['anyOf'], getv(from_object, ['any_of']))
-
   if getv(from_object, ['max_length']) is not None:
     setv(to_object, ['maxLength'], getv(from_object, ['max_length']))
 
@@ -275,12 +269,12 @@ def _Schema_to_vertex(
   if getv(from_object, ['min_properties']) is not None:
     setv(to_object, ['minProperties'], getv(from_object, ['min_properties']))
 
-  if getv(from_object, ['maximum']) is not None:
-    setv(to_object, ['maximum'], getv(from_object, ['maximum']))
-
   if getv(from_object, ['max_properties']) is not None:
     setv(to_object, ['maxProperties'], getv(from_object, ['max_properties']))
 
+  if getv(from_object, ['any_of']) is not None:
+    setv(to_object, ['anyOf'], getv(from_object, ['any_of']))
+
   if getv(from_object, ['description']) is not None:
     setv(to_object, ['description'], getv(from_object, ['description']))
 
@@ -296,9 +290,15 @@ def _Schema_to_vertex(
   if getv(from_object, ['max_items']) is not None:
     setv(to_object, ['maxItems'], getv(from_object, ['max_items']))
 
+  if getv(from_object, ['maximum']) is not None:
+    setv(to_object, ['maximum'], getv(from_object, ['maximum']))
+
   if getv(from_object, ['min_items']) is not None:
     setv(to_object, ['minItems'], getv(from_object, ['min_items']))
 
+  if getv(from_object, ['minimum']) is not None:
+    setv(to_object, ['minimum'], getv(from_object, ['minimum']))
+
   if getv(from_object, ['nullable']) is not None:
     setv(to_object, ['nullable'], getv(from_object, ['nullable']))
 
@@ -1351,10 +1351,8 @@ def _GenerateImagesConfig_to_mldev(
     raise ValueError('output_gcs_uri parameter is not supported in Gemini API.')
 
   if getv(from_object, ['negative_prompt']) is not None:
-    setv(
-        parent_object,
-        ['parameters', 'negativePrompt'],
-        getv(from_object, ['negative_prompt']),
+    raise ValueError(
+        'negative_prompt parameter is not supported in Gemini API.'
     )
 
   if getv(from_object, ['number_of_images']) is not None:
@@ -1910,10 +1908,8 @@ def _EditImageConfig_to_mldev(
     raise ValueError('output_gcs_uri parameter is not supported in Gemini API.')
 
   if getv(from_object, ['negative_prompt']) is not None:
-    setv(
-        parent_object,
-        ['parameters', 'negativePrompt'],
-        getv(from_object, ['negative_prompt']),
+    raise ValueError(
+        'negative_prompt parameter is not supported in Gemini API.'
     )
 
   if getv(from_object, ['number_of_images']) is not None:
@@ -2003,6 +1999,9 @@ def _EditImageConfig_to_mldev(
         getv(from_object, ['edit_mode']),
     )
 
+  if getv(from_object, ['base_steps']) is not None:
+    raise ValueError('base_steps parameter is not supported in Gemini API.')
+
   return to_object
 
 
@@ -2107,6 +2106,13 @@ def _EditImageConfig_to_vertex(
         getv(from_object, ['edit_mode']),
     )
 
+  if getv(from_object, ['base_steps']) is not None:
+    setv(
+        parent_object,
+        ['parameters', 'editConfig', 'baseSteps'],
+        getv(from_object, ['base_steps']),
+    )
+
   return to_object
 
 
@@ -2813,8 +2819,10 @@ def _GenerateVideosConfig_to_mldev(
     raise ValueError('fps parameter is not supported in Gemini API.')
 
   if getv(from_object, ['duration_seconds']) is not None:
-    raise ValueError(
-        'duration_seconds parameter is not supported in Gemini API.'
+    setv(
+        parent_object,
+        ['parameters', 'durationSeconds'],
+        getv(from_object, ['duration_seconds']),
     )
 
   if getv(from_object, ['seed']) is not None:
@@ -2948,6 +2956,13 @@ def _GenerateVideosParameters_to_mldev(
   if getv(from_object, ['prompt']) is not None:
     setv(to_object, ['instances[0]', 'prompt'], getv(from_object, ['prompt']))
 
+  if getv(from_object, ['image']) is not None:
+    setv(
+        to_object,
+        ['instances[0]', 'image'],
+        _Image_to_mldev(api_client, getv(from_object, ['image']), to_object),
+    )
+
   if getv(from_object, ['config']) is not None:
     setv(
         to_object,
@@ -2976,6 +2991,13 @@ def _GenerateVideosParameters_to_vertex(
   if getv(from_object, ['prompt']) is not None:
     setv(to_object, ['instances[0]', 'prompt'], getv(from_object, ['prompt']))
 
+  if getv(from_object, ['image']) is not None:
+    setv(
+        to_object,
+        ['instances[0]', 'image'],
+        _Image_to_vertex(api_client, getv(from_object, ['image']), to_object),
+    )
+
   if getv(from_object, ['config']) is not None:
     setv(
         to_object,
@@ -3545,6 +3567,48 @@ def _Image_from_vertex(
   return to_object
 
 
+def _SafetyAttributes_from_mldev(
+    api_client: BaseApiClient,
+    from_object: Union[dict, object],
+    parent_object: Optional[dict] = None,
+) -> dict:
+  to_object: dict[str, Any] = {}
+  if getv(from_object, ['safetyAttributes', 'categories']) is not None:
+    setv(
+        to_object,
+        ['categories'],
+        getv(from_object, ['safetyAttributes', 'categories']),
+    )
+
+  if getv(from_object, ['safetyAttributes', 'scores']) is not None:
+    setv(
+        to_object, ['scores'], getv(from_object, ['safetyAttributes', 'scores'])
+    )
+
+  return to_object
+
+
+def _SafetyAttributes_from_vertex(
+    api_client: BaseApiClient,
+    from_object: Union[dict, object],
+    parent_object: Optional[dict] = None,
+) -> dict:
+  to_object: dict[str, Any] = {}
+  if getv(from_object, ['safetyAttributes', 'categories']) is not None:
+    setv(
+        to_object,
+        ['categories'],
+        getv(from_object, ['safetyAttributes', 'categories']),
+    )
+
+  if getv(from_object, ['safetyAttributes', 'scores']) is not None:
+    setv(
+        to_object, ['scores'], getv(from_object, ['safetyAttributes', 'scores'])
+    )
+
+  return to_object
+
+
 def _GeneratedImage_from_mldev(
     api_client: BaseApiClient,
     from_object: Union[dict, object],
@@ -3565,6 +3629,15 @@ def _GeneratedImage_from_mldev(
         getv(from_object, ['raiFilteredReason']),
     )
 
+  if getv(from_object, ['_self']) is not None:
+    setv(
+        to_object,
+        ['safety_attributes'],
+        _SafetyAttributes_from_mldev(
+            api_client, getv(from_object, ['_self']), to_object
+        ),
+    )
+
   return to_object
 
 
@@ -3588,6 +3661,15 @@ def _GeneratedImage_from_vertex(
         getv(from_object, ['raiFilteredReason']),
     )
 
+  if getv(from_object, ['_self']) is not None:
+    setv(
+        to_object,
+        ['safety_attributes'],
+        _SafetyAttributes_from_vertex(
+            api_client, getv(from_object, ['_self']), to_object
+        ),
+    )
+
   if getv(from_object, ['prompt']) is not None:
     setv(to_object, ['enhanced_prompt'], getv(from_object, ['prompt']))
 
@@ -3999,14 +4081,14 @@ def _Video_from_mldev(
     parent_object: Optional[dict] = None,
 ) -> dict:
   to_object: dict[str, Any] = {}
-  if getv(from_object, ['uri']) is not None:
-    setv(to_object, ['uri'], getv(from_object, ['uri']))
+  if getv(from_object, ['video', 'uri']) is not None:
+    setv(to_object, ['uri'], getv(from_object, ['video', 'uri']))
 
-  if getv(from_object, ['encodedVideo']) is not None:
+  if getv(from_object, ['video', 'encodedVideo']) is not None:
     setv(
         to_object,
         ['video_bytes'],
-        t.t_bytes(api_client, getv(from_object, ['encodedVideo'])),
+        t.t_bytes(api_client, getv(from_object, ['video', 'encodedVideo'])),
     )
 
   if getv(from_object, ['encoding']) is not None:
@@ -4075,13 +4157,13 @@ def _GenerateVideosResponse_from_mldev(
     parent_object: Optional[dict] = None,
 ) -> dict:
   to_object: dict[str, Any] = {}
-  if getv(from_object, ['videos']) is not None:
+  if getv(from_object, ['generatedSamples']) is not None:
     setv(
         to_object,
         ['generated_videos'],
         [
             _GeneratedVideo_from_mldev(api_client, item, to_object)
-            for item in getv(from_object, ['videos'])
+            for item in getv(from_object, ['generatedSamples'])
         ],
     )
 
@@ -4247,7 +4329,7 @@ class Models(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -4318,7 +4400,7 @@ class Models(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -4408,7 +4490,7 @@ class Models(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -4498,7 +4580,7 @@ class Models(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -4602,7 +4684,7 @@ class Models(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -4673,7 +4755,7 @@ class Models(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -4735,7 +4817,7 @@ class Models(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -4792,7 +4874,7 @@ class Models(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -4857,7 +4939,7 @@ class Models(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -4918,7 +5000,7 @@ class Models(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -4964,7 +5046,7 @@ class Models(_api_module.BaseModule):
     .. code-block:: python
 
       response = client.models.count_tokens(
-          model='gemini-1.5-flash',
+          model='gemini-2.0-flash',
           contents='What is your name?',
       )
       print(response)
@@ -5006,7 +5088,7 @@ class Models(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -5038,9 +5120,9 @@ class Models(_api_module.BaseModule):
       contents: Union[types.ContentListUnion, types.ContentListUnionDict],
       config: Optional[types.ComputeTokensConfigOrDict] = None,
   ) -> types.ComputeTokensResponse:
-    """Return a list of tokens based on the input contents.
+    """Given a list of contents, returns a corresponding TokensInfo containing the
 
-    Only text is supported.
+    list of tokens and list of token ids.
 
     This method is not supported by the Gemini Developer API.
 
@@ -5053,7 +5135,7 @@ class Models(_api_module.BaseModule):
     .. code-block:: python
 
       response = client.models.compute_tokens(
-          model='gemini-1.5-flash',
+          model='gemini-2.0-flash',
           contents='What is your name?',
       )
       print(response)
@@ -5089,7 +5171,7 @@ class Models(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -5122,6 +5204,7 @@ class Models(_api_module.BaseModule):
       *,
       model: str,
       prompt: Optional[str] = None,
+      image: Optional[types.ImageOrDict] = None,
       config: Optional[types.GenerateVideosConfigOrDict] = None,
   ) -> types.GenerateVideosOperation:
     """Generates videos based on a text description and configuration.
@@ -5149,6 +5232,7 @@ class Models(_api_module.BaseModule):
     parameter_model = types._GenerateVideosParameters(
         model=model,
         prompt=prompt,
+        image=image,
         config=config,
     )
 
@@ -5181,7 +5265,7 @@ class Models(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -5216,21 +5300,21 @@ class Models(_api_module.BaseModule):
     """Makes an API request to generate content using a model.
 
     For the `model` parameter, supported formats for Vertex AI API include:
-    - The Gemini model ID, for example: 'gemini-1.5-flash-002'
+    - The Gemini model ID, for example: 'gemini-2.0-flash'
     - The full resource name starts with 'projects/', for example:
-      'projects/my-project-id/locations/us-central1/publishers/google/models/gemini-1.5-flash-002'
+      'projects/my-project-id/locations/us-central1/publishers/google/models/gemini-2.0-flash'
     - The partial resource name with 'publishers/', for example:
-      'publishers/google/models/gemini-1.5-flash-002' or
+      'publishers/google/models/gemini-2.0-flash' or
       'publishers/meta/models/llama-3.1-405b-instruct-maas'
     - `/` separated publisher and model name, for example:
-      'google/gemini-1.5-flash-002' or 'meta/llama-3.1-405b-instruct-maas'
+      'google/gemini-2.0-flash' or 'meta/llama-3.1-405b-instruct-maas'
 
     For the `model` parameter, supported formats for Gemini API include:
-    - The Gemini model ID, for example: 'gemini-1.5-flash-002'
+    - The Gemini model ID, for example: 'gemini-2.0-flash'
     - The model name starts with 'models/', for example:
-      'models/gemini-1.5-flash-002'
-    - if you would like to use a tuned model, the model name starts with
-      'tunedModels/', for example:
+      'models/gemini-2.0-flash'
+    - For tuned models, the model name starts with 'tunedModels/',
+      for example:
       'tunedModels/1234567890123456789'
 
     Some models support multimodal input and output.
@@ -5247,7 +5331,7 @@ class Models(_api_module.BaseModule):
       )
 
       response = client.models.generate_content(
-        model='gemini-1.5-flash-002',
+        model='gemini-2.0-flash',
         contents='''What is a good name for a flower shop that specializes in
           selling bouquets of dried flowers?'''
       )
@@ -5258,7 +5342,7 @@ class Models(_api_module.BaseModule):
       # * Timeless Petals
 
       response = client.models.generate_content(
-        model='gemini-1.5-flash-002',
+        model='gemini-2.0-flash',
         contents=[
           types.Part.from_text('What is shown in this image?'),
           types.Part.from_uri('gs://generativeai-downloads/images/scones.jpg',
@@ -5279,7 +5363,7 @@ class Models(_api_module.BaseModule):
         f'AFC is enabled with max remote calls: {remaining_remote_calls_afc}.'
     )
     automatic_function_calling_history: list[types.Content] = []
-    response = None
+    response = types.GenerateContentResponse()
     i = 0
     while remaining_remote_calls_afc > 0:
       i += 1
@@ -5315,11 +5399,12 @@ class Models(_api_module.BaseModule):
       contents = t.t_contents(self._api_client, contents)
       if not automatic_function_calling_history:
         automatic_function_calling_history.extend(contents)
-      contents.append(func_call_content)
-      contents.append(func_response_content)
+      if isinstance(contents, list):
+        contents.append(func_call_content)
+        contents.append(func_response_content)
       automatic_function_calling_history.append(func_call_content)
       automatic_function_calling_history.append(func_response_content)
-    if _extra_utils.should_append_afc_history(config):
+    if _extra_utils.should_append_afc_history(config) and response is not None:
       response.automatic_function_calling_history = (
           automatic_function_calling_history
       )
@@ -5335,21 +5420,21 @@ class Models(_api_module.BaseModule):
     """Makes an API request to generate content using a model and yields the model's response in chunks.
 
     For the `model` parameter, supported formats for Vertex AI API include:
-    - The Gemini model ID, for example: 'gemini-1.5-flash-002'
+    - The Gemini model ID, for example: 'gemini-2.0-flash'
     - The full resource name starts with 'projects/', for example:
-      'projects/my-project-id/locations/us-central1/publishers/google/models/gemini-1.5-flash-002'
+      'projects/my-project-id/locations/us-central1/publishers/google/models/gemini-2.0-flash'
     - The partial resource name with 'publishers/', for example:
-      'publishers/google/models/gemini-1.5-flash-002' or
+      'publishers/google/models/gemini-2.0-flash' or
       'publishers/meta/models/llama-3.1-405b-instruct-maas'
     - `/` separated publisher and model name, for example:
-      'google/gemini-1.5-flash-002' or 'meta/llama-3.1-405b-instruct-maas'
+      'google/gemini-2.0-flash' or 'meta/llama-3.1-405b-instruct-maas'
 
     For the `model` parameter, supported formats for Gemini API include:
-    - The Gemini model ID, for example: 'gemini-1.5-flash-002'
+    - The Gemini model ID, for example: 'gemini-2.0-flash'
     - The model name starts with 'models/', for example:
-      'models/gemini-1.5-flash-002'
-    - If you would like to use a tuned model, the model name starts with
-      'tunedModels/', for example:
+      'models/gemini-2.0-flash'
+    - For tuned models, the model name starts with 'tunedModels/',
+      for example:
       'tunedModels/1234567890123456789'
 
     Some models support multimodal input and output.
@@ -5366,7 +5451,7 @@ class Models(_api_module.BaseModule):
       )
 
       for chunk in client.models.generate_content_stream(
-        model='gemini-1.5-flash-002',
+        model='gemini-2.0-flash',
         contents='''What is a good name for a flower shop that specializes in
           selling bouquets of dried flowers?'''
       ):
@@ -5377,7 +5462,7 @@ class Models(_api_module.BaseModule):
       # * Timeless Petals
 
       for chunk in client.models.generate_content_stream(
-        model='gemini-1.5-flash-002',
+        model='gemini-2.0-flash',
         contents=[
           types.Part.from_text('What is shown in this image?'),
           types.Part.from_uri('gs://generativeai-downloads/images/scones.jpg',
@@ -5467,8 +5552,9 @@ class Models(_api_module.BaseModule):
       contents = t.t_contents(self._api_client, contents)
       if not automatic_function_calling_history:
         automatic_function_calling_history.extend(contents)
-      contents.append(func_call_content)
-      contents.append(func_response_content)
+      if isinstance(contents, list):
+        contents.append(func_call_content)
+        contents.append(func_response_content)
       automatic_function_calling_history.append(func_call_content)
       automatic_function_calling_history.append(func_response_content)
 
@@ -5623,7 +5709,7 @@ class AsyncModels(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -5694,7 +5780,7 @@ class AsyncModels(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -5789,7 +5875,7 @@ class AsyncModels(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -5879,7 +5965,7 @@ class AsyncModels(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -5983,7 +6069,7 @@ class AsyncModels(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -6054,7 +6140,7 @@ class AsyncModels(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -6116,7 +6202,7 @@ class AsyncModels(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -6173,7 +6259,7 @@ class AsyncModels(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -6238,7 +6324,7 @@ class AsyncModels(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -6299,7 +6385,7 @@ class AsyncModels(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -6345,7 +6431,7 @@ class AsyncModels(_api_module.BaseModule):
     .. code-block:: python
 
       response = await client.aio.models.count_tokens(
-          model='gemini-1.5-flash',
+          model='gemini-2.0-flash',
           contents='What is your name?',
       )
       print(response)
@@ -6387,7 +6473,7 @@ class AsyncModels(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -6419,11 +6505,10 @@ class AsyncModels(_api_module.BaseModule):
       contents: Union[types.ContentListUnion, types.ContentListUnionDict],
       config: Optional[types.ComputeTokensConfigOrDict] = None,
   ) -> types.ComputeTokensResponse:
-    """Return a list of tokens based on the input contents.
+    """Given a list of contents, returns a corresponding TokensInfo containing the
 
-    Only text is supported.
+    list of tokens and list of token ids.
 
-    This method is not supported by the Gemini Developer API.
 
     Args:
       model (str): The model to use.
@@ -6434,7 +6519,7 @@ class AsyncModels(_api_module.BaseModule):
     .. code-block:: python
 
       response = await client.aio.models.compute_tokens(
-          model='gemini-1.5-flash',
+          model='gemini-2.0-flash',
           contents='What is your name?',
       )
       print(response)
@@ -6470,7 +6555,7 @@ class AsyncModels(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -6503,6 +6588,7 @@ class AsyncModels(_api_module.BaseModule):
       *,
       model: str,
       prompt: Optional[str] = None,
+      image: Optional[types.ImageOrDict] = None,
       config: Optional[types.GenerateVideosConfigOrDict] = None,
   ) -> types.GenerateVideosOperation:
     """Generates videos based on a text description and configuration.
@@ -6530,6 +6616,7 @@ class AsyncModels(_api_module.BaseModule):
     parameter_model = types._GenerateVideosParameters(
         model=model,
         prompt=prompt,
+        image=image,
         config=config,
     )
 
@@ -6562,7 +6649,7 @@ class AsyncModels(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -6610,7 +6697,7 @@ class AsyncModels(_api_module.BaseModule):
       )
 
       response = await client.aio.models.generate_content(
-          model='gemini-1.5-flash-002',
+          model='gemini-2.0-flash',
           contents='User input: I like bagels. Answer:',
           config=types.GenerateContentConfig(
               system_instruction=
@@ -6632,7 +6719,7 @@ class AsyncModels(_api_module.BaseModule):
         f'AFC is enabled with max remote calls: {remaining_remote_calls_afc}.'
     )
     automatic_function_calling_history: list[types.Content] = []
-    response = None
+    response = types.GenerateContentResponse()
     while remaining_remote_calls_afc > 0:
       response = await self._generate_content(
           model=model, contents=contents, config=config
@@ -6665,12 +6752,13 @@ class AsyncModels(_api_module.BaseModule):
       contents = t.t_contents(self._api_client, contents)
       if not automatic_function_calling_history:
         automatic_function_calling_history.extend(contents)
-      contents.append(func_call_content)
-      contents.append(func_response_content)
+      if isinstance(contents, list):
+        contents.append(func_call_content)
+        contents.append(func_response_content)
       automatic_function_calling_history.append(func_call_content)
       automatic_function_calling_history.append(func_response_content)
 
-    if _extra_utils.should_append_afc_history(config):
+    if _extra_utils.should_append_afc_history(config) and response is not None:
       response.automatic_function_calling_history = (
           automatic_function_calling_history
       )
@@ -6686,21 +6774,21 @@ class AsyncModels(_api_module.BaseModule):
     """Makes an API request to generate content using a model and yields the model's response in chunks.
 
     For the `model` parameter, supported formats for Vertex AI API include:
-    - The Gemini model ID, for example: 'gemini-1.5-flash-002'
+    - The Gemini model ID, for example: 'gemini-2.0-flash'
     - The full resource name starts with 'projects/', for example:
-      'projects/my-project-id/locations/us-central1/publishers/google/models/gemini-1.5-flash-002'
+      'projects/my-project-id/locations/us-central1/publishers/google/models/gemini-2.0-flash'
     - The partial resource name with 'publishers/', for example:
-      'publishers/google/models/gemini-1.5-flash-002' or
+      'publishers/google/models/gemini-2.0-flash' or
       'publishers/meta/models/llama-3.1-405b-instruct-maas'
     - `/` separated publisher and model name, for example:
-      'google/gemini-1.5-flash-002' or 'meta/llama-3.1-405b-instruct-maas'
+      'google/gemini-2.0-flash' or 'meta/llama-3.1-405b-instruct-maas'
 
     For the `model` parameter, supported formats for Gemini API include:
-    - The Gemini model ID, for example: 'gemini-1.5-flash-002'
+    - The Gemini model ID, for example: 'gemini-2.0-flash'
     - The model name starts with 'models/', for example:
-      'models/gemini-1.5-flash-002'
-    - If you would like to use a tuned model, the model name starts with
-      'tunedModels/', for example:
+      'models/gemini-2.0-flash'
+    - For tuned models, the model name starts with 'tunedModels/',
+      for example:
       'tunedModels/1234567890123456789'
 
     Some models support multimodal input and output.
@@ -6717,7 +6805,7 @@ class AsyncModels(_api_module.BaseModule):
       )
 
       async for chunk in await client.aio.models.generate_content_stream(
-        model='gemini-1.5-flash-002',
+        model='gemini-2.0-flash',
         contents='''What is a good name for a flower shop that specializes in
           selling bouquets of dried flowers?'''
       ):
@@ -6728,7 +6816,7 @@ class AsyncModels(_api_module.BaseModule):
       # * Timeless Petals
 
       async for chunk in awiat client.aio.models.generate_content_stream(
-        model='gemini-1.5-flash-002',
+        model='gemini-2.0-flash',
         contents=[
           types.Part.from_text('What is shown in this image?'),
           types.Part.from_uri('gs://generativeai-downloads/images/scones.jpg',
@@ -6827,8 +6915,9 @@ class AsyncModels(_api_module.BaseModule):
         contents = t.t_contents(self._api_client, contents)
         if not automatic_function_calling_history:
           automatic_function_calling_history.extend(contents)
-        contents.append(func_call_content)
-        contents.append(func_response_content)
+        if isinstance(contents, list):
+          contents.append(func_call_content)
+          contents.append(func_response_content)
         automatic_function_calling_history.append(func_call_content)
         automatic_function_calling_history.append(func_response_content)