google-genai 1.4.0__py3-none-any.whl → 1.5.0__py3-none-any.whl

google/genai/types.py

@@ -23,7 +23,7 @@ import logging
 import sys
 import types as builtin_types
 import typing
-from typing import Any, Callable, Literal, Optional, Union, _UnionGenericAlias
+from typing import Any, Callable, Literal, Optional, Union, _UnionGenericAlias  # type: ignore
 import pydantic
 from pydantic import Field
 from typing_extensions import TypedDict
@@ -56,6 +56,8 @@ else:
 
 logger = logging.getLogger('google_genai.types')
 
+T = typing.TypeVar('T', bound='GenerateContentResponse')
+
 
 class Outcome(_common.CaseInSensitiveEnum):
   """Required. Outcome of the code execution."""
@@ -720,7 +722,7 @@ class UserContent(Content):
   def __init__(self, parts: Union['PartUnionDict', list['PartUnionDict']]):
     from . import _transformers as t
 
-    super().__init__(parts=t.t_parts(None, parts=parts))
+    super().__init__(parts=t.t_parts(parts=parts))
 
 
 class ModelContent(Content):
@@ -748,7 +750,7 @@ class ModelContent(Content):
   def __init__(self, parts: Union['PartUnionDict', list['PartUnionDict']]):
     from . import _transformers as t
 
-    super().__init__(parts=t.t_parts(None, parts=parts))
+    super().__init__(parts=t.t_parts(parts=parts))
 
 
 class ContentDict(TypedDict, total=False):
@@ -1736,7 +1738,7 @@ FileOrDict = Union[File, FileDict]
 if _is_pillow_image_imported:
   PartUnion = Union[File, Part, PIL_Image, str]
 else:
-  PartUnion = Union[File, Part, str]
+  PartUnion = Union[File, Part, str]  # type: ignore[misc]
 
 
 PartUnionDict = Union[PartUnion, PartDict]
@@ -3012,8 +3014,11 @@ class GenerateContentResponse(_common.BaseModel):
 
   @classmethod
   def _from_response(
-      cls, *, response: dict[str, object], kwargs: dict[str, object]
-  ) -> _common.BaseModel:
+      cls: typing.Type[T],
+      *,
+      response: dict[str, object],
+      kwargs: dict[str, object],
+  ) -> T:
     result = super()._from_response(response=response, kwargs=kwargs)
 
     # Handles response schema.
@@ -3029,13 +3034,14 @@ class GenerateContentResponse(_common.BaseModel):
     ):
       # Pydantic schema.
       try:
-        result.parsed = response_schema.model_validate_json(result.text)
+        if result.text is not None:
+          result.parsed = response_schema.model_validate_json(result.text)
       # may not be a valid json per stream response
       except pydantic.ValidationError:
         pass
       except json.decoder.JSONDecodeError:
         pass
-    elif isinstance(response_schema, EnumMeta):
+    elif isinstance(response_schema, EnumMeta) and result.text is not None:
       # Enum with "application/json" returns response in double quotes.
       enum_value = result.text.replace('"', '')
       try:
@@ -3044,7 +3050,7 @@ class GenerateContentResponse(_common.BaseModel):
             hasattr(response_schema, '__name__')
             and response_schema.__name__ == 'PlaceholderLiteralEnum'
         ):
-          result.parsed = str(response_schema(enum_value).name)
+          result.parsed = str(response_schema(enum_value).name)  # type: ignore
       except ValueError:
         pass
     elif isinstance(response_schema, builtin_types.GenericAlias) or isinstance(
@@ -3052,12 +3058,13 @@ class GenerateContentResponse(_common.BaseModel):
     ):
 
       class Placeholder(pydantic.BaseModel):
-        placeholder: response_schema
+        placeholder: response_schema  # type: ignore[valid-type]
 
       try:
-        parsed = {'placeholder': json.loads(result.text)}
-        placeholder = Placeholder.model_validate(parsed)
-        result.parsed = placeholder.placeholder
+        if result.text is not None:
+          parsed = {'placeholder': json.loads(result.text)}
+          placeholder = Placeholder.model_validate(parsed)
+          result.parsed = placeholder.placeholder
       except json.decoder.JSONDecodeError:
         pass
       except pydantic.ValidationError:
@@ -3070,7 +3077,8 @@ class GenerateContentResponse(_common.BaseModel):
       # want the result converted to. So just return json.
       # JSON schema.
       try:
