google-genai 0.8.0__py3-none-any.whl → 1.0.0__py3-none-any.whl

google/genai/types.py

@@ -20,12 +20,22 @@ from enum import Enum, EnumMeta
 import inspect
 import json
 import logging
+import sys
 import typing
 from typing import Any, Callable, GenericAlias, Literal, Optional, Type, TypedDict, Union
 import pydantic
 from pydantic import Field
 from . import _common
 
+if sys.version_info >= (3, 10):
+  # Supports both Union[t1, t2] and t1 | t2
+  VersionedUnionType = Union[typing.types.UnionType, typing._UnionGenericAlias]
+  _UNION_TYPES = (typing.Union, typing.types.UnionType)
+else:
+  # Supports only Union[t1, t2]
+  VersionedUnionType = typing._UnionGenericAlias
+  _UNION_TYPES = (typing.Union,)
+
 _is_pillow_image_imported = False
 if typing.TYPE_CHECKING:
   import PIL.Image
@@ -713,10 +723,6 @@ class HttpOptions(_common.BaseModel):
   timeout: Optional[int] = Field(
       default=None, description="""Timeout for the request in milliseconds."""
   )
-  deprecated_response_payload: Optional[dict[str, any]] = Field(
-      default=None,
-      description="""This field is deprecated. If set, the response payload will be returned int the supplied dict.""",
-  )
 
 
 class HttpOptionsDict(TypedDict, total=False):
@@ -734,9 +740,6 @@ class HttpOptionsDict(TypedDict, total=False):
   timeout: Optional[int]
   """Timeout for the request in milliseconds."""
 
-  deprecated_response_payload: Optional[dict[str, any]]
-  """This field is deprecated. If set, the response payload will be returned int the supplied dict."""
-
 
 HttpOptionsOrDict = Union[HttpOptions, HttpOptionsDict]
 
@@ -1656,7 +1659,7 @@ ContentUnion = Union[Content, list[PartUnion], PartUnion]
 ContentUnionDict = Union[ContentUnion, ContentDict]
 
 
-SchemaUnion = Union[dict, type, Schema, GenericAlias]
+SchemaUnion = Union[dict, type, Schema, GenericAlias, VersionedUnionType]
 
 
 SchemaUnionDict = Union[SchemaUnion, SchemaDict]
@@ -1863,6 +1866,10 @@ class GenerateContentConfig(_common.BaseModel):
       description="""Associates model output to a specific function call.
       """,
   )
