google-genai 1.29.0__py3-none-any.whl → 1.31.0__py3-none-any.whl

google/genai/batches.py

@@ -30,6 +30,7 @@ from ._common import get_value_by_path as getv
 from ._common import set_value_by_path as setv
 from .pagers import AsyncPager, Pager
 
+
 logger = logging.getLogger('google_genai.batches')
 
 
@@ -338,6 +339,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
 
 
@@ -385,6 +391,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,
@@ -434,12 +451,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
 
 
@@ -2235,6 +2258,17 @@ class Batches(_api_module.BaseModule):
       )
       print(batch_job.state)
     """
+    parameter_model = types._CreateBatchJobParameters(
+        model=model,
+        src=src,
+        config=config,
+    )
+    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
     if self._api_client.vertexai:
       if isinstance(src, list):
         raise ValueError(
@@ -2243,6 +2277,65 @@ class Batches(_api_module.BaseModule):
         )
 
       config = _extra_utils.format_destination(src, config)
+    else:
+      if isinstance(parameter_model.src, list) or (
+          not isinstance(parameter_model.src, str)
+          and parameter_model.src
+          and parameter_model.src.inlined_requests
+      ):
+        # Handle system instruction in InlinedRequests.
+        request_url_dict: Optional[dict[str, str]]
+        request_dict: dict[str, Any] = _CreateBatchJobParameters_to_mldev(
+            self._api_client, parameter_model
+        )
+        request_url_dict = request_dict.get('_url')
+        if request_url_dict:
+          path = '{model}:batchGenerateContent'.format_map(request_url_dict)
+        else:
+          path = '{model}:batchGenerateContent'
+        query_params = request_dict.get('_query')
+        if query_params:
+          path = f'{path}?{urlencode(query_params)}'
+        request_dict.pop('config', None)
+
+        request_dict = _common.convert_to_dict(request_dict)
+        request_dict = _common.encode_unserializable_types(request_dict)
+        # Move system instruction to 'request':
+        # {'systemInstruction': system_instruction}
+        requests = []
+        batch_dict = request_dict.get('batch')
+        if batch_dict and isinstance(batch_dict, dict):
+          input_config_dict = batch_dict.get('inputConfig')
+          if input_config_dict and isinstance(input_config_dict, dict):
+            requests_dict = input_config_dict.get('requests')
+            if requests_dict and isinstance(requests_dict, dict):
+              requests = requests_dict.get('requests')
+        new_requests = []
+        if requests:
+          for req in requests:
+            if req.get('systemInstruction'):
+              value = req.pop('systemInstruction')
+              req['request'].update({'systemInstruction': value})
+            new_requests.append(req)
+        request_dict['batch']['inputConfig']['requests'][  # type: ignore
+            'requests'
+        ] = new_requests
+
+        response = self._api_client.request(
+            'post', path, request_dict, http_options
+        )
+
+        response_dict = '' if not response.body else json.loads(response.body)
+
+        response_dict = _BatchJob_from_mldev(response_dict)
+
+        return_value = types.BatchJob._from_response(
+            response=response_dict, kwargs=parameter_model.model_dump()
+        )
+
+        self._api_client._verify_response(return_value)
+        return return_value
+
     return self._create(model=model, src=src, config=config)
 
   def list(
@@ -2669,6 +2762,17 @@ class AsyncBatches(_api_module.BaseModule):
           src="gs://path/to/input/data",
       )
     """
+    parameter_model = types._CreateBatchJobParameters(
+        model=model,
+        src=src,
+        config=config,
+    )
+    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
     if self._api_client.vertexai:
       if isinstance(src, list):
         raise ValueError(
@@ -2677,6 +2781,65 @@ class AsyncBatches(_api_module.BaseModule):
         )
 
       config = _extra_utils.format_destination(src, config)
