Project import generated by Copybara. (#24)

PiperOrigin-RevId: 707169452

Co-authored-by: Googler <[email protected]>

README.md

@@ -7,6 +7,12 @@
 
 -----
 
+## Installation
+
+``` cmd
+pip install google-genai
+```
+
 ## Imports
 
 ``` python
@@ -427,6 +433,8 @@ response2.generated_images[0].image.show()
 
 #### Edit Image
 
+Edit image uses a separate model from generate and upscale.
+
 Edit image is not supported in Google AI.
 
 ``` python
@@ -447,7 +455,7 @@ mask_ref_image = MaskReferenceImage(
 )
 
 response3 = client.models.edit_image(
-    model='imagen-3.0-capability-preview-0930',
+    model='imagen-3.0-capability-001',
     prompt='Sunlight and clear sky',
     reference_images=[raw_ref_image, mask_ref_image],
     config=types.EditImageConfig(
@@ -514,9 +522,9 @@ cached_content = client.caches.create(
                     file_uri=file_uris[1],
                     mime_type='application/pdf',)])
       ],
+      system_instruction='What is the sum of the two pdfs?',
       config=types.CreateCachedContentConfig(
           display_name='test cache',
-          system_instruction='What is the sum of the two pdfs?',
           ttl='3600s',
       ),
   )
@@ -809,4 +817,4 @@ print(async_pager[0])
 delete_job = client.batches.delete(name=job.name)
 
 delete_job
-```
+```

docs/_sources/index.rst.txt

@@ -14,6 +14,13 @@ integrate Google's generative models into their Python applications. This is an
 early release (version 0.1.0). API is subject to change. Please do not use this
 SDK in production.
 
+Installation
+============
+
+.. code::  console
+
+    pip install google-genai
+
 Imports
 =======
 

docs/genindex.html

@@ -3461,6 +3461,12 @@ <h2>T</h2>
 
         <ul>
           <li><a href="genai.html#genai.types.TuningExampleDict.text_input">(genai.types.TuningExampleDict attribute)</a>
+</li>
+        </ul></li>
+        <li><a href="genai.html#genai.types.Part.thought">thought (genai.types.Part attribute)</a>
+
+        <ul>
+          <li><a href="genai.html#genai.types.PartDict.thought">(genai.types.PartDict attribute)</a>
 </li>
         </ul></li>
         <li><a href="genai.html#genai.types.SafetySetting.threshold">threshold (genai.types.SafetySetting attribute)</a>

docs/index.html

@@ -276,6 +276,12 @@ <h1>Google Gen AI SDK<a class="headerlink" href="#google-gen-ai-sdk" title="Link
 early release (version 0.1.0). API is subject to change. Please do not use this
 SDK in production.</p>
 </section>
+<section id="installation">
+<h1>Installation<a class="headerlink" href="#installation" title="Link to this heading">¶</a></h1>
+<div class="highlight-console notranslate"><div class="highlight"><pre><span></span><span class="go">pip install google-genai</span>
+</pre></div>
+</div>
+</section>
 <section id="imports">
 <h1>Imports<a class="headerlink" href="#imports" title="Link to this heading">¶</a></h1>
 <div class="highlight-python notranslate"><div class="highlight"><pre><span></span><span class="kn">from</span> <span class="nn">google</span> <span class="kn">import</span> <span class="n">genai</span>
@@ -2583,6 +2589,7 @@ <h1>Reference<a class="headerlink" href="#reference" title="Link to this heading
 <li class="toctree-l3"><a class="reference internal" href="genai.html#genai.types.Part.function_response"><code class="docutils literal notranslate"><span class="pre">Part.function_response</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" href="genai.html#genai.types.Part.inline_data"><code class="docutils literal notranslate"><span class="pre">Part.inline_data</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" href="genai.html#genai.types.Part.text"><code class="docutils literal notranslate"><span class="pre">Part.text</span></code></a></li>