+  labels: Optional[dict[str, str]] = Field(
+      default=None,
+      description="""Labels with user-defined metadata to break down billed charges.""",
+  )
   cached_content: Optional[str] = Field(
       default=None,
       description="""Resource name of a context cache that can be used in subsequent
@@ -2007,6 +2014,9 @@ class GenerateContentConfigDict(TypedDict, total=False):
   """Associates model output to a specific function call.
       """
 
+  labels: Optional[dict[str, str]]
+  """Labels with user-defined metadata to break down billed charges."""
+
   cached_content: Optional[str]
   """Resource name of a context cache that can be used in subsequent
       requests.
@@ -2902,6 +2912,29 @@ class GenerateContentResponse(_common.BaseModel):
       # may not be a valid json per stream response
       except json.decoder.JSONDecodeError:
         pass
+    elif typing.get_origin(response_schema) in _UNION_TYPES:
+      # Union schema.
+      union_types = typing.get_args(response_schema)
+      for union_type in union_types:
+        if issubclass(union_type, pydantic.BaseModel):
+          try:
+
+            class Placeholder(pydantic.BaseModel):
+              placeholder: response_schema
+
+            parsed = {'placeholder': json.loads(result.text)}
+            placeholder = Placeholder.model_validate(parsed)
+            result.parsed = placeholder.placeholder
+          except json.decoder.JSONDecodeError:
+            pass
+          except pydantic.ValidationError:
+            pass
+        else:
+          try:
+            result.parsed = json.loads(result.text)
+          # may not be a valid json per stream response
+          except json.decoder.JSONDecodeError:
+            pass
 
     return result
 
@@ -5921,22 +5954,51 @@ _CreateTuningJobParametersOrDict = Union[
 ]
 
 
-class TuningJobOrOperation(_common.BaseModel):
-  """A tuning job or an long-running-operation that resolves to a tuning job."""
+class Operation(_common.BaseModel):
+  """A long-running operation."""
 
-  tuning_job: Optional[TuningJob] = Field(default=None, description="""""")
+  name: Optional[str] = Field(
+      default=None,
+      description="""The server-assigned name, which is only unique within the same service that originally returns it. If you use the default HTTP mapping, the `name` should be a resource name ending with `operations/{unique_id}`.""",
+  )
+  metadata: Optional[dict[str, Any]] = Field(
+      default=None,
+      description="""Service-specific metadata associated with the operation. It typically contains progress information and common metadata such as create time. Some services might not provide such metadata.  Any method that returns a long-running operation should document the metadata type, if any.""",
+  )
+  done: Optional[bool] = Field(
+      default=None,
+      description="""If the value is `false`, it means the operation is still in progress. If `true`, the operation is completed, and either `error` or `response` is available.""",
+  )
+  error: Optional[dict[str, Any]] = Field(
+      default=None,
+      description="""The error result of the operation in case of failure or cancellation.""",
+  )
+  response: Optional[dict[str, Any]] = Field(
+      default=None,
+      description="""The normal response of the operation in case of success.""",
+  )
 
 
-class TuningJobOrOperationDict(TypedDict, total=False):
-  """A tuning job or an long-running-operation that resolves to a tuning job."""
+class OperationDict(TypedDict, total=False):
+  """A long-running operation."""
 
-  tuning_job: Optional[TuningJobDict]
-  """"""
+  name: Optional[str]
+  """The server-assigned name, which is only unique within the same service that originally returns it. If you use the default HTTP mapping, the `name` should be a resource name ending with `operations/{unique_id}`."""
 
+  metadata: Optional[dict[str, Any]]
+  """Service-specific metadata associated with the operation. It typically contains progress information and common metadata such as create time. Some services might not provide such metadata.  Any method that returns a long-running operation should document the metadata type, if any."""
 
-TuningJobOrOperationOrDict = Union[
-    TuningJobOrOperation, TuningJobOrOperationDict
-]
+  done: Optional[bool]
+  """If the value is `false`, it means the operation is still in progress. If `true`, the operation is completed, and either `error` or `response` is available."""
+
+  error: Optional[dict[str, Any]]
+  """The error result of the operation in case of failure or cancellation."""
+
+  response: Optional[dict[str, Any]]
+  """The normal response of the operation in case of success."""
+
+
+OperationOrDict = Union[Operation, OperationDict]
 
 
 class CreateCachedContentConfig(_common.BaseModel):
@@ -6543,13 +6605,17 @@ _CreateFileParametersOrDict = Union[
 class CreateFileResponse(_common.BaseModel):
   """Response for the create file method."""
 
-  pass
+  http_headers: Optional[dict[str, str]] = Field(
+      default=None,
+      description="""Used to retain the HTTP headers in the request""",
+  )
 
 
 class CreateFileResponseDict(TypedDict, total=False):
   """Response for the create file method."""
 
-  pass
+  http_headers: Optional[dict[str, str]]
+  """Used to retain the HTTP headers in the request"""
 
 
 CreateFileResponseOrDict = Union[CreateFileResponse, CreateFileResponseDict]
@@ -7245,53 +7311,6 @@ _GetOperationParametersOrDict = Union[
 ]
 
 
-class Operation(_common.BaseModel):
-  """A long-running operation."""
-
-  name: Optional[str] = Field(
-      default=None,
-      description="""The server-assigned name, which is only unique within the same service that originally returns it. If you use the default HTTP mapping, the `name` should be a resource name ending with `operations/{unique_id}`.""",
-  )
-  metadata: Optional[dict[str, Any]] = Field(
-      default=None,
-      description="""Service-specific metadata associated with the operation. It typically contains progress information and common metadata such as create time. Some services might not provide such metadata.  Any method that returns a long-running operation should document the metadata type, if any.""",
-  )
-  done: Optional[bool] = Field(
-      default=None,
-      description="""If the value is `false`, it means the operation is still in progress. If `true`, the operation is completed, and either `error` or `response` is available.""",
-  )
-  error: Optional[dict[str, Any]] = Field(
-      default=None,
-      description="""The error result of the operation in case of failure or cancellation.""",
-  )
-  response: Optional[dict[str, Any]] = Field(
-      default=None,
-      description="""The normal response of the operation in case of success.""",
-  )
-
-
-class OperationDict(TypedDict, total=False):
-  """A long-running operation."""
-
-  name: Optional[str]
-  """The server-assigned name, which is only unique within the same service that originally returns it. If you use the default HTTP mapping, the `name` should be a resource name ending with `operations/{unique_id}`."""
-
-  metadata: Optional[dict[str, Any]]
-  """Service-specific metadata associated with the operation. It typically contains progress information and common metadata such as create time. Some services might not provide such metadata.  Any method that returns a long-running operation should document the metadata type, if any."""
-
-  done: Optional[bool]
-  """If the value is `false`, it means the operation is still in progress. If `true`, the operation is completed, and either `error` or `response` is available."""
-
-  error: Optional[dict[str, Any]]
-  """The error result of the operation in case of failure or cancellation."""
-
-  response: Optional[dict[str, Any]]
-  """The normal response of the operation in case of success."""
-
-
-OperationOrDict = Union[Operation, OperationDict]
-
-
 class FetchPredictOperationConfig(_common.BaseModel):
 
   http_options: Optional[HttpOptions] = Field(

google/genai/version.py

@@ -13,4 +13,4 @@
 # limitations under the License.
 #
 
-__version__ = '0.8.0' # x-release-please-version
+__version__ = '1.0.0' # x-release-please-version

{google_genai-0.8.0.dist-info → google_genai-1.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: google-genai
-Version: 0.8.0
+Version: 1.0.0
 Summary: GenAI Python SDK
 Author-email: Google LLC <googleapis-packages@google.com>
 License: Apache-2.0
@@ -34,7 +34,7 @@ Requires-Dist: websockets<15.0dev,>=13.0
 
 -----
 
-Google Gen AI Python SDK provides an interface for developers to integrate Google's generative models into their Python applications. It supports the [Gemini Developer API](https://ai.google.dev/gemini-api/docs) and [Vertex AI](https://cloud.google.com/vertex-ai/generative-ai/docs/learn/overview) APIs. This is an early release. API is subject to change. Please do not use this SDK in production environments at this stage.
+Google Gen AI Python SDK provides an interface for developers to integrate Google's generative models into their Python applications. It supports the [Gemini Developer API](https://ai.google.dev/gemini-api/docs) and [Vertex AI](https://cloud.google.com/vertex-ai/generative-ai/docs/learn/overview) APIs.
 
 ## Installation
 
@@ -66,6 +66,23 @@ client = genai.Client(
 )
 ```
 
+To set the API version use `http_options`. For example, to set the API version
+to `v1` for Vertex AI:
+
+```python
+client = genai.Client(
+    vertexai=True, project='your-project-id', location='us-central1',
+    http_options={'api_version': 'v1'}
+)
+```
+
+To set the API version to `v1alpha` for the Gemini API:
+
+```python
+client = genai.Client(api_key='GEMINI_API_KEY',
+                      http_options={'api_version': 'v1alpha'})
+```
+
 ## Types
 
 Parameter types can be specified as either dictionaries(`TypedDict`) or
@@ -144,53 +161,17 @@ response = client.models.generate_content(
 print(response.text)
 ```
 
-### Thinking
-
-The Gemini 2.0 Flash Thinking model is an experimental model that could return
-"thoughts" as part of its response.
-
-#### Gemini Developer API
-
-Thinking config is only available in v1alpha for Gemini AI API.
-
-```python
-response = client.models.generate_content(
-    model='gemini-2.0-flash-thinking-exp',
-    contents='What is the sum of natural numbers from 1 to 100?',
-    config=types.GenerateContentConfig(
-        thinking_config=types.ThinkingConfig(include_thoughts=True),
-        http_options=types.HttpOptions(api_version='v1alpha'),
-    )
-)
-for part in response.candidates[0].content.parts:
-    print(part)
-```
-
-#### Vertex AI API
-
-```python
-response = client.models.generate_content(
-    model='gemini-2.0-flash-thinking-exp-01-21',
-    contents='What is the sum of natural numbers from 1 to 100?',
-    config=types.GenerateContentConfig(
-        thinking_config=types.ThinkingConfig(include_thoughts=True),
-    )
-)
-for part in response.candidates[0].content.parts:
-    print(part)
-```
-
 ### List Base Models
 
 To retrieve tuned models, see [list tuned models](#list-tuned-models).
 
 ```python
-for model in client.models.list(config={'query_base':True}):
+for model in client.models.list():
     print(model)
 ```
 
 ```python
-pager = client.models.list(config={"page_size": 10, 'query_base':True})
+pager = client.models.list(config={"page_size": 10})
 print(pager.page_size)
 print(pager[0])
 pager.next_page()
@@ -200,12 +181,12 @@ print(pager[0])
 #### Async
 
 ```python
-async for job in await client.aio.models.list(config={'query_base':True}):
+async for job in await client.aio.models.list():
     print(job)
 ```
 
 ```python
-async_pager = await client.aio.models.list(config={"page_size": 10, 'query_base':True})
+async_pager = await client.aio.models.list(config={"page_size": 10})
 print(async_pager.page_size)
 print(async_pager[0])
 await async_pager.next_page()
@@ -338,6 +319,66 @@ response = client.models.generate_content(
 print(response.text)
 ```
 
+#### Function calling with `ANY` tools config mode
+
+If you configure function calling mode to be `ANY`, then the model will always
+return function call parts. If you also pass a python function as a tool, by
+default the SDK will perform automatic function calling until the remote calls exceed the
+maximum remote call for automatic function calling (default to 10 times).
+
+If you'd like to disable automatic function calling in `ANY` mode:
+
+```python
+def get_current_weather(location: str) -> str:
+    """Returns the current weather.
+
+    Args:
+      location: The city and state, e.g. San Francisco, CA
+    """
+    return "sunny"
+
+response = client.models.generate_content(
+    model="gemini-2.0-flash-exp",
+    contents="What is the weather like in Boston?",
+    config=types.GenerateContentConfig(
+        tools=[get_current_weather],
+        automatic_function_calling=types.AutomaticFunctionCallingConfig(
+            disable=True
+        ),
+        tool_config=types.ToolConfig(
+            function_calling_config=types.FunctionCallingConfig(mode='ANY')
+        ),
+    ),
+)
+```
+
+If you'd like to set `x` number of automatic function call turns, you can
+configure the maximum remote calls to be `x + 1`.
+Assuming you prefer `1` turn for automatic function calling.
+
+```python
+def get_current_weather(location: str) -> str:
+    """Returns the current weather.
+
+    Args:
+      location: The city and state, e.g. San Francisco, CA
+    """
+    return "sunny"
+
+response = client.models.generate_content(
+    model="gemini-2.0-flash-exp",
+    contents="What is the weather like in Boston?",
+    config=types.GenerateContentConfig(
+        tools=[get_current_weather],
+        automatic_function_calling=types.AutomaticFunctionCallingConfig(
+            maximum_remote_calls=2
+        ),
+        tool_config=types.ToolConfig(
+            function_calling_config=types.FunctionCallingConfig(mode='ANY')
+        ),
+    ),
+)
+```
 ### JSON Response Schema
 
 #### Pydantic Model Schema support
@@ -864,12 +905,12 @@ print(tuned_model)
 To retrieve base models, see [list base models](#list-base-models).
 
 ```python
-for model in client.models.list(config={"page_size": 10}):
+for model in client.models.list(config={"page_size": 10, "query_base": False}):
     print(model)
 ```
 
 ```python
-pager = client.models.list(config={"page_size": 10})
+pager = client.models.list(config={"page_size": 10, "query_base": False})
 print(pager.page_size)
 print(pager[0])
 pager.next_page()
@@ -879,12 +920,12 @@ print(pager[0])
 #### Async
 
 ```python
-async for job in await client.aio.models.list(config={"page_size": 10}):
+async for job in await client.aio.models.list(config={"page_size": 10, "query_base": False}):
     print(job)
 ```
 
 ```python
-async_pager = await client.aio.models.list(config={"page_size": 10})
+async_pager = await client.aio.models.list(config={"page_size": 10, "query_base": False})
 print(async_pager.page_size)
 print(async_pager[0])
 await async_pager.next_page()

google_genai-1.0.0.dist-info/RECORD

@@ -0,0 +1,27 @@
+google/genai/__init__.py,sha256=IYw-PcsdgjSpS1mU_ZcYkTfPocsJ4aVmrDxP7vX7c6Y,709
+google/genai/_api_client.py,sha256=wLDcPY7qZi3caUlN-uIzbir6gzKQZg-zP8cxBp9Yq5g,22534
+google/genai/_api_module.py,sha256=9bxmtcSTpT8Ht6VwJyw7fQqiR0jJXz7350dWGl-bC5E,780
+google/genai/_automatic_function_calling_util.py,sha256=c7t7AbM1KqbImGWKWedRta6KW63TjOZmn0YbkXHjabI,10693
+google/genai/_common.py,sha256=8vhUVofxerNfqL2STOkOt10hzE4wYelydxYO27j5ISs,9547
+google/genai/_extra_utils.py,sha256=HxiS6rRjqWXKDOyK-ok0JlpRUykRyz3V6aJQfNCHkV4,11518
+google/genai/_operations.py,sha256=KaDgwqG5g6Odd1P6ftvIUT9gF3ov08drm01jE1CjB_s,11490
+google/genai/_replay_api_client.py,sha256=f_znGdDKXUOEN8lkRBzVZ6LDSGwrWHzy9N-Sk6pUU4E,14963
+google/genai/_test_api_client.py,sha256=2PvDcW3h01U4UOSoj7TUo6TwdBHSEN_lO2tXjBoh5Fw,4765
+google/genai/_transformers.py,sha256=Jwgbwl7DufqRZGeoPc1GClRQj1X6WM4avZEFfq9WGwA,22690
+google/genai/batches.py,sha256=jv8pW_g_cZee6ol5ER5bQRUkXsj4IUcZC5cMo-YAnt0,38033
+google/genai/caches.py,sha256=jsiclHO71kIa2CNrds3O8PL2fCNr_dlhUSPjhiRsjNE,53152
+google/genai/chats.py,sha256=GyufXQPtyP_v4L3943xaKXMpo1Us9sBTdMSTUV4P6s8,7827
+google/genai/client.py,sha256=MTZ3DOXk1_xgljaHlvF16jr_SKVPRfU8lZ1eH_dfDeQ,9334
+google/genai/errors.py,sha256=dea3cQecyGFMoV5oIvUfKeMY904HzlcT4oiPWQzDCZo,3746
+google/genai/files.py,sha256=U3qaa31AX7dKcZh6RkZSAkrDO7FVitukMW67wxL70kQ,42074
+google/genai/live.py,sha256=xDu1wV8iQ5lI2i4_AmtOQOuiiPXBt6WykV_rXfjb0Sc,23467
+google/genai/models.py,sha256=pj67WnH0Qn6K0u-qeOheM7sJHNdh8GAayEEpnd_v2wo,178201
+google/genai/pagers.py,sha256=hSHd-gLvEzYWwK85i8EcFNWUMKtszUs7Nw2r3L7d6_U,6686
+google/genai/tunings.py,sha256=OCuzmfjUK1iIElaOGxY3nQrh0gWNkk2xGqbLdBcHZr4,47009
+google/genai/types.py,sha256=WkcW0qvewDO2CTERusZ75ZU0brE44HV45qxRTMjA7AM,279319
+google/genai/version.py,sha256=9ko0qza0b8zl2aUxsnPkYRfwTKWmgtyAq6ngYDI-O6E,626
+google_genai-1.0.0.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+google_genai-1.0.0.dist-info/METADATA,sha256=8tnXFyxbncOQ-VVdpRLmaID64CYrBgF-WvckQt7NYnU,25185
+google_genai-1.0.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+google_genai-1.0.0.dist-info/top_level.txt,sha256=_1QvSJIhFAGfxb79D6DhB7SUw2X6T4rwnz_LLrbcD3c,7
+google_genai-1.0.0.dist-info/RECORD,,

google_genai-0.8.0.dist-info/RECORD

@@ -1,27 +0,0 @@
-google/genai/__init__.py,sha256=IYw-PcsdgjSpS1mU_ZcYkTfPocsJ4aVmrDxP7vX7c6Y,709
-google/genai/_api_client.py,sha256=ZXiLrTI0wWVZaGEC1BHU9fLVp1MZKpnY8J3wV59VOk4,22806
-google/genai/_api_module.py,sha256=9bxmtcSTpT8Ht6VwJyw7fQqiR0jJXz7350dWGl-bC5E,780
-google/genai/_automatic_function_calling_util.py,sha256=sEaDAeHjv-H71o1L3_P8sqOslK4TK0Rybn4WPymeEBk,10665
-google/genai/_common.py,sha256=Q-3n5U7GCDDfOU_7uBkGYkEcEH2VcMa_NuLcyNzWExM,9017
-google/genai/_extra_utils.py,sha256=y-6Jr2GN2BKZV67I6fTgDtwfsOTQs7QlLDBQdmW_jKk,11258
-google/genai/_operations.py,sha256=KaDgwqG5g6Odd1P6ftvIUT9gF3ov08drm01jE1CjB_s,11490
-google/genai/_replay_api_client.py,sha256=yV2vJJk5Nvdqyi0QmNhupMdm2jrzdYoHVFnVMAx-l0M,14834
-google/genai/_test_api_client.py,sha256=2PvDcW3h01U4UOSoj7TUo6TwdBHSEN_lO2tXjBoh5Fw,4765
-google/genai/_transformers.py,sha256=AiSVoQML3MK6AP5xTStIiJUOlrZO4m_qBULOjgdZHC0,21963
-google/genai/batches.py,sha256=jv8pW_g_cZee6ol5ER5bQRUkXsj4IUcZC5cMo-YAnt0,38033
-google/genai/caches.py,sha256=jsiclHO71kIa2CNrds3O8PL2fCNr_dlhUSPjhiRsjNE,53152
-google/genai/chats.py,sha256=GyufXQPtyP_v4L3943xaKXMpo1Us9sBTdMSTUV4P6s8,7827
-google/genai/client.py,sha256=MTZ3DOXk1_xgljaHlvF16jr_SKVPRfU8lZ1eH_dfDeQ,9334
-google/genai/errors.py,sha256=DtpDZT5UDqumk2cTRUlg3k4ypmO_0tkMNzJgA3qzCmc,3666
-google/genai/files.py,sha256=arkka0MaNKjfKyVXdQ6-Llnr9W6J4NQYgxHdN69yAwQ,41885
-google/genai/live.py,sha256=wxz8ebqcPR6JJs39OOVz8zPzfAf31Zol7sGE7byQEyI,23302
-google/genai/models.py,sha256=GP80VHjWRizW8fypNDUvMIWsObmQMDYuqIHEhLKB0lk,166870
-google/genai/pagers.py,sha256=hSHd-gLvEzYWwK85i8EcFNWUMKtszUs7Nw2r3L7d6_U,6686
-google/genai/tunings.py,sha256=iJJYn1O_wjFKTIL8VS2zpIRqpfCNRrO2REP2ztgFW6M,39144
-google/genai/types.py,sha256=1xYY4hxaoi86aoc9n2J8CcoQcAg8HQE1m8Idq9nYbDQ,278477
-google/genai/version.py,sha256=0XfCLnUKjoi5AZ_PK2-LMgByDDmYvGy8YPU9SF8C5Bo,626
-google_genai-0.8.0.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-google_genai-0.8.0.dist-info/METADATA,sha256=M_NzvfnF5Oaeuf06FISINgAbXOgEYVhD2UjJK3nSeMU,23962
-google_genai-0.8.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-google_genai-0.8.0.dist-info/top_level.txt,sha256=_1QvSJIhFAGfxb79D6DhB7SUw2X6T4rwnz_LLrbcD3c,7
-google_genai-0.8.0.dist-info/RECORD,,