+    else:
+      if isinstance(parameter_model.src, list) or (
+          not isinstance(parameter_model.src, str)
+          and parameter_model.src
+          and parameter_model.src.inlined_requests
+      ):
+        # Handle system instruction in InlinedRequests.
+        request_url_dict: Optional[dict[str, str]]
+        request_dict: dict[str, Any] = _CreateBatchJobParameters_to_mldev(
+            self._api_client, parameter_model
+        )
+        request_url_dict = request_dict.get('_url')
+        if request_url_dict:
+          path = '{model}:batchGenerateContent'.format_map(request_url_dict)
+        else:
+          path = '{model}:batchGenerateContent'
+        query_params = request_dict.get('_query')
+        if query_params:
+          path = f'{path}?{urlencode(query_params)}'
+        request_dict.pop('config', None)
+
+        request_dict = _common.convert_to_dict(request_dict)
+        request_dict = _common.encode_unserializable_types(request_dict)
+        # Move system instruction to 'request':
+        # {'systemInstruction': system_instruction}
+        requests = []
+        batch_dict = request_dict.get('batch')
+        if batch_dict and isinstance(batch_dict, dict):
+          input_config_dict = batch_dict.get('inputConfig')
+          if input_config_dict and isinstance(input_config_dict, dict):
+            requests_dict = input_config_dict.get('requests')
+            if requests_dict and isinstance(requests_dict, dict):
+              requests = requests_dict.get('requests')
+        new_requests = []
+        if requests:
+          for req in requests:
+            if req.get('systemInstruction'):
+              value = req.pop('systemInstruction')
+              req['request'].update({'systemInstruction': value})
+            new_requests.append(req)
+        request_dict['batch']['inputConfig']['requests'][  # type: ignore
+            'requests'
+        ] = new_requests
+
+        response = await self._api_client.async_request(
+            'post', path, request_dict, http_options
+        )
+
+        response_dict = '' if not response.body else json.loads(response.body)
+
+        response_dict = _BatchJob_from_mldev(response_dict)
+
+        return_value = types.BatchJob._from_response(
+            response=response_dict, kwargs=parameter_model.model_dump()
+        )
+
+        self._api_client._verify_response(return_value)
+        return return_value
+
     return await self._create(model=model, src=src, config=config)
 
   async def list(

google/genai/caches.py

@@ -29,6 +29,7 @@ from ._common import get_value_by_path as getv
 from ._common import set_value_by_path as setv
 from .pagers import AsyncPager, Pager
 
+
 logger = logging.getLogger('google_genai.caches')
 
 
@@ -231,6 +232,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
 
 
@@ -278,6 +284,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,
@@ -327,12 +344,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
 
 
@@ -811,6 +834,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
 
 
@@ -854,6 +880,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
 
@@ -933,6 +961,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,
@@ -992,12 +1031,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
 
 

google/genai/chats.py

@@ -454,6 +454,7 @@ class AsyncChat(_BaseChat):
     Usage:
 
     .. code-block:: python
+
       chat = client.aio.chats.create(model='gemini-2.0-flash')
       async for chunk in await chat.send_message_stream('tell me a story'):
         print(chunk.text)

google/genai/files.py

@@ -31,6 +31,7 @@ from ._common import get_value_by_path as getv
 from ._common import set_value_by_path as setv
 from .pagers import AsyncPager, Pager
 
+
 logger = logging.getLogger('google_genai.files')
 
 

google/genai/live.py

@@ -187,29 +187,30 @@ class AsyncSession:
         and will not return until you send `turn_complete=True`.
 
     Example:
-    ```
-    import google.genai
-    from google.genai import types
-    import os
 
-    if os.environ.get('GOOGLE_GENAI_USE_VERTEXAI'):
-      MODEL_NAME = 'gemini-2.0-flash-live-preview-04-09'
-    else:
-      MODEL_NAME = 'gemini-live-2.5-flash-preview';
-
-    client = genai.Client()
-    async with client.aio.live.connect(
-        model=MODEL_NAME,
-        config={"response_modalities": ["TEXT"]}
-    ) as session:
-      await session.send_client_content(
-          turns=types.Content(
-              role='user',
-              parts=[types.Part(text="Hello world!")]))
-      async for msg in session.receive():
-        if msg.text:
-          print(msg.text)
-    ```
+    .. code-block:: python
+
+      import google.genai
+      from google.genai import types
+      import os
+
+      if os.environ.get('GOOGLE_GENAI_USE_VERTEXAI'):
+        MODEL_NAME = 'gemini-2.0-flash-live-preview-04-09'
+      else:
+        MODEL_NAME = 'gemini-live-2.5-flash-preview';
+
+      client = genai.Client()
+      async with client.aio.live.connect(
+          model=MODEL_NAME,
+          config={"response_modalities": ["TEXT"]}
+      ) as session:
+        await session.send_client_content(
+            turns=types.Content(
+                role='user',
+                parts=[types.Part(text="Hello world!")]))
+        async for msg in session.receive():
+          if msg.text:
+            print(msg.text)
     """
     client_content = t.t_client_content(turns, turn_complete).model_dump(
         mode='json', exclude_none=True
@@ -253,39 +254,40 @@ class AsyncSession:
       media: A `Blob`-like object, the realtime media to send.
 
     Example:
-    ```
-    from pathlib import Path
 
-    from google import genai
-    from google.genai import types
+    .. code-block:: python
 
-    import PIL.Image
+      from pathlib import Path
 
-    import os
+      from google import genai
+      from google.genai import types
 
-    if os.environ.get('GOOGLE_GENAI_USE_VERTEXAI'):
-      MODEL_NAME = 'gemini-2.0-flash-live-preview-04-09'
-    else:
-      MODEL_NAME = 'gemini-live-2.5-flash-preview';
+      import PIL.Image
 
+      import os
 
-    client = genai.Client()
+      if os.environ.get('GOOGLE_GENAI_USE_VERTEXAI'):
+        MODEL_NAME = 'gemini-2.0-flash-live-preview-04-09'
+      else:
+        MODEL_NAME = 'gemini-live-2.5-flash-preview';
 
-    async with client.aio.live.connect(
-        model=MODEL_NAME,
-        config={"response_modalities": ["TEXT"]},
-    ) as session:
-      await session.send_realtime_input(
-          media=PIL.Image.open('image.jpg'))
 
-      audio_bytes = Path('audio.pcm').read_bytes()
-      await session.send_realtime_input(
-          media=types.Blob(data=audio_bytes, mime_type='audio/pcm;rate=16000'))
+      client = genai.Client()
 
-      async for msg in session.receive():
-        if msg.text is not None:
-          print(f'{msg.text}')
-    ```
+      async with client.aio.live.connect(
+          model=MODEL_NAME,
+          config={"response_modalities": ["TEXT"]},
+      ) as session:
+        await session.send_realtime_input(
+            media=PIL.Image.open('image.jpg'))
+
+        audio_bytes = Path('audio.pcm').read_bytes()
+        await session.send_realtime_input(
+            media=types.Blob(data=audio_bytes, mime_type='audio/pcm;rate=16000'))
+
+        async for msg in session.receive():
+          if msg.text is not None:
+            print(f'{msg.text}')
     """
     kwargs: _common.StringDict = {}
     if media is not None:
@@ -351,52 +353,54 @@ class AsyncSession:
         `FunctionResponse`-like objects.
 
     Example:
-    ```
-    from google import genai
-    from google.genai import types
 
-    import os
+    .. code-block:: python
 
-    if os.environ.get('GOOGLE_GENAI_USE_VERTEXAI'):
-      MODEL_NAME = 'gemini-2.0-flash-live-preview-04-09'
-    else:
-      MODEL_NAME = 'gemini-live-2.5-flash-preview';
-
-    client = genai.Client()
-
-    tools = [{'function_declarations': [{'name': 'turn_on_the_lights'}]}]
-    config = {
-        "tools": tools,
-        "response_modalities": ['TEXT']
-    }
-
-    async with client.aio.live.connect(
-        model='models/gemini-live-2.5-flash-preview',
-        config=config
-    ) as session:
-      prompt = "Turn on the lights please"
-      await session.send_client_content(
-          turns={"parts": [{'text': prompt}]}
-      )
+      from google import genai
+      from google.genai import types
 
-      async for chunk in session.receive():
-          if chunk.server_content:
-            if chunk.text is not None:
-              print(chunk.text)
-          elif chunk.tool_call:
-            print(chunk.tool_call)
-            print('_'*80)
-            function_response=types.FunctionResponse(
-                    name='turn_on_the_lights',
-                    response={'result': 'ok'},
-                    id=chunk.tool_call.function_calls[0].id,
-                )
-            print(function_response)
-            await session.send_tool_response(
-                function_responses=function_response
-            )
+      import os
+
+      if os.environ.get('GOOGLE_GENAI_USE_VERTEXAI'):
+        MODEL_NAME = 'gemini-2.0-flash-live-preview-04-09'
+      else:
+        MODEL_NAME = 'gemini-live-2.5-flash-preview';
+
+      client = genai.Client()
+
+      tools = [{'function_declarations': [{'name': 'turn_on_the_lights'}]}]
+      config = {
+          "tools": tools,
+          "response_modalities": ['TEXT']
+      }
+
+      async with client.aio.live.connect(
+          model='models/gemini-live-2.5-flash-preview',
+          config=config
+      ) as session:
+        prompt = "Turn on the lights please"
+        await session.send_client_content(
+            turns={"parts": [{'text': prompt}]}
+        )
+
+        async for chunk in session.receive():
+            if chunk.server_content:
+              if chunk.text is not None:
+                print(chunk.text)
+            elif chunk.tool_call:
+              print(chunk.tool_call)
+              print('_'*80)
+              function_response=types.FunctionResponse(
+                      name='turn_on_the_lights',
+                      response={'result': 'ok'},
+                      id=chunk.tool_call.function_calls[0].id,
+                  )
+              print(function_response)
+              await session.send_tool_response(
+                  function_responses=function_response
+              )
 
-            print('_'*80)
+              print('_'*80)
     """
     tool_response = t.t_tool_response(function_responses)
     if self._api_client.vertexai: