google-genai 1.18.0__py3-none-any.whl → 1.19.0__py3-none-any.whl

google/genai/_api_client.py

@@ -68,6 +68,26 @@ class EphemeralTokenAPIKeyError(ValueError):
   """Error raised when the API key is invalid."""
 
 
+# This method checks for the API key in the environment variables. Google API
+# key is precedenced over Gemini API key.
+def _get_env_api_key() -> Optional[str]:
+  """Gets the API key from environment variables, prioritizing GOOGLE_API_KEY.
+
+  Returns:
+      The API key string if found, otherwise None. Empty string is considered
+      invalid.
+  """
+  env_google_api_key = os.environ.get('GOOGLE_API_KEY', None)
+  env_gemini_api_key = os.environ.get('GEMINI_API_KEY', None)
+  if env_google_api_key and env_gemini_api_key:
+    logger.warning(
+        'Both GOOGLE_API_KEY and GEMINI_API_KEY are set. Using'
+        ' GOOGLE_API_KEY.'
+    )
+
+  return env_google_api_key or env_gemini_api_key or None
+
+
 def _append_library_version_headers(headers: dict[str, str]) -> None:
   """Appends the telemetry header to the headers dict."""
   library_label = f'google-genai-sdk/{version.__version__}'
@@ -371,7 +391,7 @@ class BaseApiClient:
     # Retrieve implicitly set values from the environment.
     env_project = os.environ.get('GOOGLE_CLOUD_PROJECT', None)
     env_location = os.environ.get('GOOGLE_CLOUD_LOCATION', None)
-    env_api_key = os.environ.get('GOOGLE_API_KEY', None)
+    env_api_key = _get_env_api_key()
     self.project = project or env_project
     self.location = location or env_location
     self.api_key = api_key or env_api_key

google/genai/_live_converters.py

@@ -981,7 +981,13 @@ def _Tool_to_vertex(
     )
 
   if getv(from_object, ['url_context']) is not None:
-    raise ValueError('url_context parameter is not supported in Vertex AI.')
+    setv(
+        to_object,
+        ['urlContext'],
+        _UrlContext_to_vertex(
+            api_client, getv(from_object, ['url_context']), to_object
+        ),
+    )
 
   if getv(from_object, ['code_execution']) is not None:
     setv(to_object, ['codeExecution'], getv(from_object, ['code_execution']))

google/genai/_tokens_converters.py

@@ -981,7 +981,13 @@ def _Tool_to_vertex(
     )
 
   if getv(from_object, ['url_context']) is not None:
-    raise ValueError('url_context parameter is not supported in Vertex AI.')
+    setv(
+        to_object,
+        ['urlContext'],
+        _UrlContext_to_vertex(
+            api_client, getv(from_object, ['url_context']), to_object
+        ),
+    )
 
   if getv(from_object, ['code_execution']) is not None:
     setv(to_object, ['codeExecution'], getv(from_object, ['code_execution']))

google/genai/caches.py

@@ -1092,7 +1092,13 @@ def _Tool_to_vertex(
     )
 
   if getv(from_object, ['url_context']) is not None:
-    raise ValueError('url_context parameter is not supported in Vertex AI.')
+    setv(
+        to_object,
+        ['urlContext'],
+        _UrlContext_to_vertex(
+            api_client, getv(from_object, ['url_context']), to_object
+        ),
+    )
 
   if getv(from_object, ['code_execution']) is not None:
     setv(to_object, ['codeExecution'], getv(from_object, ['code_execution']))

google/genai/models.py

@@ -1422,7 +1422,11 @@ def _GenerateVideosConfig_to_mldev(
     )
 
   if getv(from_object, ['enhance_prompt']) is not None:
-    raise ValueError('enhance_prompt parameter is not supported in Gemini API.')
+    setv(
+        parent_object,
+        ['parameters', 'enhancePrompt'],
+        getv(from_object, ['enhance_prompt']),
+    )
 
   if getv(from_object, ['generate_audio']) is not None:
     raise ValueError('generate_audio parameter is not supported in Gemini API.')
@@ -1981,7 +1985,13 @@ def _Tool_to_vertex(
     )
 
   if getv(from_object, ['url_context']) is not None:
