google-genai 1.25.0__py3-none-any.whl → 1.26.0__py3-none-any.whl

google/genai/types.py

@@ -15,6 +15,7 @@
 
 # Code generated by the Google Gen AI SDK generator DO NOT EDIT.
 
+from abc import ABC, abstractmethod
 import datetime
 from enum import Enum, EnumMeta
 import inspect
@@ -26,7 +27,7 @@ import typing
 from typing import Any, Callable, Literal, Optional, Sequence, Union, _UnionGenericAlias  # type: ignore
 import pydantic
 from pydantic import Field
-from typing_extensions import TypedDict
+from typing_extensions import Self, TypedDict
 from . import _common
 
 if sys.version_info >= (3, 10):
@@ -6381,6 +6382,11 @@ class EditImageConfig(_common.BaseModel):
       only).
       """,
   )
+  add_watermark: Optional[bool] = Field(
+      default=None,
+      description="""Whether to add a watermark to the generated images.
+      """,
+  )
   edit_mode: Optional[EditMode] = Field(
       default=None,
       description="""Describes the editing mode for the request.""",
@@ -6457,6 +6463,10 @@ class EditImageConfigDict(TypedDict, total=False):
       only).
       """
 
+  add_watermark: Optional[bool]
+  """Whether to add a watermark to the generated images.
+      """
+
   edit_mode: Optional[EditMode]
   """Describes the editing mode for the request."""
 
@@ -7613,7 +7623,7 @@ class GenerateVideosConfig(_common.BaseModel):
   )
   resolution: Optional[str] = Field(
       default=None,
-      description="""The resolution for the generated video. 1280x720, 1920x1080 are supported.""",
+      description="""The resolution for the generated video. 720p and 1080p are supported.""",
   )
   person_generation: Optional[str] = Field(
       default=None,
@@ -7669,7 +7679,7 @@ class GenerateVideosConfigDict(TypedDict, total=False):
   """The aspect ratio for the generated video. 16:9 (landscape) and 9:16 (portrait) are supported."""
 
   resolution: Optional[str]
-  """The resolution for the generated video. 1280x720, 1920x1080 are supported."""
+  """The resolution for the generated video. 720p and 1080p are supported."""
 
   person_generation: Optional[str]
   """Whether allow to generate person videos, and restrict to specific ages. Supported values are: dont_allow, allow_adult."""
@@ -7785,26 +7795,8 @@ class GenerateVideosResponse(_common.BaseModel):
   )
 
 
-class GenerateVideosResponseDict(TypedDict, total=False):
-  """Response with generated videos."""
-
-  generated_videos: Optional[list[GeneratedVideoDict]]
-  """List of the generated videos"""
-
-  rai_media_filtered_count: Optional[int]
-  """Returns if any videos were filtered due to RAI policies."""
-
-  rai_media_filtered_reasons: Optional[list[str]]
-  """Returns rai failure reasons if any."""
-
-
-GenerateVideosResponseOrDict = Union[
-    GenerateVideosResponse, GenerateVideosResponseDict
-]
-
-
-class GenerateVideosOperation(_common.BaseModel):
-  """A video generation operation."""
+class Operation(ABC):
+  """A long-running operation."""
 
   name: Optional[str] = Field(
       default=None,
@@ -7822,38 +7814,101 @@ class GenerateVideosOperation(_common.BaseModel):
       default=None,
       description="""The error result of the operation in case of failure or cancellation.""",
   )
+
+  @classmethod
+  @abstractmethod
+  def from_api_response(
+      cls, api_response: Any, is_vertex_ai: bool = False
+  ) -> Self:
+    """Creates an Operation from an API response."""
+    pass
+
+
+class GenerateVideosOperation(_common.BaseModel, Operation):
+  """A video generation operation."""
+
   response: Optional[GenerateVideosResponse] = Field(
       default=None, description="""The generated videos."""
   )
+
   result: Optional[GenerateVideosResponse] = Field(
       default=None, description="""The generated videos."""
   )
 