+<li class="toctree-l3"><a class="reference internal" href="genai.html#genai.types.Part.thought"><code class="docutils literal notranslate"><span class="pre">Part.thought</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" href="genai.html#genai.types.Part.video_metadata"><code class="docutils literal notranslate"><span class="pre">Part.video_metadata</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" href="genai.html#genai.types.Part.from_bytes"><code class="docutils literal notranslate"><span class="pre">Part.from_bytes()</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" href="genai.html#genai.types.Part.from_code_execution_result"><code class="docutils literal notranslate"><span class="pre">Part.from_code_execution_result()</span></code></a></li>
@@ -2602,6 +2609,7 @@ <h1>Reference<a class="headerlink" href="#reference" title="Link to this heading
 <li class="toctree-l3"><a class="reference internal" href="genai.html#genai.types.PartDict.function_response"><code class="docutils literal notranslate"><span class="pre">PartDict.function_response</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" href="genai.html#genai.types.PartDict.inline_data"><code class="docutils literal notranslate"><span class="pre">PartDict.inline_data</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" href="genai.html#genai.types.PartDict.text"><code class="docutils literal notranslate"><span class="pre">PartDict.text</span></code></a></li>
+<li class="toctree-l3"><a class="reference internal" href="genai.html#genai.types.PartDict.thought"><code class="docutils literal notranslate"><span class="pre">PartDict.thought</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" href="genai.html#genai.types.PartDict.video_metadata"><code class="docutils literal notranslate"><span class="pre">PartDict.video_metadata</span></code></a></li>
 </ul>
 </li>

docs/modules.html

@@ -1852,6 +1852,7 @@ <h1>google<a class="headerlink" href="#google" title="Link to this heading">¶</
 <li class="toctree-l3"><a class="reference internal" href="genai.html#genai.types.Part.function_response"><code class="docutils literal notranslate"><span class="pre">Part.function_response</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" href="genai.html#genai.types.Part.inline_data"><code class="docutils literal notranslate"><span class="pre">Part.inline_data</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" href="genai.html#genai.types.Part.text"><code class="docutils literal notranslate"><span class="pre">Part.text</span></code></a></li>
+<li class="toctree-l3"><a class="reference internal" href="genai.html#genai.types.Part.thought"><code class="docutils literal notranslate"><span class="pre">Part.thought</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" href="genai.html#genai.types.Part.video_metadata"><code class="docutils literal notranslate"><span class="pre">Part.video_metadata</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" href="genai.html#genai.types.Part.from_bytes"><code class="docutils literal notranslate"><span class="pre">Part.from_bytes()</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" href="genai.html#genai.types.Part.from_code_execution_result"><code class="docutils literal notranslate"><span class="pre">Part.from_code_execution_result()</span></code></a></li>
@@ -1871,6 +1872,7 @@ <h1>google<a class="headerlink" href="#google" title="Link to this heading">¶</
 <li class="toctree-l3"><a class="reference internal" href="genai.html#genai.types.PartDict.function_response"><code class="docutils literal notranslate"><span class="pre">PartDict.function_response</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" href="genai.html#genai.types.PartDict.inline_data"><code class="docutils literal notranslate"><span class="pre">PartDict.inline_data</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" href="genai.html#genai.types.PartDict.text"><code class="docutils literal notranslate"><span class="pre">PartDict.text</span></code></a></li>
+<li class="toctree-l3"><a class="reference internal" href="genai.html#genai.types.PartDict.thought"><code class="docutils literal notranslate"><span class="pre">PartDict.thought</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" href="genai.html#genai.types.PartDict.video_metadata"><code class="docutils literal notranslate"><span class="pre">PartDict.video_metadata</span></code></a></li>
 </ul>
 </li>

google/genai/CHANGELOG.md

@@ -0,0 +1,13 @@
+# Changelog
+
+## [0.3.0](https://github.com/googleapis/python-genai/compare/v0.2.2...v0.3.0) (2024-12-17)
+
+
+### BREAKING CHANGES
+* contents must be passed to CreateCachedContentConfig instead as a parameter to create_cached_content.
+
+### Features
+
+* Add support for Pydantic default value in Automatic Function Calling.
+* Add support for thought.
+* Add support for streaming chat.