-    raise ValueError('url_context parameter is not supported in Vertex AI.')
+    setv(
+        to_object,
+        ['urlContext'],
+        _UrlContext_to_vertex(
+            api_client, getv(from_object, ['url_context']), to_object
+        ),
+    )
 
   if getv(from_object, ['code_execution']) is not None:
     setv(to_object, ['codeExecution'], getv(from_object, ['code_execution']))
@@ -4294,6 +4304,15 @@ def _Candidate_from_vertex(
   if getv(from_object, ['finishReason']) is not None:
     setv(to_object, ['finish_reason'], getv(from_object, ['finishReason']))
 
+  if getv(from_object, ['urlContextMetadata']) is not None:
+    setv(
+        to_object,
+        ['url_context_metadata'],
+        _UrlContextMetadata_from_vertex(
+            api_client, getv(from_object, ['urlContextMetadata']), to_object
+        ),
+    )
+
   if getv(from_object, ['avgLogprobs']) is not None:
     setv(to_object, ['avg_logprobs'], getv(from_object, ['avgLogprobs']))
 

google/genai/tokens.py

@@ -143,6 +143,7 @@ class Tokens(_api_module.BaseModule):
     Usage:
 
     .. code-block:: python
+
       # Case 1: If LiveEphemeralParameters is unset, unlock LiveConnectConfig
       # when using the token in Live API sessions. Each session connection can
       # use a different configuration.
@@ -154,6 +155,7 @@ class Tokens(_api_module.BaseModule):
       auth_token = client.tokens.create(config=config)
 
     .. code-block:: python
+
       # Case 2: If LiveEphemeralParameters is set, lock all fields in
       # LiveConnectConfig when using the token in Live API sessions. For
       # example, changing `output_audio_transcription` in the Live API
@@ -170,7 +172,9 @@ class Tokens(_api_module.BaseModule):
               ),
           )
       )
-      .. code-block:: python
+
+    .. code-block:: python
+
       # Case 3: If LiveEphemeralParameters is set and lockAdditionalFields is
       # empty, lock LiveConnectConfig with set fields (e.g.
       # system_instruction in this example) when using the token in Live API
@@ -187,7 +191,8 @@ class Tokens(_api_module.BaseModule):
           )
       )
 
-      .. code-block:: python
+    .. code-block:: python
+
       # Case 4: If LiveEphemeralParameters is set and lockAdditionalFields is
       # set, lock LiveConnectConfig with set and additional fields (e.g.
       # system_instruction, temperature in this example) when using the token

google/genai/types.py

@@ -59,17 +59,21 @@ _is_mcp_imported = False
 if typing.TYPE_CHECKING:
   from mcp import types as mcp_types
   from mcp import ClientSession as McpClientSession
+  from mcp.types import CallToolResult as McpCallToolResult
 
   _is_mcp_imported = True
 else:
   McpClientSession: typing.Type = Any
+  McpCallToolResult: typing.Type = Any
   try:
     from mcp import types as mcp_types
     from mcp import ClientSession as McpClientSession
+    from mcp.types import CallToolResult as McpCallToolResult
 
     _is_mcp_imported = True
   except ImportError:
     McpClientSession = None
+    McpCallToolResult = None
 
 logger = logging.getLogger('google_genai.types')
 
@@ -845,6 +849,21 @@ class FunctionResponse(_common.BaseModel):
       description="""Required. The function response in JSON object format. Use "output" key to specify function output and "error" key to specify error details (if any). If "output" and "error" keys are not specified, then whole "response" is treated as function output.""",
   )
 
+  @classmethod
+  def from_mcp_response(
+      cls, *, name: str, response: McpCallToolResult
+  ) -> 'FunctionResponse':
+    if not _is_mcp_imported:
+      raise ValueError(
+          'MCP response is not supported. Please ensure that the MCP library is'
+          ' imported.'
+      )
+
+    if response.isError:
+      return cls(name=name, response={'error': 'MCP response is error.'})
+    else:
+      return cls(name=name, response={'result': response.content})
+
 
 class FunctionResponseDict(TypedDict, total=False):
   """A function response."""
@@ -1925,12 +1944,16 @@ class FunctionDeclaration(_common.BaseModel):
     from . import _automatic_function_calling_util
 
     parameters_properties = {}