-        result.parsed = json.loads(result.text)
+        if result.text is not None:
+          result.parsed = json.loads(result.text)
       # may not be a valid json per stream response
       except json.decoder.JSONDecodeError:
         pass
@@ -3080,20 +3088,22 @@ class GenerateContentResponse(_common.BaseModel):
       for union_type in union_types:
         if issubclass(union_type, pydantic.BaseModel):
           try:
+            if result.text is not None:
 
-            class Placeholder(pydantic.BaseModel):  # type: ignore[no-redef]
-              placeholder: response_schema
+              class Placeholder(pydantic.BaseModel):  # type: ignore[no-redef]
+                placeholder: response_schema  # type: ignore[valid-type]
 
-            parsed = {'placeholder': json.loads(result.text)}
-            placeholder = Placeholder.model_validate(parsed)
-            result.parsed = placeholder.placeholder
+              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)
+            if result.text is not None:
+              result.parsed = json.loads(result.text)
           # may not be a valid json per stream response
           except json.decoder.JSONDecodeError:
             pass
@@ -3602,18 +3612,23 @@ class Image(_common.BaseModel):
   """Image."""
 
   @classmethod
-  def from_file(cls, *, location: str) -> 'Image':
+  def from_file(
+      cls, *, location: str, mime_type: Optional[str] = None
+  ) -> 'Image':
     """Lazy-loads an image from a local file or Google Cloud Storage.
 
     Args:
         location: The local path or Google Cloud Storage URI from which to load
           the image.
+        mime_type: The MIME type of the image. If not provided, the MIME type
+          will be automatically determined.
 
     Returns:
         A loaded image as an `Image` object.
     """
     import urllib
     import pathlib
+    import mimetypes
 
     parsed_url = urllib.parse.urlparse(location)
     if (
@@ -3632,7 +3647,10 @@ class Image(_common.BaseModel):
 
     # Load image from local path
     image_bytes = pathlib.Path(location).read_bytes()
-    image = cls(image_bytes=image_bytes)
+
+    if not mime_type:
+      mime_type, _ = mimetypes.guess_type(location)
+    image = cls(image_bytes=image_bytes, mime_type=mime_type)
     return image
 
   def show(self):
@@ -3663,6 +3681,8 @@ class Image(_common.BaseModel):
             'The PIL module is not available. Please install the Pillow'
             ' package. `pip install pillow`'
         )
+      if self.image_bytes is None:
+        raise ValueError('The image bytes are not set.')
       self._loaded_image = PIL_Image.open(io.BytesIO(self.image_bytes))
     return self._loaded_image
 
@@ -3674,6 +3694,8 @@ class Image(_common.BaseModel):
     """
     import pathlib
 
+    if self.image_bytes is None:
+      raise ValueError('The image bytes are not set.')
     pathlib.Path(location).write_bytes(self.image_bytes)
 
 
@@ -5074,6 +5096,11 @@ class _GenerateVideosParameters(_common.BaseModel):
       default=None,
       description="""The text prompt for generating the videos. Optional for image to video use cases.""",
   )
+  image: Optional[Image] = Field(
+      default=None,
+      description="""The input image for generating the videos.
+      Optional if prompt is provided.""",
+  )
   config: Optional[GenerateVideosConfig] = Field(
       default=None, description="""Configuration for generating videos."""
   )
@@ -5089,6 +5116,10 @@ class _GenerateVideosParametersDict(TypedDict, total=False):
   prompt: Optional[str]
   """The text prompt for generating the videos. Optional for image to video use cases."""
 
+  image: Optional[ImageDict]
+  """The input image for generating the videos.
+      Optional if prompt is provided."""
+
   config: Optional[GenerateVideosConfigDict]
   """Configuration for generating videos."""
 
@@ -5130,14 +5161,16 @@ class Video(_common.BaseModel):
   def show(self):
     """Shows the video.
 
