google-genai 0.0.1__py3-none-any.whl → 0.2.0__py3-none-any.whl

google/genai/__init__.py

@@ -17,4 +17,6 @@
 
 from .client import Client
 
+__version__ = '0.2.0'
+
 __all__ = ['Client']

google/genai/_api_client.py

@@ -24,7 +24,7 @@ import json
 import os
 import sys
 from typing import Any, Optional, TypedDict, Union
-import urllib
+from urllib.parse import urlparse, urlunparse
 
 import google.auth
 import google.auth.credentials
@@ -51,7 +51,7 @@ class HttpOptions(TypedDict):
 def _append_library_version_headers(headers: dict[str, str]) -> None:
   """Appends the telemetry header to the headers dict."""
   # TODO: Automate revisions to the SDK library version.
-  library_label = 'google-genai-sdk/0.1.0'
+  library_label = f'google-genai-sdk/0.2.0'
   language_label = 'gl-python/' + sys.version.split()[0]
   version_header_value = f'{library_label} {language_label}'
   if (
@@ -89,6 +89,13 @@ def _patch_http_options(
   return copy_option
 
 
+def _join_url_path(base_url: str, path: str) -> str:
+  parsed_base = urlparse(base_url)
+  base_path = parsed_base.path[:-1] if parsed_base.path.endswith('/') else parsed_base.path
+  path = path[1:] if path.startswith('/') else path
+  return urlunparse(parsed_base._replace(path=base_path + '/' + path))
+
+
 @dataclass
 class HttpRequest:
   headers: dict[str, str]
@@ -216,9 +223,10 @@ class ApiClient:
       patched_http_options = self._http_options
     if self.vertexai and not path.startswith('projects/'):
       path = f'projects/{self.project}/locations/{self.location}/' + path
-    url = urllib.parse.urljoin(
+    url = _join_url_path(
         patched_http_options['base_url'],
-        patched_http_options['api_version'] + '/' + path)
+        patched_http_options['api_version'] + '/' + path,
+    )
     return HttpRequest(
         method=http_method,
         url=url,
@@ -265,13 +273,13 @@ class ApiClient:
         data = http_request.data
 
     http_session = requests.Session()
-    async_request = requests.Request(
+    request = requests.Request(
         method=http_request.method,
         url=http_request.url,
         headers=http_request.headers,
         data=data,
     ).prepare()
-    response = http_session.send(async_request, stream=stream)
+    response = http_session.send(request, stream=stream)
     errors.APIError.raise_for_response(response)
     return HttpResponse(
         response.headers, response if stream else [response.text]

google/genai/_automatic_function_calling_util.py

@@ -295,47 +295,3 @@ def _get_required_fields(schema: types.Schema) -> list[str]:
       if not field_schema.nullable and field_schema.default is None
   ]
 
-
-def function_to_declaration(
-    client, func: Callable
-) -> types.FunctionDeclaration:
-  """Converts a function to a FunctionDeclaration."""
-  parameters_properties = {}
-  for name, param in inspect.signature(func).parameters.items():
-    if param.kind in (
-        inspect.Parameter.POSITIONAL_OR_KEYWORD,
-        inspect.Parameter.KEYWORD_ONLY,
-        inspect.Parameter.POSITIONAL_ONLY,
-    ):
-      schema = _parse_schema_from_parameter(client, param, func.__name__)
-      parameters_properties[name] = schema
-  declaration = types.FunctionDeclaration(
-      name=func.__name__,
-      description=func.__doc__,
-  )
-  if parameters_properties:
-    declaration.parameters = types.Schema(
-        type='OBJECT',
-        properties=parameters_properties,
-    )
-    if client.vertexai:
-      declaration.parameters.required = _get_required_fields(
-          declaration.parameters
-      )
-  if not client.vertexai:
-    return declaration
-
-  return_annotation = inspect.signature(func).return_annotation
-  if return_annotation is inspect._empty:
-    return declaration
-
-  declaration.response = _parse_schema_from_parameter(
-      client,
-      inspect.Parameter(
-          'return_value',
-          inspect.Parameter.POSITIONAL_OR_KEYWORD,
-          annotation=return_annotation,
-      ),
-      func.__name__,
-  )
-  return declaration

google/genai/_extra_utils.py

@@ -293,3 +293,18 @@ def get_max_remote_calls_afc(
   ):
     return _DEFAULT_MAX_REMOTE_CALLS_AFC
   return int(config_model.automatic_function_calling.maximum_remote_calls)
+
+def should_append_afc_history(
+    config: Optional[types.GenerateContentConfigOrDict] = None,
+) -> bool:
+  config_model = (
+      types.GenerateContentConfig(**config)
+      if config and isinstance(config, dict)
+      else config
+  )
+  if (
+      not config_model
+      or not config_model.automatic_function_calling
+  ):
+    return True
+  return not config_model.automatic_function_calling.ignore_call_history

google/genai/_transformers.py

@@ -27,7 +27,6 @@ import PIL.Image
 
 from . import _api_client
 from . import types
-from ._automatic_function_calling_util import function_to_declaration
 
 
 def _resource_name(
@@ -307,7 +306,9 @@ def t_tool(client: _api_client.ApiClient, origin) -> types.Tool:
     return None
   if inspect.isfunction(origin):
     return types.Tool(
-        function_declarations=[function_to_declaration(client, origin)]
+        function_declarations=[
+            types.FunctionDeclaration.from_function(client, origin)
+        ]
     )
   else:
     return origin

google/genai/batches.py

@@ -213,6 +213,30 @@ def _CreateBatchJobParameters_to_vertex(
   return to_object
 
 
+def _GetBatchJobConfig_to_mldev(
+    api_client: ApiClient,
+    from_object: Union[dict, object],
+    parent_object: dict = None,
+) -> dict:
+  to_object = {}
+  if getv(from_object, ['http_options']) is not None:
+    setv(to_object, ['httpOptions'], getv(from_object, ['http_options']))
+
+  return to_object
+
+
+def _GetBatchJobConfig_to_vertex(
+    api_client: ApiClient,
+    from_object: Union[dict, object],
+    parent_object: dict = None,
+) -> dict:
+  to_object = {}
+  if getv(from_object, ['http_options']) is not None:
+    setv(to_object, ['httpOptions'], getv(from_object, ['http_options']))
+
+  return to_object
+
+
 def _GetBatchJobParameters_to_mldev(
     api_client: ApiClient,
     from_object: Union[dict, object],
@@ -222,6 +246,15 @@ def _GetBatchJobParameters_to_mldev(
   if getv(from_object, ['name']):
     raise ValueError('name parameter is not supported in Google AI.')
 
+  if getv(from_object, ['config']) is not None:
+    setv(
+        to_object,
+        ['config'],
+        _GetBatchJobConfig_to_mldev(
+            api_client, getv(from_object, ['config']), to_object
+        ),
+    )
+
   return to_object
 
 
@@ -238,6 +271,39 @@ def _GetBatchJobParameters_to_vertex(
         t.t_batch_job_name(api_client, getv(from_object, ['name'])),
     )
 
+  if getv(from_object, ['config']) is not None:
+    setv(
+        to_object,
+        ['config'],
+        _GetBatchJobConfig_to_vertex(
+            api_client, getv(from_object, ['config']), to_object
+        ),
+    )
+
+  return to_object
+
+
+def _CancelBatchJobConfig_to_mldev(
+    api_client: ApiClient,
+    from_object: Union[dict, object],
+    parent_object: dict = None,
+) -> dict:
+  to_object = {}
+  if getv(from_object, ['http_options']) is not None:
+    setv(to_object, ['httpOptions'], getv(from_object, ['http_options']))
+
+  return to_object
+
+
+def _CancelBatchJobConfig_to_vertex(
+    api_client: ApiClient,
+    from_object: Union[dict, object],
+    parent_object: dict = None,
+) -> dict:
+  to_object = {}
+  if getv(from_object, ['http_options']) is not None:
+    setv(to_object, ['httpOptions'], getv(from_object, ['http_options']))
+
   return to_object
 
 
@@ -250,6 +316,15 @@ def _CancelBatchJobParameters_to_mldev(
   if getv(from_object, ['name']):
     raise ValueError('name parameter is not supported in Google AI.')
 
+  if getv(from_object, ['config']) is not None:
+    setv(
+        to_object,
+        ['config'],
+        _CancelBatchJobConfig_to_mldev(
+            api_client, getv(from_object, ['config']), to_object
+        ),
+    )
+
   return to_object
 
 
@@ -266,6 +341,15 @@ def _CancelBatchJobParameters_to_vertex(
         t.t_batch_job_name(api_client, getv(from_object, ['name'])),
     )
 
+  if getv(from_object, ['config']) is not None:
+    setv(
+        to_object,
+        ['config'],
+        _CancelBatchJobConfig_to_vertex(
+            api_client, getv(from_object, ['config']), to_object
+        ),
+    )
+
   return to_object
 
 
@@ -660,9 +744,30 @@ class Batches(_common.BaseModule):
     self.api_client._verify_response(return_value)
     return return_value
 
-  def get(self, *, name: str) -> types.BatchJob:
+  def get(
+      self, *, name: str, config: Optional[types.GetBatchJobConfigOrDict] = None
+  ) -> types.BatchJob:
+    """Gets a batch job.
+
+    Args:
+      name (str): A fully-qualified BatchJob resource name or ID.
+        Example: "projects/.../locations/.../batchPredictionJobs/456" or "456"
+          when project and location are initialized in the client.
+
+    Returns:
+      A BatchJob object that contains details about the batch job.
+
+    Usage:
+
+    .. code-block:: python
+
+      batch_job = client.batches.get(name='123456789')
+      print(f"Batch job: {batch_job.name}, state {batch_job.state}")
+    """
+
     parameter_model = types._GetBatchJobParameters(
         name=name,
+        config=config,
     )
 
     if not self.api_client.vertexai:
@@ -695,9 +800,15 @@ class Batches(_common.BaseModule):
     self.api_client._verify_response(return_value)
     return return_value
 
-  def cancel(self, *, name: str) -> None:
+  def cancel(
+      self,
+      *,
+      name: str,
+      config: Optional[types.CancelBatchJobConfigOrDict] = None,
+  ) -> None:
     parameter_model = types._CancelBatchJobParameters(
         name=name,
+        config=config,
     )
 
     if not self.api_client.vertexai:
@@ -767,6 +878,23 @@ class Batches(_common.BaseModule):
     return return_value
 
   def delete(self, *, name: str) -> types.DeleteResourceJob:
+    """Deletes a batch job.
+
+    Args:
+      name (str): A fully-qualified BatchJob resource name or ID.
+        Example: "projects/.../locations/.../batchPredictionJobs/456" or "456"
+          when project and location are initialized in the client.
+
+    Returns:
+      A DeleteResourceJob object that shows the status of the deletion.
+
+    Usage:
+
+    .. code-block:: python
+
+      client.batches.delete(name='123456789')
+    """
+
     parameter_model = types._DeleteBatchJobParameters(
         name=name,
     )
@@ -814,12 +942,51 @@ class Batches(_common.BaseModule):
       src: str,
       config: Optional[types.CreateBatchJobConfigOrDict] = None,
   ) -> types.BatchJob:
+    """Creates a batch job.
+
+    Args:
+      model (str): The model to use for the batch job.
+      src (str): The source of the batch job. Currently supports GCS URI(-s) or
+        Bigquery URI. Example: "gs://path/to/input/data" or
+        "bq://projectId.bqDatasetId.bqTableId".
+      config (CreateBatchJobConfig): Optional configuration for the batch job.
+
+    Returns:
+      A BatchJob object that contains details about the batch job.
+
+    Usage:
+
+    .. code-block:: python
+
+      batch_job = client.batches.create(
+          model="gemini-1.5-flash",
+          src="gs://path/to/input/data",
+      )
+      print(batch_job.state)
+    """
     config = _extra_utils.format_destination(src, config)
     return self._create(model=model, src=src, config=config)
 
   def list(
       self, *, config: Optional[types.ListBatchJobConfigOrDict] = None
   ) -> Pager[types.BatchJob]:
+    """Lists batch jobs.
+
+    Args:
+      config (ListBatchJobConfig): Optional configuration for the list request.
+
+    Returns:
+      A Pager object that contains one page of batch jobs. When iterating over
+      the pager, it automatically fetches the next page if there are more.
+
+    Usage:
+
+    .. code-block:: python
+
+      batch_jobs = client.batches.list(config={"page_size": 10})
+      for batch_job in batch_jobs:
+        print(f"Batch job: {batch_job.name}, state {batch_job.state}")
+    """
     return Pager(
         'batch_jobs',
         self._list,
@@ -873,9 +1040,30 @@ class AsyncBatches(_common.BaseModule):
     self.api_client._verify_response(return_value)
     return return_value
 
-  async def get(self, *, name: str) -> types.BatchJob:
+  async def get(
+      self, *, name: str, config: Optional[types.GetBatchJobConfigOrDict] = None
+  ) -> types.BatchJob:
+    """Gets a batch job.
+
+    Args:
+      name (str): A fully-qualified BatchJob resource name or ID.
+        Example: "projects/.../locations/.../batchPredictionJobs/456" or "456"
+          when project and location are initialized in the client.
+
+    Returns:
+      A BatchJob object that contains details about the batch job.
+
+    Usage:
+
+    .. code-block:: python
+
+      batch_job = client.batches.get(name='123456789')
+      print(f"Batch job: {batch_job.name}, state {batch_job.state}")
+    """
+
     parameter_model = types._GetBatchJobParameters(
         name=name,
+        config=config,
     )
 
     if not self.api_client.vertexai:
@@ -908,9 +1096,15 @@ class AsyncBatches(_common.BaseModule):
     self.api_client._verify_response(return_value)
     return return_value
 
-  async def cancel(self, *, name: str) -> None:
+  async def cancel(
+      self,
+      *,
+      name: str,
+      config: Optional[types.CancelBatchJobConfigOrDict] = None,
+  ) -> None:
     parameter_model = types._CancelBatchJobParameters(
         name=name,
+        config=config,
     )
 
     if not self.api_client.vertexai:
@@ -980,6 +1174,23 @@ class AsyncBatches(_common.BaseModule):
     return return_value
 
   async def delete(self, *, name: str) -> types.DeleteResourceJob:
+    """Deletes a batch job.
+
+    Args:
+      name (str): A fully-qualified BatchJob resource name or ID.
+        Example: "projects/.../locations/.../batchPredictionJobs/456" or "456"
+          when project and location are initialized in the client.
+
+    Returns:
+      A DeleteResourceJob object that shows the status of the deletion.
+
+    Usage:
+
+    .. code-block:: python
+
+      client.batches.delete(name='123456789')
+    """
+
     parameter_model = types._DeleteBatchJobParameters(
         name=name,
     )
@@ -1027,12 +1238,51 @@ class AsyncBatches(_common.BaseModule):
       src: str,
       config: Optional[types.CreateBatchJobConfigOrDict] = None,
   ) -> types.BatchJob:
+    """Creates a batch job asynchronously.
+
+    Args:
+      model (str): The model to use for the batch job.
+      src (str): The source of the batch job. Currently supports GCS URI(-s) or
+        Bigquery URI. Example: "gs://path/to/input/data" or
+        "bq://projectId.bqDatasetId.bqTableId".
+      config (CreateBatchJobConfig): Optional configuration for the batch job.
+
+    Returns:
+      A BatchJob object that contains details about the batch job.
+
+    Usage:
+
+    .. code-block:: python
+
+      batch_job = await client.aio.batches.create(
+          model="gemini-1.5-flash",
+          src="gs://path/to/input/data",
+      )
+    """
     config = _extra_utils.format_destination(src, config)
     return await self._create(model=model, src=src, config=config)
 
   async def list(
       self, *, config: Optional[types.ListBatchJobConfigOrDict] = None
   ) -> AsyncPager[types.BatchJob]:
+    """Lists batch jobs asynchronously.
+
+    Args:
+      config (ListBatchJobConfig): Optional configuration for the list request.
+
+    Returns:
+      A Pager object that contains one page of batch jobs. When iterating over
+      the pager, it automatically fetches the next page if there are more.
+
+    Usage:
+
+    .. code-block:: python
+
+      batch_jobs = await client.aio.batches.list(config={'page_size': 5})
+      print(f"current page: {batch_jobs.page}")
+      await batch_jobs_pager.next_page()
+      print(f"next page: {batch_jobs_pager.page}")
+    """
     return AsyncPager(
         'batch_jobs',
         self._list,

google/genai/caches.py

@@ -1249,6 +1249,7 @@ class Caches(_common.BaseModule):
     Usage:
 
     .. code-block:: python
+
       contents = ... // Initialize the content to cache.
       response = await client.aio.caches.create(
           model= ... // The publisher model id
@@ -1310,6 +1311,7 @@ class Caches(_common.BaseModule):
     """Gets cached content configurations.
 
     .. code-block:: python
+
       await client.aio.caches.get(name= ... ) // The server-generated resource
       name.
     """
@@ -1364,6 +1366,7 @@ class Caches(_common.BaseModule):
     Usage:
 
     .. code-block:: python
+
       await client.aio.caches.delete(name= ... ) // The server-generated
       resource name.
     """
@@ -1420,6 +1423,7 @@ class Caches(_common.BaseModule):
     """Updates cached content configurations.
 
     .. code-block:: python
+
       response = await client.aio.caches.update(
           name= ... // The server-generated resource name.
           config={
@@ -1473,6 +1477,7 @@ class Caches(_common.BaseModule):
     """Lists cached content configurations.
 
     .. code-block:: python
+
       cached_contents = await client.aio.caches.list(config={'page_size': 2})
       async for cached_content in cached_contents:
         print(cached_content)
@@ -1548,6 +1553,7 @@ class AsyncCaches(_common.BaseModule):
     Usage:
 
     .. code-block:: python
+
       contents = ... // Initialize the content to cache.
       response = await client.aio.caches.create(
           model= ... // The publisher model id
@@ -1609,6 +1615,7 @@ class AsyncCaches(_common.BaseModule):
     """Gets cached content configurations.
 
     .. code-block:: python
+
       await client.aio.caches.get(name= ... ) // The server-generated resource
       name.
     """
@@ -1663,6 +1670,7 @@ class AsyncCaches(_common.BaseModule):
     Usage:
 
     .. code-block:: python
+
       await client.aio.caches.delete(name= ... ) // The server-generated
       resource name.
     """
@@ -1719,6 +1727,7 @@ class AsyncCaches(_common.BaseModule):
     """Updates cached content configurations.
 
     .. code-block:: python
+
       response = await client.aio.caches.update(
           name= ... // The server-generated resource name.
           config={
@@ -1772,6 +1781,7 @@ class AsyncCaches(_common.BaseModule):
     """Lists cached content configurations.
 
     .. code-block:: python
+
       cached_contents = await client.aio.caches.list(config={'page_size': 2})
       async for cached_content in cached_contents:
         print(cached_content)

google/genai/chats.py

@@ -54,6 +54,7 @@ class Chat(_BaseChat):
     Usage:
 
     .. code-block:: python
+
       chat = client.chats.create(model='gemini-1.5-flash')
       response = chat.send_message('tell me a story')
     """
@@ -65,7 +66,12 @@ class Chat(_BaseChat):
         config=self._config,
     )
     if response.candidates and response.candidates[0].content:
-      self._curated_history.append(input_content)
+      if response.automatic_function_calling_history:
+        self._curated_history.extend(
+            response.automatic_function_calling_history
+        )
+      else:
+        self._curated_history.append(input_content)
       self._curated_history.append(response.candidates[0].content)
     return response
 
@@ -127,6 +133,7 @@ class AsyncChat(_BaseChat):
     Usage:
 
     .. code-block:: python
+
       chat = client.chats.create(model='gemini-1.5-flash')
       response = chat.send_message('tell me a story')
     """
@@ -138,7 +145,12 @@ class AsyncChat(_BaseChat):
         config=self._config,
     )
     if response.candidates and response.candidates[0].content:
-      self._curated_history.append(input_content)
+      if response.automatic_function_calling_history:
+        self._curated_history.extend(
+            response.automatic_function_calling_history
+        )
+      else:
+        self._curated_history.append(input_content)
       self._curated_history.append(response.candidates[0].content)
     return response
 

google/genai/files.py

@@ -605,6 +605,7 @@ class Files(_common.BaseModule):
     Usage:
 
     .. code-block:: python
+
       pager = client.files.list(config={'page_size': 10})
       for file in pager.page:
         print(file.name)
@@ -712,6 +713,7 @@ class Files(_common.BaseModule):
     Usage:
 
     .. code-block:: python
+
       file = client.files.get(name='files/...')
       print(file.uri)
     """
@@ -766,6 +768,7 @@ class Files(_common.BaseModule):
     Usage:
 
     .. code-block:: python
+
       client.files.delete(name='files/...')
     """
 
@@ -916,6 +919,7 @@ class AsyncFiles(_common.BaseModule):
     Usage:
 
     .. code-block:: python
+
       pager = client.files.list(config={'page_size': 10})
       for file in pager.page:
         print(file.name)
@@ -1023,6 +1027,7 @@ class AsyncFiles(_common.BaseModule):
     Usage:
 
     .. code-block:: python
+
       file = client.files.get(name='files/...')
       print(file.uri)
     """
@@ -1077,6 +1082,7 @@ class AsyncFiles(_common.BaseModule):
     Usage:
 
     .. code-block:: python
+
       client.files.delete(name='files/...')
     """