+  @classmethod
+  def from_api_response(
+      cls, api_response: Any, is_vertex_ai: bool = False
+  ) -> Self:
+    """Instantiates a GenerateVideosOperation from an API response."""
+    new_operation = cls()
+    new_operation.name = api_response.get('name', None)
+    new_operation.metadata = api_response.get('metadata', None)
+    new_operation.done = api_response.get('done', None)
+    new_operation.error = api_response.get('error', None)
+
+    if is_vertex_ai:
+      if api_response.get('response', None) is not None:
+        new_operation.response = GenerateVideosResponse(
+            generated_videos=[
+                GeneratedVideo(
+                    video=Video(
+                        uri=video.get('gcsUri', None),
+                        video_bytes=video.get('bytesBase64Encoded', None),
+                        mime_type=video.get('mimeType', None),
+                    )
+                )
+                for video in api_response.get('response', {}).get('videos', [])
+            ],
+            rai_media_filtered_count=api_response.get('response', {}).get(
+                'raiMediaFilteredCount', None
+            ),
+            rai_media_filtered_reasons=api_response.get('response', {}).get(
+                'raiMediaFilteredReasons', None
+            ),
+        )
+    else:
+      if api_response.get('response', None) is not None:
+        new_operation.response = GenerateVideosResponse(
+            generated_videos=[
+                GeneratedVideo(
+                    video=Video(
+                        uri=video.get('video', {}).get('uri', None),
+                        video_bytes=video.get('video', {}).get(
+                            'encodedVideo', None
+                        ),
+                        mime_type=video.get('encoding', None),
+                    )
+                )
+                for video in api_response.get('response', {})
+                .get('generateVideoResponse', {})
+                .get('generatedSamples', [])
+            ],
+            rai_media_filtered_count=api_response.get('response', {})
+            .get('generateVideoResponse', {})
+            .get('raiMediaFilteredCount', None),
+            rai_media_filtered_reasons=api_response.get('response', {})
+            .get('generateVideoResponse', {})
+            .get('raiMediaFilteredReasons', None),
+        )
+    new_operation.result = new_operation.response
+    return new_operation
 
-class GenerateVideosOperationDict(TypedDict, total=False):
-  """A video generation 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."""
+class GenerateVideosResponseDict(TypedDict, total=False):
+  """Response with generated videos."""
 
-  error: Optional[dict[str, Any]]
-  """The error result of the operation in case of failure or cancellation."""
+  generated_videos: Optional[list[GeneratedVideoDict]]
+  """List of the generated videos"""
 
-  response: Optional[GenerateVideosResponseDict]
-  """The generated videos."""
+  rai_media_filtered_count: Optional[int]
+  """Returns if any videos were filtered due to RAI policies."""
 
-  result: Optional[GenerateVideosResponseDict]
-  """The generated videos."""
+  rai_media_filtered_reasons: Optional[list[str]]
+  """Returns rai failure reasons if any."""
 
 
-GenerateVideosOperationOrDict = Union[
-    GenerateVideosOperation, GenerateVideosOperationDict
+GenerateVideosResponseOrDict = Union[
+    GenerateVideosResponse, GenerateVideosResponseDict
 ]
 
 
@@ -9141,7 +9196,7 @@ _CreateTuningJobParametersOrDict = Union[
 ]
 
 
-class Operation(_common.BaseModel):
+class TuningOperation(_common.BaseModel):
   """A long-running operation."""
 
   name: Optional[str] = Field(
@@ -9162,7 +9217,7 @@ class Operation(_common.BaseModel):
   )
 
 
-class OperationDict(TypedDict, total=False):
+class TuningOperationDict(TypedDict, total=False):
   """A long-running operation."""
 
   name: Optional[str]
@@ -9178,7 +9233,7 @@ class OperationDict(TypedDict, total=False):
   """The error result of the operation in case of failure or cancellation."""
 
 
-OperationOrDict = Union[Operation, OperationDict]
+TuningOperationOrDict = Union[TuningOperation, TuningOperationDict]
 
 
 class CreateCachedContentConfig(_common.BaseModel):
@@ -10166,6 +10221,14 @@ class BatchJobDestinationDict(TypedDict, total=False):
 BatchJobDestinationOrDict = Union[BatchJobDestination, BatchJobDestinationDict]
 
 
+BatchJobDestinationUnion = Union[BatchJobDestination, str]
+
+
+BatchJobDestinationUnionDict = Union[
+    BatchJobDestinationUnion, BatchJobDestinationDict
+]
+
+
 class CreateBatchJobConfig(_common.BaseModel):
   """Config for optional parameters."""
 
@@ -10177,7 +10240,7 @@ class CreateBatchJobConfig(_common.BaseModel):
       description="""The user-defined name of this BatchJob.
       """,
   )
