google-genai 1.28.0__py3-none-any.whl → 1.30.0__py3-none-any.whl

google/genai/models.py

@@ -340,6 +340,11 @@ def _GoogleSearch_to_mldev(
         _Interval_to_mldev(getv(from_object, ['time_range_filter']), to_object),
     )
 
+  if getv(from_object, ['exclude_domains']) is not None:
+    raise ValueError(
+        'exclude_domains parameter is not supported in Gemini API.'
+    )
+
   return to_object
 
 
@@ -387,6 +392,17 @@ def _UrlContext_to_mldev(
   return to_object
 
 
+def _ToolComputerUse_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, ['environment']) is not None:
+    setv(to_object, ['environment'], getv(from_object, ['environment']))
+
+  return to_object
+
+
 def _Tool_to_mldev(
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
@@ -436,12 +452,18 @@ def _Tool_to_mldev(
         _UrlContext_to_mldev(getv(from_object, ['url_context']), to_object),
     )
 
+  if getv(from_object, ['computer_use']) is not None:
+    setv(
+        to_object,
+        ['computerUse'],
+        _ToolComputerUse_to_mldev(
+            getv(from_object, ['computer_use']), to_object
+        ),
+    )
+
   if getv(from_object, ['code_execution']) is not None:
     setv(to_object, ['codeExecution'], getv(from_object, ['code_execution']))
 
-  if getv(from_object, ['computer_use']) is not None:
-    setv(to_object, ['computerUse'], getv(from_object, ['computer_use']))
-
   return to_object
 
 
@@ -997,7 +1019,11 @@ def _GenerateImagesConfig_to_mldev(
     raise ValueError('add_watermark parameter is not supported in Gemini API.')
 
   if getv(from_object, ['image_size']) is not None:
-    raise ValueError('image_size parameter is not supported in Gemini API.')
+    setv(
+        parent_object,
+        ['parameters', 'sampleImageSize'],
+        getv(from_object, ['image_size']),
+    )
 
   if getv(from_object, ['enhance_prompt']) is not None:
     raise ValueError('enhance_prompt parameter is not supported in Gemini API.')
@@ -1242,15 +1268,6 @@ def _Image_to_mldev(
   return to_object
 
 
-def _GenerateVideosSource_to_mldev(
-    from_object: Union[dict[str, Any], object],
-    parent_object: Optional[dict[str, Any]] = None,
-) -> dict[str, Any]:
-  to_object: dict[str, Any] = {}
-
-  return to_object
-
-
 def _GenerateVideosConfig_to_mldev(
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
@@ -1690,6 +1707,9 @@ def _GoogleSearch_to_vertex(
         ),
     )
 
+  if getv(from_object, ['exclude_domains']) is not None:
+    setv(to_object, ['excludeDomains'], getv(from_object, ['exclude_domains']))
+
   return to_object
 
 
@@ -1733,6 +1753,8 @@ def _EnterpriseWebSearch_to_vertex(
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
   to_object: dict[str, Any] = {}
+  if getv(from_object, ['exclude_domains']) is not None:
+    setv(to_object, ['excludeDomains'], getv(from_object, ['exclude_domains']))
 
   return to_object
 
@@ -1812,6 +1834,17 @@ def _UrlContext_to_vertex(
   return to_object
 
 
+def _ToolComputerUse_to_vertex(
+    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, ['environment']) is not None:
+    setv(to_object, ['environment'], getv(from_object, ['environment']))
+
+  return to_object
+
+
 def _Tool_to_vertex(
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
@@ -1871,12 +1904,18 @@ def _Tool_to_vertex(
         _UrlContext_to_vertex(getv(from_object, ['url_context']), to_object),
     )
 
+  if getv(from_object, ['computer_use']) is not None:
+    setv(
+        to_object,
+        ['computerUse'],
+        _ToolComputerUse_to_vertex(
+            getv(from_object, ['computer_use']), to_object
+        ),
+    )
+
   if getv(from_object, ['code_execution']) is not None:
     setv(to_object, ['codeExecution'], getv(from_object, ['code_execution']))
 
-  if getv(from_object, ['computer_use']) is not None:
-    setv(to_object, ['computerUse'], getv(from_object, ['computer_use']))
-
   return to_object
 
 
@@ -2839,6 +2878,153 @@ def _UpscaleImageAPIParameters_to_vertex(
   return to_object
 
 
+def _ProductImage_to_vertex(
+    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, ['product_image']) is not None:
+    setv(
+        to_object,
+        ['image'],
+        _Image_to_vertex(getv(from_object, ['product_image']), to_object),
+    )
+
+  return to_object
+
+
+def _RecontextImageSource_to_vertex(
+    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, ['prompt']) is not None:
+    setv(
+        parent_object, ['instances[0]', 'prompt'], getv(from_object, ['prompt'])
+    )
+
+  if getv(from_object, ['person_image']) is not None:
+    setv(
+        parent_object,
+        ['instances[0]', 'personImage', 'image'],
+        _Image_to_vertex(getv(from_object, ['person_image']), to_object),
+    )
+
+  if getv(from_object, ['product_images']) is not None:
+    setv(
+        parent_object,
+        ['instances[0]', 'productImages'],
+        [
+            _ProductImage_to_vertex(item, to_object)
+            for item in getv(from_object, ['product_images'])
+        ],
+    )
+
+  return to_object
+
+
+def _RecontextImageConfig_to_vertex(
+    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, ['number_of_images']) is not None:
+    setv(
+        parent_object,
+        ['parameters', 'sampleCount'],
+        getv(from_object, ['number_of_images']),
+    )
+
+  if getv(from_object, ['base_steps']) is not None:
+    setv(
+        parent_object,
+        ['parameters', 'editConfig', 'baseSteps'],
+        getv(from_object, ['base_steps']),
+    )
+
+  if getv(from_object, ['output_gcs_uri']) is not None:
+    setv(
+        parent_object,
+        ['parameters', 'storageUri'],
+        getv(from_object, ['output_gcs_uri']),
+    )
+
+  if getv(from_object, ['seed']) is not None:
+    setv(parent_object, ['parameters', 'seed'], getv(from_object, ['seed']))
+
+  if getv(from_object, ['safety_filter_level']) is not None:
+    setv(
+        parent_object,
+        ['parameters', 'safetySetting'],
+        getv(from_object, ['safety_filter_level']),
+    )
+
+  if getv(from_object, ['person_generation']) is not None:
+    setv(
+        parent_object,
+        ['parameters', 'personGeneration'],
+        getv(from_object, ['person_generation']),
+    )
+
+  if getv(from_object, ['output_mime_type']) is not None:
+    setv(
+        parent_object,
+        ['parameters', 'outputOptions', 'mimeType'],
+        getv(from_object, ['output_mime_type']),
+    )
+
+  if getv(from_object, ['output_compression_quality']) is not None:
+    setv(
+        parent_object,
+        ['parameters', 'outputOptions', 'compressionQuality'],
+        getv(from_object, ['output_compression_quality']),
+    )
+
+  if getv(from_object, ['enhance_prompt']) is not None:
+    setv(
+        parent_object,
+        ['parameters', 'enhancePrompt'],
+        getv(from_object, ['enhance_prompt']),
+    )
+
+  return to_object
+
+
+def _RecontextImageParameters_to_vertex(
+    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, ['model']) is not None:
+    setv(
+        to_object,
+        ['_url', 'model'],
+        t.t_model(api_client, getv(from_object, ['model'])),
+    )
+
+  if getv(from_object, ['source']) is not None:
+    setv(
+        to_object,
+        ['config'],
+        _RecontextImageSource_to_vertex(
+            getv(from_object, ['source']), to_object
+        ),
+    )
+
+  if getv(from_object, ['config']) is not None:
+    setv(
+        to_object,
+        ['config'],
+        _RecontextImageConfig_to_vertex(
+            getv(from_object, ['config']), to_object
+        ),
+    )
+
+  return to_object
+
+
 def _GetModelParameters_to_vertex(
     api_client: BaseApiClient,
     from_object: Union[dict[str, Any], object],
@@ -3090,15 +3276,6 @@ def _Video_to_vertex(
   return to_object
 
 
-def _GenerateVideosSource_to_vertex(
-    from_object: Union[dict[str, Any], object],
-    parent_object: Optional[dict[str, Any]] = None,
-) -> dict[str, Any]:
-  to_object: dict[str, Any] = {}
-
-  return to_object
-
-
 def _GenerateVideosConfig_to_vertex(
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
@@ -3518,6 +3695,9 @@ def _GenerateContentResponse_from_mldev(
   if getv(from_object, ['promptFeedback']) is not None:
     setv(to_object, ['prompt_feedback'], getv(from_object, ['promptFeedback']))
 
+  if getv(from_object, ['responseId']) is not None:
+    setv(to_object, ['response_id'], getv(from_object, ['responseId']))
+
   if getv(from_object, ['usageMetadata']) is not None:
     setv(to_object, ['usage_metadata'], getv(from_object, ['usageMetadata']))
 
@@ -4170,15 +4350,15 @@ def _GenerateContentResponse_from_vertex(
   if getv(from_object, ['createTime']) is not None:
     setv(to_object, ['create_time'], getv(from_object, ['createTime']))
 
-  if getv(from_object, ['responseId']) is not None:
-    setv(to_object, ['response_id'], getv(from_object, ['responseId']))
-
   if getv(from_object, ['modelVersion']) is not None:
     setv(to_object, ['model_version'], getv(from_object, ['modelVersion']))
 
   if getv(from_object, ['promptFeedback']) is not None:
     setv(to_object, ['prompt_feedback'], getv(from_object, ['promptFeedback']))
 
+  if getv(from_object, ['responseId']) is not None:
+    setv(to_object, ['response_id'], getv(from_object, ['responseId']))
+
   if getv(from_object, ['usageMetadata']) is not None:
     setv(to_object, ['usage_metadata'], getv(from_object, ['usageMetadata']))
 
@@ -4420,6 +4600,24 @@ def _UpscaleImageResponse_from_vertex(
   return to_object
 
 
+def _RecontextImageResponse_from_vertex(
+    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, ['predictions']) is not None:
+    setv(
+        to_object,
+        ['generated_images'],
+        [
+            _GeneratedImage_from_vertex(item, to_object)
+            for item in getv(from_object, ['predictions'])
+        ],
+    )
+
+  return to_object
+
+
 def _Endpoint_from_vertex(
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
@@ -5207,6 +5405,112 @@ class Models(_api_module.BaseModule):
     self._api_client._verify_response(return_value)
     return return_value
 
+  def recontext_image(
+      self,
+      *,
+      model: str,
+      source: types.RecontextImageSourceOrDict,
+      config: Optional[types.RecontextImageConfigOrDict] = None,
+  ) -> types.RecontextImageResponse:
+    """Recontextualizes an image.
+
+    There are two types of recontextualization currently supported:
+    1) Imagen Product Recontext - Generate images of products in new scenes
+       and contexts.
+    2) Virtual Try-On: Generate images of persons modeling fashion products.
+
+    Args:
+      model (str): The model to use.
+      source (RecontextImageSource): An object containing the source inputs
+        (prompt, person_image, product_images) for image recontext. prompt is
+        optional for product recontext and disallowed for virtual try-on.
+        person_image is required for virtual try-on, disallowed for product
+        recontext. product_images is required for both product recontext and
+        virtual try-on. Only one product image is supported for virtual try-on,
+        and up to 3 product images (different angles of the same product) are
+        supported for product recontext.
+      config (RecontextImageConfig): Configuration for recontextualization.
+
+    Usage:
+
+      ```
+      product_recontext_response = client.models.recontext_image(
+          model="imagen-product-recontext-preview-06-30",
+          source=types.RecontextImageSource(
+              prompt="In a modern kitchen setting.",
+              product_images=[types.ProductImage.from_file(IMAGE_FILE_PATH)],
+          ),
+          config=types.RecontextImageConfig(
+              number_of_images=1,
+          ),
+      )
+      image = product_recontext_response.generated_images[0].image
+
+      virtual_try_on_response = client.models.recontext_image(
+          model="virtual-try-on-preview-08-04",
+          source=types.RecontextImageSource(
+              person_image=types.Image.from_file(IMAGE1_FILE_PATH),
+              product_images=[types.ProductImage.from_file(IMAGE2_FILE_PATH)],
+          ),
+          config=types.RecontextImageConfig(
+              number_of_images=1,
+          ),
+      )
+      image = virtual_try_on_response.generated_images[0].image
+      ```
+    """
+
+    parameter_model = types._RecontextImageParameters(
+        model=model,
+        source=source,
+        config=config,
+    )
+
+    request_url_dict: Optional[dict[str, str]]
+    if not self._api_client.vertexai:
+      raise ValueError('This method is only supported in the Vertex AI client.')
+    else:
+      request_dict = _RecontextImageParameters_to_vertex(
+          self._api_client, parameter_model
+      )
+      request_url_dict = request_dict.get('_url')
+      if request_url_dict:
+        path = '{model}:predict'.format_map(request_url_dict)
+      else:
+        path = '{model}:predict'
+
+    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
+    )
+
+    response_dict = '' if not response.body else json.loads(response.body)
+
+    if self._api_client.vertexai:
+      response_dict = _RecontextImageResponse_from_vertex(response_dict)
+
+    return_value = types.RecontextImageResponse._from_response(
+        response=response_dict, kwargs=parameter_model.model_dump()
+    )
+
+    self._api_client._verify_response(return_value)
+    return return_value
+
   def get(
       self, *, model: str, config: Optional[types.GetModelConfigOrDict] = None
   ) -> types.Model:
@@ -5746,7 +6050,7 @@ class Models(_api_module.BaseModule):
       self,
       *,
       model: str,
-      contents: Union[types.ContentListUnion, types.ContentListUnionDict],
+      contents: types.ContentListUnionDict,
       config: Optional[types.GenerateContentConfigOrDict] = None,
   ) -> types.GenerateContentResponse:
     """Makes an API request to generate content using a model.
@@ -5757,9 +6061,8 @@ class Models(_api_module.BaseModule):
       '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-2.0-flash' or
-      'publishers/meta/models/llama-3.1-405b-instruct-maas'
     - `/` separated publisher and model name, for example:
-      'google/gemini-2.0-flash' or 'meta/llama-3.1-405b-instruct-maas'
+      'google/gemini-2.0-flash'
 
     For the `model` parameter, supported formats for Gemini API include:
     - The Gemini model ID, for example: 'gemini-2.0-flash'
@@ -5882,7 +6185,7 @@ class Models(_api_module.BaseModule):
       self,
       *,
       model: str,
-      contents: Union[types.ContentListUnion, types.ContentListUnionDict],
+      contents: types.ContentListUnionDict,
       config: Optional[types.GenerateContentConfigOrDict] = None,
   ) -> Iterator[types.GenerateContentResponse]:
     """Makes an API request to generate content using a model and yields the model's response in chunks.
@@ -5893,9 +6196,8 @@ class Models(_api_module.BaseModule):
       '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-2.0-flash' or
-      'publishers/meta/models/llama-3.1-405b-instruct-maas'
     - `/` separated publisher and model name, for example:
-      'google/gemini-2.0-flash' or 'meta/llama-3.1-405b-instruct-maas'
+      'google/gemini-2.0-flash'
 
     For the `model` parameter, supported formats for Gemini API include:
     - The Gemini model ID, for example: 'gemini-2.0-flash'
@@ -6832,6 +7134,112 @@ class AsyncModels(_api_module.BaseModule):
     self._api_client._verify_response(return_value)
     return return_value
 
+  async def recontext_image(
+      self,
+      *,
+      model: str,
+      source: types.RecontextImageSourceOrDict,
+      config: Optional[types.RecontextImageConfigOrDict] = None,
+  ) -> types.RecontextImageResponse:
+    """Recontextualizes an image.
+
+    There are two types of recontextualization currently supported:
+    1) Imagen Product Recontext - Generate images of products in new scenes
+       and contexts.
+    2) Virtual Try-On: Generate images of persons modeling fashion products.
+
+    Args:
+      model (str): The model to use.
+      source (RecontextImageSource): An object containing the source inputs
+        (prompt, person_image, product_images) for image recontext. prompt is
+        optional for product recontext and disallowed for virtual try-on.
+        person_image is required for virtual try-on, disallowed for product
+        recontext. product_images is required for both product recontext and
+        virtual try-on. Only one product image is supported for virtual try-on,
+        and up to 3 product images (different angles of the same product) are
+        supported for product recontext.
+      config (RecontextImageConfig): Configuration for recontextualization.
+
+    Usage:
+
+      ```
+      product_recontext_response = client.models.recontext_image(
+          model="imagen-product-recontext-preview-06-30",
+          source=types.RecontextImageSource(
+              prompt="In a modern kitchen setting.",
+              product_images=[types.ProductImage.from_file(IMAGE_FILE_PATH)],
+          ),
+          config=types.RecontextImageConfig(
+              number_of_images=1,
+          ),
+      )
+      image = product_recontext_response.generated_images[0].image
+
+      virtual_try_on_response = client.models.recontext_image(
+          model="virtual-try-on-preview-08-04",
+          source=types.RecontextImageSource(
+              person_image=types.Image.from_file(IMAGE1_FILE_PATH),
+              product_images=[types.ProductImage.from_file(IMAGE2_FILE_PATH)],
+          ),
+          config=types.RecontextImageConfig(
+              number_of_images=1,
+          ),
+      )
+      image = virtual_try_on_response.generated_images[0].image
+      ```
+    """
+
+    parameter_model = types._RecontextImageParameters(
+        model=model,
+        source=source,
+        config=config,
+    )
+
+    request_url_dict: Optional[dict[str, str]]
+    if not self._api_client.vertexai:
+      raise ValueError('This method is only supported in the Vertex AI client.')
+    else:
+      request_dict = _RecontextImageParameters_to_vertex(
+          self._api_client, parameter_model
+      )
+      request_url_dict = request_dict.get('_url')
+      if request_url_dict:
+        path = '{model}:predict'.format_map(request_url_dict)
+      else:
+        path = '{model}:predict'
+
+    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
+    )
+
+    response_dict = '' if not response.body else json.loads(response.body)
+
+    if self._api_client.vertexai:
+      response_dict = _RecontextImageResponse_from_vertex(response_dict)
+
+    return_value = types.RecontextImageResponse._from_response(
+        response=response_dict, kwargs=parameter_model.model_dump()
+    )
+
+    self._api_client._verify_response(return_value)
+    return return_value
+
   async def get(
       self, *, model: str, config: Optional[types.GetModelConfigOrDict] = None
   ) -> types.Model:
@@ -7490,9 +7898,8 @@ class AsyncModels(_api_module.BaseModule):
       '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-2.0-flash' or
-      'publishers/meta/models/llama-3.1-405b-instruct-maas'
     - `/` separated publisher and model name, for example:
-      'google/gemini-2.0-flash' or 'meta/llama-3.1-405b-instruct-maas'
+      'google/gemini-2.0-flash'
 
     For the `model` parameter, supported formats for Gemini API include:
     - The Gemini model ID, for example: 'gemini-2.0-flash'

google/genai/tokens.py

@@ -292,6 +292,7 @@ class AsyncTokens(_api_module.BaseModule):
     Usage:
 
     .. code-block:: python
+
       client = genai.Client(
           api_key=API_KEY,
           http_options=types.HttpOptions(api_version='v1alpha'),