+    annotation_under_future = typing.get_type_hints(callable)
     for name, param in inspect.signature(callable).parameters.items():
       if param.kind in (
           inspect.Parameter.POSITIONAL_OR_KEYWORD,
           inspect.Parameter.KEYWORD_ONLY,
           inspect.Parameter.POSITIONAL_ONLY,
       ):
+        # This snippet catches the case when type hints are stored as strings
+        if isinstance(param.annotation, str):
+          param = param.replace(annotation=annotation_under_future[name])
         schema = _automatic_function_calling_util._parse_schema_from_parameter(
             api_option, param, callable.__name__
         )
@@ -1952,6 +1975,7 @@ class FunctionDeclaration(_common.BaseModel):
               declaration.parameters
           )
       )
+    # TODO: b/421991354 - Remove this check once the bug is fixed.
     if api_option == 'GEMINI_API':
       return declaration
 
@@ -1959,14 +1983,21 @@ class FunctionDeclaration(_common.BaseModel):
     if return_annotation is inspect._empty:
       return declaration
 
+    return_value = inspect.Parameter(
+        'return_value',
+        inspect.Parameter.POSITIONAL_OR_KEYWORD,
+        annotation=return_annotation,
+    )
+
+    # This snippet catches the case when type hints are stored as strings
+    if isinstance(return_value.annotation, str):
+      return_value = return_value.replace(
+          annotation=annotation_under_future['return']
+      )
     declaration.response = (
         _automatic_function_calling_util._parse_schema_from_parameter(
             api_option,
-            inspect.Parameter(
-                'return_value',
-                inspect.Parameter.POSITIONAL_OR_KEYWORD,
-                annotation=return_annotation,
-            ),
+            return_value,
             callable.__name__,
         )
     )

google/genai/version.py

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

{google_genai-1.18.0.dist-info → google_genai-1.19.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: google-genai
-Version: 1.18.0
+Version: 1.19.0
 Summary: GenAI Python SDK
 Author-email: Google LLC <googleapis-packages@google.com>
 License: Apache-2.0

{google_genai-1.18.0.dist-info → google_genai-1.19.0.dist-info}/RECORD

@@ -1,35 +1,35 @@
 google/genai/__init__.py,sha256=SYTxz3Ho06pP2TBlvDU0FkUJz8ytbR3MgEpS9HvVYq4,709
 google/genai/_adapters.py,sha256=Kok38miNYJff2n--l0zEK_hbq0y2rWOH7k75J7SMYbQ,1744
-google/genai/_api_client.py,sha256=3OAM8kIbcH4e9Jyne40QgvsfgRvxD5jcwUtFECXts4o,38198
+google/genai/_api_client.py,sha256=AOhv4_L9aTDzT6ALvH54s5ozPUPCx4w4ShLdh8qpXvM,38879
 google/genai/_api_module.py,sha256=lj8eUWx8_LBGBz-49qz6_ywWm3GYp3d8Bg5JoOHbtbI,902
 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=hDqunjaAL__GXZzhr37QGOCR6z6PMc_EfiRy_ukAxHo,11545
 google/genai/_extra_utils.py,sha256=_w8hB9Ag7giRR94nIOBJFTLiLEufulPXkCZpJG1XY5g,19241
-google/genai/_live_converters.py,sha256=sI_j8iRcDB10wp7MXEeN-EsPO81tYTjxCqV3BU2AdOc,115394
+google/genai/_live_converters.py,sha256=8J0h9JUdkwkPFugFBAW4EKTMkZATMDZWgNkc9WOh2Hg,115488
 google/genai/_mcp_utils.py,sha256=khECx-DMuHemKzOQQ3msWp7FivPeEOnl3n1lvWc_b5o,3833
 google/genai/_replay_api_client.py,sha256=BrnKkdUVejpuHvqVHK0V4m4TjvL4LaBLHRMv6vw0vGE,21361
 google/genai/_test_api_client.py,sha256=4ruFIy5_1qcbKqqIBu3HSQbpSOBrxiecBtDZaTGFR1s,4797
-google/genai/_tokens_converters.py,sha256=UGVfeY6jdOZw0f1jFQjibZAm5OVgovk9iLX7q8EwMYU,51383
+google/genai/_tokens_converters.py,sha256=IUmpIC7nKjZzp_azavxXgeML35nYSC0KRkCnGG0iZao,51477
 google/genai/_transformers.py,sha256=Ii8u54Ni8388jU8OAei5sixZAmFP3o-OKbxomzBul4o,35557
 google/genai/batches.py,sha256=gyNb--psM7cqXEP5RsJ908ismvsFFlDNRxt7mCwhYgM,34943
-google/genai/caches.py,sha256=YX8dZ64NwxNBvN6kA7FbrJLyxDt9ROO0GSjM6lwh7to,67944
+google/genai/caches.py,sha256=Z1DiYwZUjY9zrCapfEFOz77lwfWyCsAbnrcMF2tr24g,68038
 google/genai/chats.py,sha256=Hl08SbpSCMS0kYiBNGNzPI8q3rijGEW_up0g2Wun9cY,17044
 google/genai/client.py,sha256=9AWoFL2g-OQFA4Zqpecg74b7h3i5Q9ZlXF4bFePV0zA,10759
 google/genai/errors.py,sha256=nLAVglUGuPdLqLcnN_VCifoi7V17u9BQ9AfxUdRzZLg,4795
 google/genai/files.py,sha256=PB5Rh5WiLOPHcqPR1inGyhqL9PiE0BFHSL4Dz9HKtl8,39516
 google/genai/live.py,sha256=ZpXHO7AFayOz2viISxs34rlG85dFH9qk-5-qOC9pcZE,39375
 google/genai/live_music.py,sha256=lO-nDz2gEJ8bYesJC1Aru4IrsV7raEePf4sH3QQT6yI,7119
-google/genai/models.py,sha256=bEOw_yJZaSyrtRLcQGKbNnCglEaJlaWRfgsYB7bPitk,239064
+google/genai/models.py,sha256=B9T4g7VLUiaZbUADKJG1UrVlvwQziZbUSgOXo3yj4oA,239463
 google/genai/operations.py,sha256=wWGngU4N3U2y_JteBkwqTmoNncehk2NcZgPyHaVulfI,20304
 google/genai/pagers.py,sha256=nyVYxp92rS-UaewO_oBgP593knofeLU6yOn6RolNoGQ,6797
 google/genai/py.typed,sha256=RsMFoLwBkAvY05t6izop4UHZtqOPLiKp3GkIEizzmQY,40
-google/genai/tokens.py,sha256=g2gxefzN5-36B5qUkLL6MBSe31IgXgW7k_WEstRZypg,12187
+google/genai/tokens.py,sha256=31HRdGkuN1VkHn21qKBwa6PeiLFGMN-aFldPIGo9WxE,12188
 google/genai/tunings.py,sha256=aEKTVfpn6rYWEKu0CRaS93mo2iLQtX5K3nSqX6UB_jM,49500
-google/genai/types.py,sha256=5-K9Kjiz4uJ8l9Rvvz5ECk2KpZIB1TbiO3XMRAm0ec0,436202
-google/genai/version.py,sha256=o6GbhuHH2YKfI3OQYURWLIO_0gx-b_nyVeW_WdmRq4c,627
-google_genai-1.18.0.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-google_genai-1.18.0.dist-info/METADATA,sha256=sW0PT6O5RCIOst08GQj-YduUjspFSxA-GT3bxcMhDjM,35579
-google_genai-1.18.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-google_genai-1.18.0.dist-info/top_level.txt,sha256=_1QvSJIhFAGfxb79D6DhB7SUw2X6T4rwnz_LLrbcD3c,7
-google_genai-1.18.0.dist-info/RECORD,,
+google/genai/types.py,sha256=SjZ9GaMEHn_YoOHnCLQm0Sl9AsnYPqBVbExlF6l9fo4,437412
+google/genai/version.py,sha256=4Bj2qKIYUQDZnSbV8me-05HqXSvijhv-sXzln7K77wA,627
+google_genai-1.19.0.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+google_genai-1.19.0.dist-info/METADATA,sha256=AdmMMUAAVkTxCNDAANY8SJsTlxBoXVKg2zdxj4-RgOs,35579
+google_genai-1.19.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+google_genai-1.19.0.dist-info/top_level.txt,sha256=_1QvSJIhFAGfxb79D6DhB7SUw2X6T4rwnz_LLrbcD3c,7
+google_genai-1.19.0.dist-info/RECORD,,