-  dest: Optional[str] = Field(
+  dest: Optional[BatchJobDestinationUnion] = Field(
       default=None,
       description="""GCS or BigQuery URI prefix for the output predictions. Example:
       "gs://path/to/output/data" or "bq://projectId.bqDatasetId.bqTableId".
@@ -10195,7 +10258,7 @@ class CreateBatchJobConfigDict(TypedDict, total=False):
   """The user-defined name of this BatchJob.
       """
 
-  dest: Optional[str]
+  dest: Optional[BatchJobDestinationUnionDict]
   """GCS or BigQuery URI prefix for the output predictions. Example:
       "gs://path/to/output/data" or "bq://projectId.bqDatasetId.bqTableId".
       """

google/genai/version.py

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

{google_genai-1.25.0.dist-info → google_genai-1.26.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: google-genai
-Version: 1.25.0
+Version: 1.26.0
 Summary: GenAI Python SDK
 Author-email: Google LLC <googleapis-packages@google.com>
 License: Apache-2.0
@@ -609,16 +609,16 @@ from google.genai import types
 function = types.FunctionDeclaration(
     name='get_current_weather',
     description='Get the current weather in a given location',
-    parameters=types.Schema(
-        type='OBJECT',
-        properties={
-            'location': types.Schema(
-                type='STRING',
-                description='The city and state, e.g. San Francisco, CA',
-            ),
+    parameters_json_schema={
+        'type': 'object',
+        'properties': {
+            'location': {
+                'type': 'string',
+                'description': 'The city and state, e.g. San Francisco, CA',
+            }
         },
-        required=['location'],
-    ),
+        'required': ['location'],
+    },
 )
 
 tool = types.Tool(function_declarations=[function])
@@ -799,6 +799,40 @@ However you define your schema, don't duplicate it in your input prompt,
 including by giving examples of expected JSON output. If you do, the generated
 output might be lower in quality.
 
+#### JSON Schema support
+Schemas can be provided as standard JSON schema.
+```python
+user_profile = {
+    'properties': {
+        'age': {
+            'anyOf': [
+                {'maximum': 20, 'minimum': 0, 'type': 'integer'},
+                {'type': 'null'},
+            ],
+            'title': 'Age',
+        },
+        'username': {
+            'description': "User's unique name",
+            'title': 'Username',
+            'type': 'string',
+        },
+    },
+    'required': ['username', 'age'],
+    'title': 'User Schema',
+    'type': 'object',
+}
+
+response = client.models.generate_content(
+    model='gemini-2.0-flash',
+    contents='Give me information of the United States.',
+    config={
+        'response_mime_type': 'application/json',
+        'response_json_schema': userProfile
+    },
+)
+print(response.parsed)
+```
+
 #### Pydantic Model Schema support
 
 Schemas can be provided as Pydantic Models.

{google_genai-1.25.0.dist-info → google_genai-1.26.0.dist-info}/RECORD

@@ -5,31 +5,31 @@ google/genai/_api_module.py,sha256=lj8eUWx8_LBGBz-49qz6_ywWm3GYp3d8Bg5JoOHbtbI,9
 google/genai/_automatic_function_calling_util.py,sha256=IJkPq2fT9pYxYm5Pbu5-e0nBoZKoZla7yT4_txWRKLs,10324
 google/genai/_base_url.py,sha256=E5H4dew14Y16qfnB3XRnjSCi19cJVlkaMNoM_8ip-PM,1597
 google/genai/_common.py,sha256=sJpzeoEJ6dZSPPfHb2Dsar-F5KmpwLjFqNSkxxxVfS8,19876
-google/genai/_extra_utils.py,sha256=GoIh_SxB5nf_0sjErYkjm8wdg93sfemLKrU_5QhlcBo,20562
-google/genai/_live_converters.py,sha256=mkxudlXXXAxuK6eWMj_-jVLQs9eOr4EX0GYCBvhIZAw,108962
+google/genai/_extra_utils.py,sha256=jWhJIdaFoVsrvExl6L7of3Bu8miSKvVidx4pbQ6EO2A,20571
+google/genai/_live_converters.py,sha256=pIcEfsAxjV1zeWmxMNigDD7ETHiuutp-a2y0HQThdmU,100162
 google/genai/_mcp_utils.py,sha256=khECx-DMuHemKzOQQ3msWp7FivPeEOnl3n1lvWc_b5o,3833
 google/genai/_replay_api_client.py,sha256=2ndavmUMySvjLIdYEvjPZIOPfc-IA5rbWQgEwWuWpfc,21567
 google/genai/_test_api_client.py,sha256=4ruFIy5_1qcbKqqIBu3HSQbpSOBrxiecBtDZaTGFR1s,4797
-google/genai/_tokens_converters.py,sha256=jQlwRZU4mlIBv6i8Lu62e6u9dvgNtOnko5WEYnjkU_A,49159
-google/genai/_transformers.py,sha256=aNWqCQid4ISorbE8nj_ONfrkbQiD75vBFkYCYbXxzHQ,37033
-google/genai/batches.py,sha256=qnyWQ1RfAdSVQgV7vGor9BIWmRwUilJ0wfqOvxUwpq8,172745
-google/genai/caches.py,sha256=q8N3YIpgJYWrLWSy-zUZ6w9CPRjH113E8ff4MyykYA8,66169
+google/genai/_tokens_converters.py,sha256=ClWTsgcqn91zSw_qTqLPTNSP1-_G8s-NlBCD8-DQniw,23803
+google/genai/_transformers.py,sha256=uTRSd9qrUZbJoFzLEWy3wGR_j1KqVg5cypGzQM1Mc4w,37357
+google/genai/batches.py,sha256=rat60rGEza3QIu4ExyUl0RAzQiyFZkcJ4excxpiq8FA,80594
+google/genai/caches.py,sha256=oL7vb_G1__Q1I4jdhLNNe20KJK6nRwZ7WeiQ8S1-oVg,64173
 google/genai/chats.py,sha256=0QdOUeWEYDQgAWBy1f7a3z3yY9S8tXSowUzNrzazzj4,16651
 google/genai/client.py,sha256=wXnfZBSv9p-yKtX_gabUrfBXoYHuqHhzK_VgwRttMgY,10777
 google/genai/errors.py,sha256=IdSymOuUJDprfPRBhBtFDkc_XX81UvgNbWrOLR8L2GU,5582
-google/genai/files.py,sha256=MCcHRXiMFKjbnt78yVPejszEgGz_MHRXfJyDi5-07Gs,39655
-google/genai/live.py,sha256=zkKlSAi378DiAL9iRug8c8zOfqG1BK45u1ttfxrrZqU,39393
+google/genai/files.py,sha256=mz3sZ6F90Kh5ftqq0uv8gcqJfRuwfoZGBFsmDmpAt9k,39809
+google/genai/live.py,sha256=WvOPBFDwD2eyUx89XCW6oudKtlK7960RqQuk5-SY1Ac,39482
 google/genai/live_music.py,sha256=3GG9nsto8Vhkohcs-4CPMS4DFp1ZtMuLYzHfvEPYAeg,6971
-google/genai/models.py,sha256=DQx31b43CxVg2YCWHVGGKBzcuB-AfBApmPm9zPVLq6o,239567
-google/genai/operations.py,sha256=99zs__fTWsyQu7rMGmBI1_4tuAJxLR0g3yp7ymsUsBA,19609
+google/genai/models.py,sha256=0QkjP8oXmWcOvyFZFZZc4LMsEOqYdoS5hwAkhQtDF70,234958
+google/genai/operations.py,sha256=3eudPaItN6_JJKMWNT9lLIJLUGyAQfFK1xken7Rv8vQ,12814
 google/genai/pagers.py,sha256=nyVYxp92rS-UaewO_oBgP593knofeLU6yOn6RolNoGQ,6797
 google/genai/py.typed,sha256=RsMFoLwBkAvY05t6izop4UHZtqOPLiKp3GkIEizzmQY,40
 google/genai/tokens.py,sha256=QGW1jI0Y5wXqiaad0-N6Utgh9sK4TK0todHf5h0GLeI,12490
-google/genai/tunings.py,sha256=fSiD4RQZI8YsFaPbBoXOIoSDA0BIuJwGg2Ac_uy5_kM,49596
-google/genai/types.py,sha256=z5NTdkK2-UNZ54VK7fFTmvf1tCJhf_aSQ0d6C-c70mU,470375
-google/genai/version.py,sha256=Bxlj38TRVWAtzVotucCfIgyEBiHiLWfid2FNcMmGuP4,627
-google_genai-1.25.0.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-google_genai-1.25.0.dist-info/METADATA,sha256=X94rtkQYckaADmyC8ULKYLSm2gq3m4shZAYT_tHx3Yk,41566
-google_genai-1.25.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-google_genai-1.25.0.dist-info/top_level.txt,sha256=_1QvSJIhFAGfxb79D6DhB7SUw2X6T4rwnz_LLrbcD3c,7
-google_genai-1.25.0.dist-info/RECORD,,
+google/genai/tunings.py,sha256=-_Fti-aX8NyDg4FxWtABUPuc5wmxNm6f_l98KXUKa1s,48461
+google/genai/types.py,sha256=8etqHluvZ_FQh4ZZTkJhMCbRe_41szi7YI_AVyQglE0,472335
+google/genai/version.py,sha256=4aazDDnUY1hmPYa17XYQCaoZRiBorYIq6V0oRcsfpYU,627
+google_genai-1.26.0.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+google_genai-1.26.0.dist-info/METADATA,sha256=1cD530ebUHsbi0RM5576qQCC8qTphGLlx-Rd5JZINvI,42400
+google_genai-1.26.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+google_genai-1.26.0.dist-info/top_level.txt,sha256=_1QvSJIhFAGfxb79D6DhB7SUw2X6T4rwnz_LLrbcD3c,7
+google_genai-1.26.0.dist-info/RECORD,,