google-genai 0.7.0__py3-none-any.whl → 1.0.0rc0__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,7 +723,7 @@ 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(
+  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.""",
   )
@@ -734,7 +744,7 @@ class HttpOptionsDict(TypedDict, total=False):
   timeout: Optional[int]
   """Timeout for the request in milliseconds."""
 
-  deprecated_response_payload: Optional[dict[str, any]]
+  deprecated_response_payload: Optional[dict[str, Any]]
   """This field is deprecated. If set, the response payload will be returned int the supplied dict."""
 
 
@@ -1656,7 +1666,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 +1873,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 +2021,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 +2919,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
 
@@ -3533,6 +3573,12 @@ class GeneratedImage(_common.BaseModel):
       response.
       """,
   )
+  enhanced_prompt: Optional[str] = Field(
+      default=None,
+      description="""The rewritten prompt used for the image generation if the prompt
+      enhancer is enabled.
+      """,
+  )
 
 
 class GeneratedImageDict(TypedDict, total=False):
@@ -3547,6 +3593,11 @@ class GeneratedImageDict(TypedDict, total=False):
       response.
       """
 
+  enhanced_prompt: Optional[str]
+  """The rewritten prompt used for the image generation if the prompt
+      enhancer is enabled.
+      """
+
 
 GeneratedImageOrDict = Union[GeneratedImage, GeneratedImageDict]
 
@@ -7190,6 +7241,147 @@ class DeleteResourceJobDict(TypedDict, total=False):
 DeleteResourceJobOrDict = Union[DeleteResourceJob, DeleteResourceJobDict]
 
 
+class GetOperationConfig(_common.BaseModel):
+
+  http_options: Optional[HttpOptions] = Field(
+      default=None, description="""Used to override HTTP request options."""
+  )
+
+
+class GetOperationConfigDict(TypedDict, total=False):
+
+  http_options: Optional[HttpOptionsDict]
+  """Used to override HTTP request options."""
+
+
+GetOperationConfigOrDict = Union[GetOperationConfig, GetOperationConfigDict]
+
+
+class _GetOperationParameters(_common.BaseModel):
+  """Parameters for the GET method."""
+
+  operation_name: Optional[str] = Field(
+      default=None,
+      description="""The server-assigned name for the operation.""",
+  )
+  config: Optional[GetOperationConfig] = Field(
+      default=None,
+      description="""Used to override the default configuration.""",
+  )
+
+
+class _GetOperationParametersDict(TypedDict, total=False):
+  """Parameters for the GET method."""
+
+  operation_name: Optional[str]
+  """The server-assigned name for the operation."""
+
+  config: Optional[GetOperationConfigDict]
+  """Used to override the default configuration."""
+
+
+_GetOperationParametersOrDict = Union[
+    _GetOperationParameters, _GetOperationParametersDict
+]
+
+
+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(
+      default=None, description="""Used to override HTTP request options."""
+  )
+
+
+class FetchPredictOperationConfigDict(TypedDict, total=False):
+
+  http_options: Optional[HttpOptionsDict]
+  """Used to override HTTP request options."""
+
+
+FetchPredictOperationConfigOrDict = Union[
+    FetchPredictOperationConfig, FetchPredictOperationConfigDict
+]
+
+
+class _FetchPredictOperationParameters(_common.BaseModel):
+  """Parameters for the fetchPredictOperation method."""
+
+  operation_name: Optional[str] = Field(
+      default=None,
+      description="""The server-assigned name for the operation.""",
+  )
+  resource_name: Optional[str] = Field(default=None, description="""""")
+  config: Optional[FetchPredictOperationConfig] = Field(
+      default=None,
+      description="""Used to override the default configuration.""",
+  )
+
+
+class _FetchPredictOperationParametersDict(TypedDict, total=False):
+  """Parameters for the fetchPredictOperation method."""
+
+  operation_name: Optional[str]
+  """The server-assigned name for the operation."""
+
+  resource_name: Optional[str]
+  """"""
+
+  config: Optional[FetchPredictOperationConfigDict]
+  """Used to override the default configuration."""
+
+
+_FetchPredictOperationParametersOrDict = Union[
+    _FetchPredictOperationParameters, _FetchPredictOperationParametersDict
+]
+
+
 class TestTableItem(_common.BaseModel):
 
   name: Optional[str] = Field(

google/genai/version.py

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

{google_genai-0.7.0.dist-info → google_genai-1.0.0rc0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: google-genai
-Version: 0.7.0
+Version: 1.0.0rc0
 Summary: GenAI Python SDK
 Author-email: Google LLC <googleapis-packages@google.com>
 License: Apache-2.0
@@ -97,9 +97,10 @@ download the file in console.
 python code.
 
 ```python
-file = client.files.upload(path="a11.text")
+file = client.files.upload(path="a11.txt")
 response = client.models.generate_content(
-    model="gemini-2.0-flash-exp", contents=["Summarize this file", file]
+    model="gemini-2.0-flash-exp",
+    contents=["Could you summarize this file?", file]
 )
 print(response.text)
 ```
@@ -143,53 +144,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()
@@ -199,12 +164,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()
@@ -863,12 +828,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()
@@ -878,12 +843,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.0rc0.dist-info/RECORD

@@ -0,0 +1,27 @@
+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=8KUbDvuon0Pw9HbYGMjavsmZtAf1elKaxkPEPgw27Wk,10696
+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=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=DtpDZT5UDqumk2cTRUlg3k4ypmO_0tkMNzJgA3qzCmc,3666
+google/genai/files.py,sha256=v16OR0IwHVB-BDWsUDYBill0BvOLEd-7eEZBJ-VcY8o,41890
+google/genai/live.py,sha256=wxz8ebqcPR6JJs39OOVz8zPzfAf31Zol7sGE7byQEyI,23302
+google/genai/models.py,sha256=2w8-NAMeJXOrY23kyEi1zyATC1sLpkSlI2Gd0m90Vdk,167626
+google/genai/pagers.py,sha256=hSHd-gLvEzYWwK85i8EcFNWUMKtszUs7Nw2r3L7d6_U,6686
+google/genai/tunings.py,sha256=iJJYn1O_wjFKTIL8VS2zpIRqpfCNRrO2REP2ztgFW6M,39144
+google/genai/types.py,sha256=J_hZuu2zPPuerqcACNb3pJgQST8Fa2Y4WB-WxYskDa4,279945
+google/genai/version.py,sha256=Y91_Rt-BIVIiB5ejxu9eKlaoOpM6RxHAVtl2_HhX-Ss,629
+google_genai-1.0.0rc0.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+google_genai-1.0.0rc0.dist-info/METADATA,sha256=MFyH61qAsTbMTgxOdkZIkSR_YMf5EsGvAPy4Zpk-_C8,22948
+google_genai-1.0.0rc0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+google_genai-1.0.0rc0.dist-info/top_level.txt,sha256=_1QvSJIhFAGfxb79D6DhB7SUw2X6T4rwnz_LLrbcD3c,7
+google_genai-1.0.0rc0.dist-info/RECORD,,

google_genai-0.7.0.dist-info/RECORD

@@ -1,26 +0,0 @@
-google/genai/__init__.py,sha256=IYw-PcsdgjSpS1mU_ZcYkTfPocsJ4aVmrDxP7vX7c6Y,709
-google/genai/_api_client.py,sha256=JPCynlSCc_yPEV4-rdV2-BPv-OHoBvotxXbI0VLA3Q4,22882
-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=aAtTQeGYn8WeiQD2lbjYiHZXWzBdj59wKiqAyQeaByc,8610
-google/genai/_extra_utils.py,sha256=y-6Jr2GN2BKZV67I6fTgDtwfsOTQs7QlLDBQdmW_jKk,11258
-google/genai/_replay_api_client.py,sha256=8KMjwjah52Mgf0rURK-CO10MqtULh8vkRSOT4-AqPpU,14722
-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=FQLGv-at7T_AZiVkhTsreIaLK_U1acufx-zt8coOjkc,41706
-google/genai/live.py,sha256=wxz8ebqcPR6JJs39OOVz8zPzfAf31Zol7sGE7byQEyI,23302
-google/genai/models.py,sha256=mitGmy1myd6-zmmV8BEDkdc88cbp8ZF9SyZTNeWnBfk,166628
-google/genai/pagers.py,sha256=hSHd-gLvEzYWwK85i8EcFNWUMKtszUs7Nw2r3L7d6_U,6686
-google/genai/tunings.py,sha256=iJJYn1O_wjFKTIL8VS2zpIRqpfCNRrO2REP2ztgFW6M,39144
-google/genai/types.py,sha256=vOP1JkluVGFhmNFBJk6Z1BoOv4zzwysjIUiU7GFPXwg,273187
-google/genai/version.py,sha256=nKmMytxBOALBA2ILryXEQSQpZZJxtfZwKkJcznog9Lw,626
-google_genai-0.7.0.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-google_genai-0.7.0.dist-info/METADATA,sha256=eUcx3JIC0OOIh3_hT-pfkYvkyP2ZWrUXU5JoCZqTDwg,23948
-google_genai-0.7.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-google_genai-0.7.0.dist-info/top_level.txt,sha256=_1QvSJIhFAGfxb79D6DhB7SUw2X6T4rwnz_LLrbcD3c,7
-google_genai-0.7.0.dist-info/RECORD,,