google/genai/__init__.py

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

google/genai/_api_client.py

@@ -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 = f'google-genai-sdk/0.2.2'
+  library_label = f'google-genai-sdk/0.3.0'
   language_label = 'gl-python/' + sys.version.split()[0]
   version_header_value = f'{library_label} {language_label}'
   if (
@@ -241,7 +241,9 @@ def _request(
   ) -> HttpResponse:
     if self.vertexai:
       if not self._credentials:
-        self._credentials, _ = google.auth.default()
+        self._credentials, _ = google.auth.default(
+            scopes=["https://www.googleapis.com/auth/cloud-platform"],
+        )
       authed_session = AuthorizedSession(self._credentials)
       authed_session.stream = stream
       response = authed_session.request(
@@ -290,7 +292,9 @@ async def _async_request(
   ):
     if self.vertexai:
       if not self._credentials:
-        self._credentials, _ = google.auth.default()
+        self._credentials, _ = google.auth.default(
+            scopes=["https://www.googleapis.com/auth/cloud-platform"],
+        )
       return await asyncio.to_thread(
           self._request,
           http_request,

google/genai/_automatic_function_calling_util.py

@@ -170,7 +170,6 @@ def _parse_schema_from_parameter(
     ):
       if not _is_default_value_compatible(param.default, param.annotation):
         raise ValueError(default_value_error_msg)
-      # TODO: b/379715133 - handle pydantic model default value
       schema.default = param.default
     _raise_if_schema_unsupported(client, schema)
     return schema
@@ -258,12 +257,11 @@ def _parse_schema_from_parameter(
       # for user defined class, we only support pydantic model
       and issubclass(param.annotation, pydantic.BaseModel)
   ):
-    if param.default is not inspect.Parameter.empty:
-      # TODO: b/379715133 - handle pydantic model default value
-      raise ValueError(
-          f'Default value {param.default} of Pydantic model{param} of function'
-          f' {func_name} is not supported.'
-      )
+    if (
+        param.default is not inspect.Parameter.empty
+        and param.default is not None
+    ):
+      schema.default = param.default
     schema.type = 'OBJECT'
     schema.properties = {}
     for field_name, field_info in param.annotation.model_fields.items():
@@ -294,4 +292,3 @@ def _get_required_fields(schema: types.Schema) -> list[str]:
       for field_name, field_schema in schema.properties.items()
       if not field_schema.nullable and field_schema.default is None
   ]
-

google/genai/_replay_api_client.py

@@ -282,7 +282,7 @@ def close(self):
     with open(replay_file_path, 'w') as f:
       f.write(
           json.dumps(
-              self.replay_session.model_dump(), indent=2, cls=RequestJsonEncoder
+              self.replay_session.model_dump(), indent=2, cls=ResponseJsonEncoder
           )
       )
     self.replay_session = None

google/genai/_transformers.py

@@ -24,6 +24,7 @@
 from typing import Any, Optional, Union
 
 import PIL.Image
+import PIL.PngImagePlugin
 
 from . import _api_client
 from . import types
@@ -298,6 +299,20 @@ def t_speech_config(
             prebuilt_voice_config=types.PrebuiltVoiceConfig(voice_name=origin)
         )
     )
+  if (
+      isinstance(origin, dict)
+      and 'voice_config' in origin
+      and 'prebuilt_voice_config' in origin['voice_config']
+  ):
+    return types.SpeechConfig(
+        voice_config=types.VoiceConfig(
+            prebuilt_voice_config=types.PrebuiltVoiceConfig(
+                voice_name=origin['voice_config']['prebuilt_voice_config'].get(
+                    'voice_name'
+                )
+            )
+        )
+    )
   raise ValueError(f'Unsupported speechConfig type: {type(origin)}')
 
 

google/genai/caches.py

@@ -33,6 +33,9 @@ def _Part_to_mldev(
   if getv(from_object, ['video_metadata']):
     raise ValueError('video_metadata parameter is not supported in Google AI.')
 
+  if getv(from_object, ['thought']) is not None:
+    setv(to_object, ['thought'], getv(from_object, ['thought']))
+
   if getv(from_object, ['code_execution_result']) is not None:
     setv(
         to_object,
@@ -74,6 +77,9 @@ def _Part_to_vertex(
   if getv(from_object, ['video_metadata']) is not None:
     setv(to_object, ['videoMetadata'], getv(from_object, ['video_metadata']))
 
+  if getv(from_object, ['thought']) is not None:
+    setv(to_object, ['thought'], getv(from_object, ['thought']))
+
   if getv(from_object, ['code_execution_result']) is not None:
     setv(
         to_object,
@@ -638,6 +644,18 @@ def _CreateCachedContentConfig_to_mldev(
   if getv(from_object, ['display_name']) is not None:
     setv(parent_object, ['displayName'], getv(from_object, ['display_name']))
 
+  if getv(from_object, ['contents']) is not None:
+    setv(
+        parent_object,
+        ['contents'],
+        [
+            _Content_to_mldev(api_client, item, to_object)
+            for item in t.t_contents(
+                api_client, getv(from_object, ['contents'])
+            )
+        ],
+    )
+
   if getv(from_object, ['system_instruction']) is not None:
     setv(
         parent_object,
@@ -689,6 +707,18 @@ def _CreateCachedContentConfig_to_vertex(
   if getv(from_object, ['display_name']) is not None:
     setv(parent_object, ['displayName'], getv(from_object, ['display_name']))
 
+  if getv(from_object, ['contents']) is not None:
+    setv(
+        parent_object,
+        ['contents'],
+        [
+            _Content_to_vertex(api_client, item, to_object)
+            for item in t.t_contents(
+                api_client, getv(from_object, ['contents'])
+            )
+        ],
+    )
+
   if getv(from_object, ['system_instruction']) is not None:
     setv(
         parent_object,
@@ -735,18 +765,6 @@ def _CreateCachedContentParameters_to_mldev(
         t.t_caches_model(api_client, getv(from_object, ['model'])),
     )
 
-  if getv(from_object, ['contents']) is not None:
-    setv(
-        to_object,
-        ['contents'],
-        [
-            _Content_to_mldev(api_client, item, to_object)
-            for item in t.t_contents(
-                api_client, getv(from_object, ['contents'])
-            )
-        ],
-    )
-
   if getv(from_object, ['config']) is not None:
     setv(
         to_object,
@@ -772,18 +790,6 @@ def _CreateCachedContentParameters_to_vertex(
         t.t_caches_model(api_client, getv(from_object, ['model'])),
     )
 
-  if getv(from_object, ['contents']) is not None:
-    setv(
-        to_object,
-        ['contents'],
-        [
-            _Content_to_vertex(api_client, item, to_object)
-            for item in t.t_contents(
-                api_client, getv(from_object, ['contents'])
-            )
-        ],
-    )
-
   if getv(from_object, ['config']) is not None:
     setv(
         to_object,
@@ -1238,7 +1244,6 @@ def create(
       self,
       *,
       model: str,
-      contents: Union[types.ContentListUnion, types.ContentListUnionDict],
       config: Optional[types.CreateCachedContentConfigOrDict] = None,
   ) -> types.CachedContent:
     """Creates cached content, this call will initialize the cached
@@ -1264,7 +1269,6 @@ def create(
 
     parameter_model = types._CreateCachedContentParameters(
         model=model,
-        contents=contents,
         config=config,
     )
 
@@ -1542,7 +1546,6 @@ async def create(
       self,
       *,
       model: str,
-      contents: Union[types.ContentListUnion, types.ContentListUnionDict],
       config: Optional[types.CreateCachedContentConfigOrDict] = None,
   ) -> types.CachedContent:
     """Creates cached content, this call will initialize the cached
@@ -1568,7 +1571,6 @@ async def create(
 
     parameter_model = types._CreateCachedContentParameters(
         model=model,
-        contents=contents,
         config=config,
     )