Merge branch 'main' into fix/typed-list-pydantic-parsed

Author: Adewale-1

README.md

@@ -109,6 +109,31 @@ client = genai.Client(
 )
 ```
 
+### Proxy
+
+When you use the default httpx client, both sync and async use
+ `urllib.request.getproxies` from environment variables.
+Before client initialization, you may set proxy (and optional SSL_CERT_FILE) by setting the environment variables:
+
+
+```bash
+export HTTPS_PROXY='http://username:password@proxy_uri:port'
+export SSL_CERT_FILE='client.pem'
+```
+
+If you need `socks5` proxy. httpx [supports](https://www.python-httpx.org/advanced/proxies/#socks) `socks5` proxy if you pass it via
+args to `httpx.Client()`. You can pass it through the following way:
+
+```python
+
+http_options = types.HttpOptions(
+    client_args=...,
+    async_client_args=..,.
+)
+
+client=Client(..., http_options=http_options).
+```
+
 ## Types
 
 Parameter types can be specified as either dictionaries(`TypedDict`) or

docs/_sources/index.rst.txt

@@ -115,6 +115,33 @@ To set the API version to `v1alpha` for the Gemini Developer API:
     )
 
 
+Proxy
+^^^^^^^
+
+When you use the default httpx client, both sync and async use
+ `urllib.request.getproxies` from environment variables.
+Before client initialization, you may set proxy (and optional SSL_CERT_FILE)
+by setting the environment variables:
+
+.. code:: bash
+
+    export HTTPS_PROXY='http://username:password@proxy_uri:port'
+    export SSL_CERT_FILE='client.pem'
+
+
+If you need `socks5` proxy. httpx supports `socks5` proxy if you pass it via
+args to httpx.Client(). You can pass it through the following way:
+
+.. code:: python
+
+    http_options = types.HttpOptions(
+        client_args=...,
+        async_client_args=..,.
+    )
+
+    client=Client(..., http_options=http_options)
+
+
 Types
 -----
 

docs/genai.html

@@ -353,6 +353,29 @@ <h3>API Selection<a class="headerlink" href="#api-selection" title="Link to this
 </pre></div>
 </div>
 </section>
+<section id="proxy">
+<h3>Proxy<a class="headerlink" href="#proxy" title="Link to this heading">¶</a></h3>
+<dl class="simple">
+<dt>When you use the default httpx client, both sync and async use</dt><dd><p><cite>urllib.request.getproxies</cite> from environment variables.</p>
+</dd>
+</dl>
+<p>Before client initialization, you may set proxy (and optional SSL_CERT_FILE)
+by setting the environment variables:</p>
+<div class="highlight-bash notranslate"><div class="highlight"><pre><span></span><span class="nb">export</span><span class="w"> </span><span class="nv">HTTPS_PROXY</span><span class="o">=</span><span class="s1">&#39;http://username:password@proxy_uri:port&#39;</span>
+<span class="nb">export</span><span class="w"> </span><span class="nv">SSL_CERT_FILE</span><span class="o">=</span><span class="s1">&#39;client.pem&#39;</span>
+</pre></div>
+</div>
+<p>If you need <cite>socks5</cite> proxy. httpx supports <cite>socks5</cite> proxy if you pass it via
+args to httpx.Client(). You can pass it through the following way:</p>
+<div class="highlight-python notranslate"><div class="highlight"><pre><span></span><span class="n">http_options</span> <span class="o">=</span> <span class="n">types</span><span class="o">.</span><span class="n">HttpOptions</span><span class="p">(</span>
+    <span class="n">client_args</span><span class="o">=...</span><span class="p">,</span>
+    <span class="n">async_client_args</span><span class="o">=..</span><span class="p">,</span><span class="o">.</span>
+<span class="p">)</span>
+
+<span class="n">client</span><span class="o">=</span><span class="n">Client</span><span class="p">(</span><span class="o">...</span><span class="p">,</span> <span class="n">http_options</span><span class="o">=</span><span class="n">http_options</span><span class="p">)</span>
+</pre></div>
+</div>
+</section>
 </section>
 <section id="types">
 <h2>Types<a class="headerlink" href="#types" title="Link to this heading">¶</a></h2>
@@ -5335,6 +5358,7 @@ <h1>Reference<a class="headerlink" href="#reference" title="Link to this heading
 <li><a class="reference internal" href="#imports">Imports</a></li>
 <li><a class="reference internal" href="#create-a-client">Create a client</a><ul>
 <li><a class="reference internal" href="#api-selection">API Selection</a></li>
+<li><a class="reference internal" href="#proxy">Proxy</a></li>
 </ul>
 </li>
 <li><a class="reference internal" href="#types">Types</a></li>

docs/index.html

@@ -25,6 +25,7 @@
 from dataclasses import dataclass
 import datetime
 import http
+import inspect
 import io
 import json
 import logging
@@ -34,7 +35,7 @@
 import sys
 import threading
 import time
-from typing import Any, AsyncIterator, Optional, Tuple, TYPE_CHECKING, Union
+from typing import Any, AsyncIterator, Optional, TYPE_CHECKING, Tuple, Union
 from urllib.parse import urlparse
 from urllib.parse import urlunparse
 
@@ -509,6 +510,11 @@ def __init__(
     )
     self._httpx_client = SyncHttpxClient(**client_args)
     self._async_httpx_client = AsyncHttpxClient(**async_client_args)
+    if has_aiohttp:
+      # Do it once at the genai.Client level. Share among all requests.
+      self._async_client_session_request_args = self._ensure_aiohttp_ssl_ctx(
+          self._http_options
+      )
 
   @staticmethod
   def _ensure_httpx_ssl_ctx(
@@ -561,7 +567,12 @@ def _maybe_set(
       if not args or not args.get(verify):
         args = (args or {}).copy()
         args[verify] = ctx
-      return args
+      # Drop the args that isn't used by the httpx client.
+      copied_args = args.copy()
+      for key in copied_args.copy():
+        if key not in inspect.signature(httpx.Client.__init__).parameters:
+          del copied_args[key]
+      return copied_args
 
     return (
         _maybe_set(args, ctx),
@@ -581,7 +592,7 @@ def _ensure_aiohttp_ssl_ctx(options: HttpOptions) -> dict[str, Any]:
       An async aiohttp ClientSession._request args.
     """
 
-    verify = 'verify'
+    verify = 'ssl'  # keep it consistent with httpx.
     async_args = options.async_client_args
     ctx = async_args.get(verify) if async_args else None
 
@@ -613,10 +624,16 @@ def _maybe_set(
       """
       if not args or not args.get(verify):
         args = (args or {}).copy()
-        args['ssl'] = ctx
-      else:
-        args['ssl'] = args.pop(verify)
-      return args
+        args[verify] = ctx
+      # Drop the args that isn't in the aiohttp RequestOptions.
+      copied_args = args.copy()
+      for key in copied_args.copy():
+        if (
+            key
+            not in inspect.signature(aiohttp.ClientSession._request).parameters
+        ):
+          del copied_args[key]
+      return copied_args
 
     return _maybe_set(async_args, ctx)
 
@@ -819,30 +836,16 @@ async def _async_request(
       if has_aiohttp:
         session = aiohttp.ClientSession(
             headers=http_request.headers,
+            trust_env=True,
+        )
+        response = await session.request(
+            method=http_request.method,
+            url=http_request.url,
+            headers=http_request.headers,
+            data=data,
+            timeout=aiohttp.ClientTimeout(connect=http_request.timeout),
+            **self._async_client_session_request_args,
         )
-        if self._http_options.async_client_args:
-          # When using aiohttp request options with ssl context, the latency will higher than using httpx.
-          # Use it only if necessary. Otherwise, httpx asyncclient is faster.
-          async_client_args = self._ensure_aiohttp_ssl_ctx(
-              self._http_options
-          )
-          response = await session.request(
-              method=http_request.method,
-              url=http_request.url,
-              headers=http_request.headers,
-              data=data,
-              timeout=aiohttp.ClientTimeout(connect=http_request.timeout),
-              **async_client_args,
-          )
-        else:
-          # Aiohttp performs better than httpx w/o ssl context.
-          response = await session.request(
-              method=http_request.method,
-              url=http_request.url,
-              headers=http_request.headers,
-              data=data,
-              timeout=aiohttp.ClientTimeout(connect=http_request.timeout),
-          )
         await errors.APIError.raise_for_async_response(response)
         return HttpResponse(response.headers, response)
       else:
@@ -862,39 +865,20 @@ async def _async_request(
         return HttpResponse(client_response.headers, client_response)
     else:
       if has_aiohttp:
-        if self._http_options.async_client_args:
-          # Note that when using aiohttp request options with ssl context, the
-          # latency will higher than using httpx async client with ssl context.
-          async_client_args = self._ensure_aiohttp_ssl_ctx(
-              self._http_options
+        async with aiohttp.ClientSession(
+            headers=http_request.headers,
+            trust_env=True,
+        ) as session:
+          response = await session.request(
+              method=http_request.method,
+              url=http_request.url,
+              headers=http_request.headers,
+              data=data,
+              timeout=aiohttp.ClientTimeout(connect=http_request.timeout),
+              **self._async_client_session_request_args,
           )
-          async with aiohttp.ClientSession(
-              headers=http_request.headers
-          ) as session:
-            response = await session.request(
-                method=http_request.method,
-                url=http_request.url,
-                headers=http_request.headers,
-                data=data,
-                timeout=aiohttp.ClientTimeout(connect=http_request.timeout),
-                **async_client_args,
-            )
-            await errors.APIError.raise_for_async_response(response)
-            return HttpResponse(response.headers, [await response.text()])
-        else:
-          # Aiohttp performs better than httpx if not using ssl context.
-          async with aiohttp.ClientSession(
-              headers=http_request.headers
-          ) as session:
-            response = await session.request(
-                method=http_request.method,
-                url=http_request.url,
-                headers=http_request.headers,
-                data=data,
-                timeout=aiohttp.ClientTimeout(connect=http_request.timeout),
-            )
-            await errors.APIError.raise_for_async_response(response)
-            return HttpResponse(response.headers, [await response.text()])
+          await errors.APIError.raise_for_async_response(response)
+          return HttpResponse(response.headers, [await response.text()])
       else:
         # aiohttp is not available. Fall back to httpx.
         client_response = await self._async_httpx_client.request(
@@ -1192,7 +1176,8 @@ async def _async_upload_fd(
     # Upload the file in chunks
     if has_aiohttp:  # pylint: disable=g-import-not-at-top
       async with aiohttp.ClientSession(
-          headers=self._http_options.headers
+          headers=self._http_options.headers,
+          trust_env=True,
       ) as session:
         while True:
           if isinstance(file, io.IOBase):
@@ -1367,7 +1352,10 @@ async def async_download_file(
         data = http_request.data
 
     if has_aiohttp:
-      async with aiohttp.ClientSession(headers=http_request.headers) as session:
+      async with aiohttp.ClientSession(
+          headers=http_request.headers,
+          trust_env=True,
+      ) as session:
         response = await session.request(
             method=http_request.method,
             url=http_request.url,

docs/searchindex.js

@@ -517,9 +517,23 @@ def _FunctionDeclaration_to_mldev(
   if getv(from_object, ['parameters']) is not None:
     setv(to_object, ['parameters'], getv(from_object, ['parameters']))
 
+  if getv(from_object, ['parameters_json_schema']) is not None:
+    setv(
+        to_object,
+        ['parametersJsonSchema'],
+        getv(from_object, ['parameters_json_schema']),
+    )
+
   if getv(from_object, ['response']) is not None:
     setv(to_object, ['response'], getv(from_object, ['response']))
 
+  if getv(from_object, ['response_json_schema']) is not None:
+    setv(
+        to_object,
+        ['responseJsonSchema'],
+        getv(from_object, ['response_json_schema']),
+    )
+
   return to_object
 
 
@@ -541,9 +555,23 @@ def _FunctionDeclaration_to_vertex(
   if getv(from_object, ['parameters']) is not None:
     setv(to_object, ['parameters'], getv(from_object, ['parameters']))
 
+  if getv(from_object, ['parameters_json_schema']) is not None:
+    setv(
+        to_object,
+        ['parametersJsonSchema'],
+        getv(from_object, ['parameters_json_schema']),
+    )
+
   if getv(from_object, ['response']) is not None:
     setv(to_object, ['response'], getv(from_object, ['response']))
 
+  if getv(from_object, ['response_json_schema']) is not None:
+    setv(
+        to_object,
+        ['responseJsonSchema'],
+        getv(from_object, ['response_json_schema']),
+    )
+
   return to_object
 
 

google/genai/_api_client.py

@@ -517,9 +517,23 @@ def _FunctionDeclaration_to_mldev(
   if getv(from_object, ['parameters']) is not None:
     setv(to_object, ['parameters'], getv(from_object, ['parameters']))
 
+  if getv(from_object, ['parameters_json_schema']) is not None:
+    setv(
+        to_object,
+        ['parametersJsonSchema'],
+        getv(from_object, ['parameters_json_schema']),
+    )
+
   if getv(from_object, ['response']) is not None:
     setv(to_object, ['response'], getv(from_object, ['response']))
 
+  if getv(from_object, ['response_json_schema']) is not None:
+    setv(
+        to_object,
+        ['responseJsonSchema'],
+        getv(from_object, ['response_json_schema']),
+    )
+
   return to_object
 
 
@@ -541,9 +555,23 @@ def _FunctionDeclaration_to_vertex(
   if getv(from_object, ['parameters']) is not None:
     setv(to_object, ['parameters'], getv(from_object, ['parameters']))
 
+  if getv(from_object, ['parameters_json_schema']) is not None:
+    setv(
+        to_object,
+        ['parametersJsonSchema'],
+        getv(from_object, ['parameters_json_schema']),
+    )
+
   if getv(from_object, ['response']) is not None:
     setv(to_object, ['response'], getv(from_object, ['response']))
 
+  if getv(from_object, ['response_json_schema']) is not None:
+    setv(
+        to_object,
+        ['responseJsonSchema'],
+        getv(from_object, ['response_json_schema']),
+    )
+
   return to_object