+    If the video has no mime_type, it is assumed to be video/mp4.
+
     This method only works in a notebook environment.
     """
-    if self.uri:
+    if self.uri and not self.video_bytes:
       return ValueError('Showing remote videos is not supported.')
     if not self.video_bytes:
       return ValueError('Video has no bytes.')
-    if not self.mime_type:
-      return ValueError('Mime type must be provided to display video.')
+
+    mime_type = self.mime_type or 'video/mp4'
 
     try:
       from IPython import display as IPython_display
@@ -5146,7 +5179,7 @@ class Video(_common.BaseModel):
 
     if IPython_display:
       return IPython_display.Video(
-          data=self.video_bytes, mimetype=self.mime_type, embed=True
+          data=self.video_bytes, mimetype=mime_type, embed=True
       )
 
   def __repr__(self):

google/genai/version.py

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

{google_genai-1.4.0.dist-info → google_genai-1.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: google-genai
-Version: 1.4.0
+Version: 1.5.0
 Summary: GenAI Python SDK
 Author-email: Google LLC <googleapis-packages@google.com>
 License: Apache-2.0
@@ -20,6 +20,7 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: anyio<5.0.0dev,>=4.8.0
 Requires-Dist: google-auth<3.0.0dev,>=2.14.1
 Requires-Dist: httpx<1.0.0dev,>=0.28.1
 Requires-Dist: pydantic<3.0.0dev,>=2.0.0

google_genai-1.5.0.dist-info/RECORD

@@ -0,0 +1,27 @@
+google/genai/__init__.py,sha256=IYw-PcsdgjSpS1mU_ZcYkTfPocsJ4aVmrDxP7vX7c6Y,709
+google/genai/_api_client.py,sha256=5VOAFiVe3nSwoMy4QmSPKRzxtVY-lJ8yDEO6SdN267Y,29726
+google/genai/_api_module.py,sha256=66FsFq9N8PdTegDyx3am3NHpI0Bw7HBmifUMCrZsx_Q,902
+google/genai/_automatic_function_calling_util.py,sha256=AmFRhGdA6QFdUi9V73Fj4Z4R1dg3-y5b-7YxWUdRNk4,11087
+google/genai/_common.py,sha256=u0qX3Uli_7qaYmoTZm9JnVzoMihD4ASPksmqmsjGSBs,10071
+google/genai/_extra_utils.py,sha256=l9U0uaq4TWdfY7fOpGR3LcsA6-TMEblfQlEXdC0IGPY,12462
+google/genai/_replay_api_client.py,sha256=OxZIAyyyI4D9uj0avNO0QGf4DPWJ4Pqf_MCbUs5pvYc,18459
+google/genai/_test_api_client.py,sha256=XNOWq8AkYbqInv1aljNGlFXsv8slQIWTYy_hdcCetD0,4797
+google/genai/_transformers.py,sha256=sq4rZPY808LbZpvkx-tvhWrKl9s0eoDenhc8nfTnYA0,29017
+google/genai/batches.py,sha256=R4ptSnxTn1ADskGo3_arKP1FaWKsVo9oam6GFou9Mv0,41413
+google/genai/caches.py,sha256=yj8ASOpYt3lYNc0-lni_BEASZ7SUk-qRz2ZD3jjqW9U,57806
+google/genai/chats.py,sha256=ds5iF4hqvyHbHE4OlP1b5s93SwD0hlMNpWxT7db2E48,13493
+google/genai/client.py,sha256=uhX1MhEHepqe6biU-ix_d4wsv5xG8NevT7gFEva0XEM,9785
+google/genai/errors.py,sha256=BMEANEl_EK1ZIIZsO1FxgX1szvsdaEIaqhu4NpnBLow,4213
+google/genai/files.py,sha256=jPK2B8pLw4Vh9zn8yuC0e30qHarmbZxc1bRPNpMwnfM,45363
+google/genai/live.py,sha256=z_Y7LSZcPVkfInjLT9J8LWNIXD5E3e6TPDXZeadOcn0,24710
+google/genai/models.py,sha256=sQT2OEcOYoacfpjF-Bu3-cp5ejOoaNiVm8e_v1j--RM,208476
+google/genai/operations.py,sha256=YABHc75FvF3XAKjxgDgINEhuNLdUyNaMPKuDZWHglkM,19599
+google/genai/pagers.py,sha256=-Ge5vQnBGbbScCGTlaZKuSTBcgTCDP4NuyS3vjixlC8,6869
+google/genai/tunings.py,sha256=e8KrNDDQVbVZHsuFVuDuvpSNdsA33L-R68ulb2p3vEA,47751
+google/genai/types.py,sha256=K_UU4zX_SM2oPN3xfRyVR10dV1A9td47fMHQvYBwqck,298284
+google/genai/version.py,sha256=xEXL7YjPjoHY7XhGUYbNRRLHxqn4NKGHgH0_mXO-SN0,626
+google_genai-1.5.0.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+google_genai-1.5.0.dist-info/METADATA,sha256=_OZODJs7oHaP1Veht5rLlNvg_pVq3AIUIdV6YFm5g1k,29190
+google_genai-1.5.0.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+google_genai-1.5.0.dist-info/top_level.txt,sha256=_1QvSJIhFAGfxb79D6DhB7SUw2X6T4rwnz_LLrbcD3c,7
+google_genai-1.5.0.dist-info/RECORD,,

google_genai-1.4.0.dist-info/RECORD

@@ -1,27 +0,0 @@
-google/genai/__init__.py,sha256=IYw-PcsdgjSpS1mU_ZcYkTfPocsJ4aVmrDxP7vX7c6Y,709
-google/genai/_api_client.py,sha256=_dbVVtxTzO9ZiTgp3gLSc8C6_198Z8Maay9fUa-mi4M,27078
-google/genai/_api_module.py,sha256=66FsFq9N8PdTegDyx3am3NHpI0Bw7HBmifUMCrZsx_Q,902
-google/genai/_automatic_function_calling_util.py,sha256=OcmWb6RLYCMRxiEZu4Q1B9aVXg_Q1qqZvMlVaAwdKWI,11062
-google/genai/_common.py,sha256=uPDZ_HdZvWz7teUln36nCcRYbHbYTiT5HAmTuB_eCqA,9983
-google/genai/_extra_utils.py,sha256=UrmiGxOkXXBIThwu8A0QAkKZiv39whmlqGSXoP0oHDk,11807
-google/genai/_replay_api_client.py,sha256=rPu73PCijydo7cGdDS0B75Us3exopPBiXmRZmGSytzI,16199
-google/genai/_test_api_client.py,sha256=XNOWq8AkYbqInv1aljNGlFXsv8slQIWTYy_hdcCetD0,4797
-google/genai/_transformers.py,sha256=mEowhaTeH7l2pUevr7YB6DphN_D2-iPiyKnF6d41-bo,28340
-google/genai/batches.py,sha256=QgZlVDSNzOvtTUWnMR5f7fAALOLDyi5X022P0fkMvuc,41183
-google/genai/caches.py,sha256=7n0_7SeHa3nohJ0DFsOrIghE8AaVTLVLpYyiRemKf_I,57576
-google/genai/chats.py,sha256=ds5iF4hqvyHbHE4OlP1b5s93SwD0hlMNpWxT7db2E48,13493
-google/genai/client.py,sha256=uhX1MhEHepqe6biU-ix_d4wsv5xG8NevT7gFEva0XEM,9785
-google/genai/errors.py,sha256=BMEANEl_EK1ZIIZsO1FxgX1szvsdaEIaqhu4NpnBLow,4213
-google/genai/files.py,sha256=-IdlddbpwNK5ToA00vtOij_DMU2ugEZRQkBp3x7cCoM,44668
-google/genai/live.py,sha256=z_Y7LSZcPVkfInjLT9J8LWNIXD5E3e6TPDXZeadOcn0,24710
-google/genai/models.py,sha256=ra6j8-_PVy0LqTBHpK80pHwws9aPiY-5uTHQ_3t86RI,206985
-google/genai/operations.py,sha256=6zxvDBIJAH38Ga23Wf6msoEGzJWhfOscGnbHY_tdCrE,19451
-google/genai/pagers.py,sha256=xC0LEgR8E4z9XNZUnZnNwSsAUCJPlMFUpJ7eXr4nuDM,6645
-google/genai/tunings.py,sha256=Prt3bI5fKUoDWtz6A6pxSWQwP0_ecGXa1rPOvfzGKSM,47568
-google/genai/types.py,sha256=z8tX1THcR2dTMKZYwsOZWR_OGBHvdpkmCNFBSft55zE,297091
-google/genai/version.py,sha256=mOyGG-hAwdvxg1_wBKMm2uMprTFFYHVKz6j0htJ9Irs,626
-google_genai-1.4.0.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-google_genai-1.4.0.dist-info/METADATA,sha256=y4Jij7zMfosWDeq44MoSPBuZQ4x3xctqOnqha4IMqcA,29152
-google_genai-1.4.0.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-google_genai-1.4.0.dist-info/top_level.txt,sha256=_1QvSJIhFAGfxb79D6DhB7SUw2X6T4rwnz_LLrbcD3c,7
-google_genai-1.4.0.dist-info/RECORD,,