google-genai 1.44.0__py3-none-any.whl → 1.46.0__py3-none-any.whl

google/genai/_api_client.py

@@ -692,8 +692,16 @@ class BaseApiClient:
     client_args, async_client_args = self._ensure_httpx_ssl_ctx(
         self._http_options
     )
-    self._httpx_client = SyncHttpxClient(**client_args)
-    self._async_httpx_client = AsyncHttpxClient(**async_client_args)
+    self._async_httpx_client_args = async_client_args
+
+    if self._http_options.httpx_client:
+      self._httpx_client = self._http_options.httpx_client
+    else:
+      self._httpx_client = SyncHttpxClient(**client_args)
+    if self._http_options.httpx_async_client:
+      self._async_httpx_client = self._http_options.httpx_async_client
+    else:
+      self._async_httpx_client = AsyncHttpxClient(**async_client_args)
     if self._use_aiohttp():
       # Do it once at the genai.Client level. Share among all requests.
       self._async_client_session_request_args = self._ensure_aiohttp_ssl_ctx(

google/genai/_common.py

@@ -272,9 +272,7 @@ def convert_to_dict(obj: object, convert_keys: bool = False) -> Any:
     return convert_to_dict(obj.model_dump(exclude_none=True), convert_keys)
   elif isinstance(obj, dict):
     return {
-        maybe_snake_to_camel(key, convert_keys): convert_to_dict(
-            value, convert_keys
-        )
+        maybe_snake_to_camel(key, convert_keys): convert_to_dict(value)
         for key, value in obj.items()
     }
   elif isinstance(obj, list):

google/genai/_live_converters.py

@@ -226,6 +226,11 @@ def _GenerationConfig_to_vertex(
   if getv(from_object, ['top_p']) is not None:
     setv(to_object, ['topP'], getv(from_object, ['top_p']))
 
+  if getv(from_object, ['enable_enhanced_civic_answers']) is not None:
+    raise ValueError(
+        'enable_enhanced_civic_answers parameter is not supported in Vertex AI.'
+    )
+
   return to_object
 
 

google/genai/_replay_api_client.py

@@ -56,8 +56,13 @@ def _normalize_json_case(obj: Any) -> Any:
     return [_normalize_json_case(item) for item in obj]
   elif isinstance(obj, enum.Enum):
     return obj.value
-  else:
-    return obj
+  elif isinstance(obj, str):
+    # Python >= 3.14 has a new division by zero error message.
+    if 'division by zero' in obj:
+      return obj.replace(
+          'division by zero', 'integer division or modulo by zero'
+      )
+  return obj
 
 
 def _equals_ignore_key_case(obj1: Any, obj2: Any) -> bool:
@@ -88,7 +93,7 @@ def _equals_ignore_key_case(obj1: Any, obj2: Any) -> bool:
 
 def _redact_version_numbers(version_string: str) -> str:
   """Redacts version numbers in the form x.y.z from a string."""
-  return re.sub(r'\d+\.\d+\.\d+', '{VERSION_NUMBER}', version_string)
+  return re.sub(r'\d+\.\d+\.\d+[a-zA-Z0-9]*', '{VERSION_NUMBER}', version_string)
 
 
 def _redact_language_label(language_label: str) -> str:

google/genai/models.py

@@ -2398,6 +2398,11 @@ def _GenerationConfig_to_vertex(
   if getv(from_object, ['top_p']) is not None:
     setv(to_object, ['topP'], getv(from_object, ['top_p']))
 
+  if getv(from_object, ['enable_enhanced_civic_answers']) is not None:
+    raise ValueError(
+        'enable_enhanced_civic_answers parameter is not supported in Vertex AI.'
+    )
+
   return to_object
 
 
@@ -6856,7 +6861,7 @@ class AsyncModels(_api_module.BaseModule):
       # * Everlasting Florals
       # * Timeless Petals
 
-      async for chunk in awiat client.aio.models.generate_content_stream(
+      async for chunk in await client.aio.models.generate_content_stream(
         model='gemini-2.0-flash',
         contents=[
           types.Part.from_text('What is shown in this image?'),
@@ -6898,9 +6903,11 @@ class AsyncModels(_api_module.BaseModule):
         response = await self._generate_content_stream(
             model=model, contents=contents, config=config
         )
-        logger.info(f'AFC remote call {i} is done.')
+        # TODO: b/453739108 - make AFC logic more robust like the other 3 methods.
+        if i > 1:
+          logger.info(f'AFC remote call {i} is done.')
         remaining_remote_calls_afc -= 1
-        if remaining_remote_calls_afc == 0:
+        if i > 1 and remaining_remote_calls_afc == 0:
           logger.info(
               'Reached max remote calls for automatic function calling.'
           )
@@ -7270,6 +7277,36 @@ class AsyncModels(_api_module.BaseModule):
           'Source and prompt/image/video are mutually exclusive.'
           + ' Please only use source.'
       )
+    # Gemini Developer API does not support video bytes.
+    video_dct: dict[str, Any] = {}
+    if not self._api_client.vertexai and video:
+      if isinstance(video, types.Video):
+        video_dct = video.model_dump()
+      else:
+        video_dct = dict(video)
+
+      if video_dct.get('uri') and video_dct.get('video_bytes'):
+        video = types.Video(
+            uri=video_dct.get('uri'), mime_type=video_dct.get('mime_type')
+        )
+    elif not self._api_client.vertexai and source:
+      if isinstance(source, types.GenerateVideosSource):
+        source_dct = source.model_dump()
+        video_dct = source_dct.get('video', {})
+      else:
+        source_dct = dict(source)
+        if isinstance(source_dct.get('video'), types.Video):
+          video_obj: types.Video = source_dct.get('video', types.Video())
+          video_dct = video_obj.model_dump()
+      if video_dct and video_dct.get('uri') and video_dct.get('video_bytes'):
+        source = types.GenerateVideosSource(
+            prompt=source_dct.get('prompt'),
+            image=source_dct.get('image'),
+            video=types.Video(
+                uri=video_dct.get('uri'),
+                mime_type=video_dct.get('mime_type'),
+            ),
+        )
     return await self._generate_videos(
         model=model,
         prompt=prompt,

google/genai/tunings.py

@@ -551,36 +551,6 @@ def _TuningJob_from_mldev(
         _TunedModel_from_mldev(getv(from_object, ['_self']), to_object),
     )
 
-  if getv(from_object, ['customBaseModel']) is not None:
-    setv(
-        to_object, ['custom_base_model'], getv(from_object, ['customBaseModel'])
-    )
-
-  if getv(from_object, ['experiment']) is not None:
-    setv(to_object, ['experiment'], getv(from_object, ['experiment']))
-
-  if getv(from_object, ['labels']) is not None:
-    setv(to_object, ['labels'], getv(from_object, ['labels']))
-
-  if getv(from_object, ['outputUri']) is not None:
-    setv(to_object, ['output_uri'], getv(from_object, ['outputUri']))
-
-  if getv(from_object, ['pipelineJob']) is not None:
-    setv(to_object, ['pipeline_job'], getv(from_object, ['pipelineJob']))
-
-  if getv(from_object, ['serviceAccount']) is not None:
-    setv(to_object, ['service_account'], getv(from_object, ['serviceAccount']))
-
-  if getv(from_object, ['tunedModelDisplayName']) is not None:
-    setv(
-        to_object,
-        ['tuned_model_display_name'],
-        getv(from_object, ['tunedModelDisplayName']),
-    )
-
-  if getv(from_object, ['veoTuningSpec']) is not None:
-    setv(to_object, ['veo_tuning_spec'], getv(from_object, ['veoTuningSpec']))
-
   return to_object
 
 

google/genai/types.py

@@ -89,6 +89,27 @@ else:
   except ImportError:
     yaml = None
 
+_is_httpx_imported = False
+if typing.TYPE_CHECKING:
+  import httpx
+
+  HttpxClient = httpx.Client
+  HttpxAsyncClient = httpx.AsyncClient
+  _is_httpx_imported = True
+else:
+  HttpxClient: typing.Type = Any
+  HttpxAsyncClient: typing.Type = Any
+
+  try:
+    import httpx
+
+    HttpxClient = httpx.Client
+    HttpxAsyncClient = httpx.AsyncClient
+    _is_httpx_imported = True
+  except ImportError:
+    HttpxClient = None
+    HttpxAsyncClient = None
+
 logger = logging.getLogger('google_genai.types')
 
 T = typing.TypeVar('T', bound='GenerateContentResponse')
@@ -118,6 +139,19 @@ class Language(_common.CaseInSensitiveEnum):
   """Python >= 3.10, with numpy and simpy available."""
 
 
+class FunctionResponseScheduling(_common.CaseInSensitiveEnum):
+  """Specifies how the response should be scheduled in the conversation."""
+
+  SCHEDULING_UNSPECIFIED = 'SCHEDULING_UNSPECIFIED'
+  """This value is unused."""
+  SILENT = 'SILENT'
+  """Only add the result to the conversation context, do not interrupt or trigger generation."""
+  WHEN_IDLE = 'WHEN_IDLE'
+  """Add the result to the conversation context, and prompt to generate output without interrupting ongoing generation."""
+  INTERRUPT = 'INTERRUPT'
+  """Add the result to the conversation context, interrupt ongoing generation and prompt to generate output."""
+
+
 class Type(_common.CaseInSensitiveEnum):
   """Optional. The type of the data."""
 
@@ -144,14 +178,14 @@ class HarmCategory(_common.CaseInSensitiveEnum):
 
   HARM_CATEGORY_UNSPECIFIED = 'HARM_CATEGORY_UNSPECIFIED'
   """The harm category is unspecified."""
-  HARM_CATEGORY_HATE_SPEECH = 'HARM_CATEGORY_HATE_SPEECH'
-  """The harm category is hate speech."""
-  HARM_CATEGORY_DANGEROUS_CONTENT = 'HARM_CATEGORY_DANGEROUS_CONTENT'
-  """The harm category is dangerous content."""
   HARM_CATEGORY_HARASSMENT = 'HARM_CATEGORY_HARASSMENT'
   """The harm category is harassment."""
+  HARM_CATEGORY_HATE_SPEECH = 'HARM_CATEGORY_HATE_SPEECH'
+  """The harm category is hate speech."""
   HARM_CATEGORY_SEXUALLY_EXPLICIT = 'HARM_CATEGORY_SEXUALLY_EXPLICIT'
   """The harm category is sexually explicit content."""
+  HARM_CATEGORY_DANGEROUS_CONTENT = 'HARM_CATEGORY_DANGEROUS_CONTENT'
+  """The harm category is dangerous content."""
   HARM_CATEGORY_CIVIC_INTEGRITY = 'HARM_CATEGORY_CIVIC_INTEGRITY'
   """Deprecated: Election filter is not longer supported. The harm category is civic integrity."""
   HARM_CATEGORY_IMAGE_HATE = 'HARM_CATEGORY_IMAGE_HATE'
@@ -166,6 +200,8 @@ class HarmCategory(_common.CaseInSensitiveEnum):
       'HARM_CATEGORY_IMAGE_SEXUALLY_EXPLICIT'
   )
   """The harm category is image sexually explicit content."""
+  HARM_CATEGORY_JAILBREAK = 'HARM_CATEGORY_JAILBREAK'
+  """The harm category is for jailbreak prompts."""
 
 
 class HarmBlockMethod(_common.CaseInSensitiveEnum):
@@ -322,20 +358,24 @@ class HarmSeverity(_common.CaseInSensitiveEnum):
 
 
 class BlockedReason(_common.CaseInSensitiveEnum):
-  """Output only. Blocked reason."""
+  """Output only. The reason why the prompt was blocked."""
 
   BLOCKED_REASON_UNSPECIFIED = 'BLOCKED_REASON_UNSPECIFIED'
-  """Unspecified blocked reason."""
+  """The blocked reason is unspecified."""
   SAFETY = 'SAFETY'
-  """Candidates blocked due to safety."""
+  """The prompt was blocked for safety reasons."""
   OTHER = 'OTHER'
-  """Candidates blocked due to other reason."""
+  """The prompt was blocked for other reasons. For example, it may be due to the prompt's language, or because it contains other harmful content."""
   BLOCKLIST = 'BLOCKLIST'
-  """Candidates blocked due to the terms which are included from the terminology blocklist."""
+  """The prompt was blocked because it contains a term from the terminology blocklist."""
   PROHIBITED_CONTENT = 'PROHIBITED_CONTENT'
-  """Candidates blocked due to prohibited content."""
+  """The prompt was blocked because it contains prohibited content."""
   IMAGE_SAFETY = 'IMAGE_SAFETY'
-  """Candidates blocked due to unsafe image generation content."""
+  """The prompt was blocked because it contains content that is unsafe for image generation."""
+  MODEL_ARMOR = 'MODEL_ARMOR'
+  """The prompt was blocked by Model Armor."""
+  JAILBREAK = 'JAILBREAK'
+  """The prompt was blocked as a jailbreak attempt."""
 
 
 class TrafficType(_common.CaseInSensitiveEnum):
@@ -702,19 +742,6 @@ class MediaModality(_common.CaseInSensitiveEnum):
   """Document, e.g. PDF."""
 
 
-class FunctionResponseScheduling(_common.CaseInSensitiveEnum):
-  """Specifies how the response should be scheduled in the conversation."""
-
-  SCHEDULING_UNSPECIFIED = 'SCHEDULING_UNSPECIFIED'
-  """This value is unused."""
-  SILENT = 'SILENT'
-  """Only add the result to the conversation context, do not interrupt or trigger generation."""
-  WHEN_IDLE = 'WHEN_IDLE'
-  """Add the result to the conversation context, and prompt to generate output without interrupting ongoing generation."""
-  INTERRUPT = 'INTERRUPT'
-  """Add the result to the conversation context, interrupt ongoing generation and prompt to generate output."""
-
-
 class StartSensitivity(_common.CaseInSensitiveEnum):
   """Start of speech sensitivity."""
 
@@ -1530,6 +1557,15 @@ class HttpOptions(_common.BaseModel):
       default=None, description="""HTTP retry options for the request."""
   )
 
+  httpx_client: Optional['HttpxClient'] = Field(
+      default=None,
+      description="""A custom httpx client to be used for the request.""",
+  )
+  httpx_async_client: Optional['HttpxAsyncClient'] = Field(
+      default=None,
+      description="""A custom httpx async client to be used for the request.""",
+  )
+
 
 class HttpOptionsDict(TypedDict, total=False):
   """HTTP options to be used in each of the requests."""
@@ -1696,6 +1732,10 @@ class JSONSchema(_common.BaseModel):
           ' matches the instance successfully.'
       ),
   )
+  additional_properties: Optional[Any] = Field(
+      default=None,
+      description="""Can either be a boolean or an object; controls the presence of additional properties.""",
+  )
   any_of: Optional[list['JSONSchema']] = Field(
       default=None,
       description=(
@@ -1704,6 +1744,20 @@ class JSONSchema(_common.BaseModel):
           ' keyword’s value.'
       ),
   )
+  unique_items: Optional[bool] = Field(
+      default=None,
+      description="""Boolean value that indicates whether the items in an array are unique.""",
+  )
+  ref: Optional[str] = Field(
+      default=None,
+      alias='$ref',
+      description="""Allows indirect references between schema nodes.""",
+  )
+  defs: Optional[dict[str, 'JSONSchema']] = Field(
+      default=None,
+      alias='$defs',
+      description="""Schema definitions to be used with $ref.""",
+  )
 
 
 class Schema(_common.BaseModel):
@@ -1915,7 +1969,7 @@ class Schema(_common.BaseModel):
     list_schema_field_names: tuple[str, ...] = (
         'any_of',  # 'one_of', 'all_of', 'not' to come
     )
-    dict_schema_field_names: tuple[str, ...] = ('properties',)  # 'defs' to come
+    dict_schema_field_names: tuple[str, ...] = ('properties',)
 
     related_field_names_by_type: dict[str, tuple[str, ...]] = {
         JSONSchemaType.NUMBER.value: (
@@ -1964,6 +2018,23 @@ class Schema(_common.BaseModel):
     # placeholder for potential gemini api unsupported fields
     gemini_api_unsupported_field_names: tuple[str, ...] = ()
 
+    def _resolve_ref(
+        ref_path: str, root_schema_dict: dict[str, Any]
+    ) -> dict[str, Any]:
+      """Helper to resolve a $ref path."""
+      current = root_schema_dict
+      for part in ref_path.lstrip('#/').split('/'):
+        if part == '$defs':
+          part = 'defs'
+        current = current[part]
+      current.pop('title', None)
+      if 'properties' in current and current['properties'] is not None:
+        for prop_schema in current['properties'].values():
+          if isinstance(prop_schema, dict):
+            prop_schema.pop('title', None)
+
+      return current
+
     def normalize_json_schema_type(
         json_schema_type: Optional[
             Union[JSONSchemaType, Sequence[JSONSchemaType], str, Sequence[str]]
@@ -1972,11 +2043,16 @@ class Schema(_common.BaseModel):
       """Returns (non_null_types, nullable)"""
       if json_schema_type is None:
         return [], False
-      if not isinstance(json_schema_type, Sequence):
-        json_schema_type = [json_schema_type]
+      type_sequence: Sequence[Union[JSONSchemaType, str]]
+      if isinstance(json_schema_type, str) or not isinstance(
+          json_schema_type, Sequence
+      ):
+        type_sequence = [json_schema_type]
+      else:
+        type_sequence = json_schema_type
       non_null_types = []
       nullable = False
-      for type_value in json_schema_type:
+      for type_value in type_sequence:
         if isinstance(type_value, JSONSchemaType):
           type_value = type_value.value
         if type_value == JSONSchemaType.NULL.value:
@@ -1996,7 +2072,10 @@ class Schema(_common.BaseModel):
       for field_name, field_value in json_schema_dict.items():
         if field_value is None:
           continue
-        if field_name not in google_schema_field_names:
+        if field_name not in google_schema_field_names and field_name not in [
+            'ref',
+            'defs',
+        ]:
           raise ValueError(
               f'JSONSchema field "{field_name}" is not supported by the '
               'Schema object. And the "raise_error_on_unsupported_field" '
@@ -2026,12 +2105,19 @@ class Schema(_common.BaseModel):
         )
 
     def convert_json_schema(
-        json_schema: JSONSchema,
+        current_json_schema: JSONSchema,
+        root_json_schema_dict: dict[str, Any],
         api_option: Literal['VERTEX_AI', 'GEMINI_API'],
         raise_error_on_unsupported_field: bool,
     ) -> 'Schema':
       schema = Schema()
-      json_schema_dict = json_schema.model_dump()
+      json_schema_dict = current_json_schema.model_dump()
+
+      if json_schema_dict.get('ref'):
+        json_schema_dict = _resolve_ref(
+            json_schema_dict['ref'], root_json_schema_dict
+        )
+
       raise_error_if_cannot_convert(
           json_schema_dict=json_schema_dict,
           api_option=api_option,
@@ -2057,6 +2143,7 @@ class Schema(_common.BaseModel):
       non_null_types, nullable = normalize_json_schema_type(
           json_schema_dict.get('type', None)
       )
+      is_union_like_type = len(non_null_types) > 1
       if len(non_null_types) > 1:
         logger.warning(
             'JSONSchema type is union-like, e.g. ["null", "string", "array"]. '
@@ -2086,11 +2173,14 @@ class Schema(_common.BaseModel):
       # Pass 2: the JSONSchema.type is not union-like,
       # e.g. 'string', ['string'], ['null', 'string'].
       for field_name, field_value in json_schema_dict.items():
-        if field_value is None:
+        if field_value is None or field_name == 'defs':
           continue
         if field_name in schema_field_names:
+          if field_name == 'items' and not field_value:
+            continue
           schema_field_value: 'Schema' = convert_json_schema(
-              json_schema=JSONSchema(**field_value),
+              current_json_schema=JSONSchema(**field_value),
+              root_json_schema_dict=root_json_schema_dict,
               api_option=api_option,
               raise_error_on_unsupported_field=raise_error_on_unsupported_field,
           )
@@ -2098,17 +2188,21 @@ class Schema(_common.BaseModel):
         elif field_name in list_schema_field_names:
           list_schema_field_value: list['Schema'] = [
               convert_json_schema(
-                  json_schema=JSONSchema(**this_field_value),
+                  current_json_schema=JSONSchema(**this_field_value),
+                  root_json_schema_dict=root_json_schema_dict,
                   api_option=api_option,
                   raise_error_on_unsupported_field=raise_error_on_unsupported_field,
               )
               for this_field_value in field_value
           ]
           setattr(schema, field_name, list_schema_field_value)
+          if not schema.type and not is_union_like_type:
+            schema.type = Type('OBJECT')
         elif field_name in dict_schema_field_names:
           dict_schema_field_value: dict[str, 'Schema'] = {
               key: convert_json_schema(
-                  json_schema=JSONSchema(**value),
+                  current_json_schema=JSONSchema(**value),
+                  root_json_schema_dict=root_json_schema_dict,
                   api_option=api_option,
                   raise_error_on_unsupported_field=raise_error_on_unsupported_field,
               )
@@ -2116,20 +2210,52 @@ class Schema(_common.BaseModel):
           }
           setattr(schema, field_name, dict_schema_field_value)
         elif field_name == 'type':
-          # non_null_types can only be empty or have one element.
-          # because already handled union-like case above.
           non_null_types, nullable = normalize_json_schema_type(field_value)
           if nullable:
             schema.nullable = True
           if non_null_types:
             schema.type = Type(non_null_types[0])
         else:
-          setattr(schema, field_name, field_value)
+          if (
+              hasattr(schema, field_name)
+              and field_name != 'additional_properties'
+          ):
+            setattr(schema, field_name, field_value)
+
+      if (
+          schema.type == 'ARRAY'
+          and schema.items
+          and not schema.items.model_dump(exclude_unset=True)
+      ):
+        schema.items = None
+
+      if schema.any_of and len(schema.any_of) == 2:
+        nullable_part = None
+        type_part = None
+        for part in schema.any_of:
+          # A schema representing `None` will either be of type NULL or just be nullable.
+          part_dict = part.model_dump(exclude_unset=True)
+          if part_dict == {'nullable': True} or part_dict == {'type': 'NULL'}:
+            nullable_part = part
+          else:
+            type_part = part
+
+        # If we found both parts, unwrap them into a single schema.
+        if nullable_part and type_part:
+          default_value = schema.default
+          schema = type_part
+          schema.nullable = True
+          # Carry the default value over to the unwrapped schema
+          if default_value is not None:
+            schema.default = default_value
 
       return schema
 
+    # This is the initial call to the recursive function.
+    root_schema_dict = json_schema.model_dump()
     return convert_json_schema(
-        json_schema=json_schema,
+        current_json_schema=json_schema,
+        root_json_schema_dict=root_schema_dict,
         api_option=api_option,
         raise_error_on_unsupported_field=raise_error_on_unsupported_field,
     )
@@ -2371,7 +2497,32 @@ class FunctionDeclaration(_common.BaseModel):
             json_schema_dict = _automatic_function_calling_util._add_unevaluated_items_to_fixed_len_tuple_schema(
                 json_schema_dict
             )
-            parameters_json_schema[name] = json_schema_dict
+            if 'prefixItems' in json_schema_dict:
+              parameters_json_schema[name] = json_schema_dict
+              continue
+
+            union_args = typing.get_args(param.annotation)
+            has_primitive = any(
+                _automatic_function_calling_util._is_builtin_primitive_or_compound(
+                    arg
+                )
+                for arg in union_args
+            )
+            if (
+                '$ref' in json_schema_dict or '$defs' in json_schema_dict
+            ) and has_primitive:
+              # This is a complex schema with a primitive (e.g., str | MyModel)
+              # that is better represented by raw JSON schema.
+              parameters_json_schema[name] = json_schema_dict
+              continue
+
+            schema = Schema.from_json_schema(
+                json_schema=JSONSchema(**json_schema_dict),
+                api_option=api_option,
+            )
+            if param.default is not inspect.Parameter.empty:
+              schema.default = param.default
+            parameters_properties[name] = schema
           except Exception as e:
             _automatic_function_calling_util._raise_for_unsupported_param(
                 param, callable.__name__, e
@@ -2557,8 +2708,7 @@ class GoogleSearch(_common.BaseModel):
   )
   exclude_domains: Optional[list[str]] = Field(
       default=None,
-      description="""Optional. List of domains to be excluded from the search results.
-      The default limit is 2000 domains.""",
+      description="""Optional. List of domains to be excluded from the search results. The default limit is 2000 domains. Example: ["amazon.com", "facebook.com"].""",
   )
 
 
@@ -2571,8 +2721,7 @@ class GoogleSearchDict(TypedDict, total=False):
       """
 
   exclude_domains: Optional[list[str]]
-  """Optional. List of domains to be excluded from the search results.
-      The default limit is 2000 domains."""
+  """Optional. List of domains to be excluded from the search results. The default limit is 2000 domains. Example: ["amazon.com", "facebook.com"]."""
 
 
 GoogleSearchOrDict = Union[GoogleSearch, GoogleSearchDict]
@@ -5591,31 +5740,41 @@ CandidateOrDict = Union[Candidate, CandidateDict]
 
 
 class GenerateContentResponsePromptFeedback(_common.BaseModel):
-  """Content filter results for a prompt sent in the request."""
+  """Content filter results for a prompt sent in the request.
+
+  Note: This is sent only in the first stream chunk and only if no candidates
+  were generated due to content violations.
+  """
 
   block_reason: Optional[BlockedReason] = Field(
-      default=None, description="""Output only. Blocked reason."""
+      default=None,
+      description="""Output only. The reason why the prompt was blocked.""",
   )
   block_reason_message: Optional[str] = Field(
       default=None,
-      description="""Output only. A readable block reason message.""",
+      description="""Output only. A readable message that explains the reason why the prompt was blocked.""",
   )
   safety_ratings: Optional[list[SafetyRating]] = Field(
-      default=None, description="""Output only. Safety ratings."""
+      default=None,
+      description="""Output only. A list of safety ratings for the prompt. There is one rating per category.""",
   )
 
 
 class GenerateContentResponsePromptFeedbackDict(TypedDict, total=False):
-  """Content filter results for a prompt sent in the request."""
+  """Content filter results for a prompt sent in the request.
+
+  Note: This is sent only in the first stream chunk and only if no candidates
+  were generated due to content violations.
+  """
 
   block_reason: Optional[BlockedReason]
-  """Output only. Blocked reason."""
+  """Output only. The reason why the prompt was blocked."""
 
   block_reason_message: Optional[str]
-  """Output only. A readable block reason message."""
+  """Output only. A readable message that explains the reason why the prompt was blocked."""
 
   safety_ratings: Optional[list[SafetyRatingDict]]
-  """Output only. Safety ratings."""
+  """Output only. A list of safety ratings for the prompt. There is one rating per category."""
 
 
 GenerateContentResponsePromptFeedbackOrDict = Union[
@@ -8189,34 +8348,6 @@ class DeleteModelResponseDict(TypedDict, total=False):
 DeleteModelResponseOrDict = Union[DeleteModelResponse, DeleteModelResponseDict]
 
 
-class GenerationConfigThinkingConfig(_common.BaseModel):
-  """Config for thinking features."""
-
-  include_thoughts: Optional[bool] = Field(
-      default=None,
-      description="""Optional. Indicates whether to include thoughts in the response. If true, thoughts are returned only when available.""",
-  )
-  thinking_budget: Optional[int] = Field(
-      default=None,
-      description="""Optional. Indicates the thinking budget in tokens.""",
-  )
-
-
-class GenerationConfigThinkingConfigDict(TypedDict, total=False):
-  """Config for thinking features."""
-
-  include_thoughts: Optional[bool]
-  """Optional. Indicates whether to include thoughts in the response. If true, thoughts are returned only when available."""
-
-  thinking_budget: Optional[int]
-  """Optional. Indicates the thinking budget in tokens."""
-
-
-GenerationConfigThinkingConfigOrDict = Union[
-    GenerationConfigThinkingConfig, GenerationConfigThinkingConfigDict
-]
-
-
 class GenerationConfig(_common.BaseModel):
   """Generation config."""
 
@@ -8285,7 +8416,7 @@ class GenerationConfig(_common.BaseModel):
       default=None,
       description="""Optional. Controls the randomness of predictions.""",
   )
-  thinking_config: Optional[GenerationConfigThinkingConfig] = Field(
+  thinking_config: Optional[ThinkingConfig] = Field(
       default=None,
       description="""Optional. Config for thinking features. An error will be returned if this field is set for models that don't support thinking.""",
   )
@@ -8297,6 +8428,10 @@ class GenerationConfig(_common.BaseModel):
       default=None,
       description="""Optional. If specified, nucleus sampling will be used.""",
   )
+  enable_enhanced_civic_answers: Optional[bool] = Field(
+      default=None,
+      description="""Optional. Enables enhanced civic answers. It may not be available for all models.""",
+  )
 
 
 class GenerationConfigDict(TypedDict, total=False):
@@ -8359,7 +8494,7 @@ class GenerationConfigDict(TypedDict, total=False):
   temperature: Optional[float]
   """Optional. Controls the randomness of predictions."""
 
-  thinking_config: Optional[GenerationConfigThinkingConfigDict]
+  thinking_config: Optional[ThinkingConfigDict]
   """Optional. Config for thinking features. An error will be returned if this field is set for models that don't support thinking."""
 
   top_k: Optional[float]
@@ -8368,6 +8503,9 @@ class GenerationConfigDict(TypedDict, total=False):
   top_p: Optional[float]
   """Optional. If specified, nucleus sampling will be used."""
 
+  enable_enhanced_civic_answers: Optional[bool]
+  """Optional. Enables enhanced civic answers. It may not be available for all models."""
+
 
 GenerationConfigOrDict = Union[GenerationConfig, GenerationConfigDict]
 
@@ -9220,14 +9358,22 @@ TunedModelCheckpointOrDict = Union[
 
 
 class TunedModel(_common.BaseModel):
+  """TunedModel for the Tuned Model of a Tuning Job."""
 
   model: Optional[str] = Field(
       default=None,
-      description="""Output only. The resource name of the TunedModel. Format: `projects/{project}/locations/{location}/models/{model}@{version_id}` When tuning from a base model, the version_id will be 1. For continuous tuning, the version id will be incremented by 1 from the last version id in the parent model. E.g., `projects/{project}/locations/{location}/models/{model}@{last_version_id + 1}`""",
+      description="""Output only. The resource name of the TunedModel.
+      Format: `projects/{project}/locations/{location}/models/{model}@{version_id}`
+      When tuning from a base model, the version_id will be 1.
+      For continuous tuning, the version id will be incremented by 1 from the
+      last version id in the parent model. E.g., `projects/{project}/locations/{location}/models/{model}@{last_version_id + 1}`
+      """,
   )
   endpoint: Optional[str] = Field(
       default=None,
-      description="""Output only. A resource name of an Endpoint. Format: `projects/{project}/locations/{location}/endpoints/{endpoint}`.""",
+      description="""Output only. A resource name of an Endpoint.
+      Format: `projects/{project}/locations/{location}/endpoints/{endpoint}`.
+      """,
   )
   checkpoints: Optional[list[TunedModelCheckpoint]] = Field(
       default=None,
@@ -9238,12 +9384,20 @@ class TunedModel(_common.BaseModel):
 
 
 class TunedModelDict(TypedDict, total=False):
+  """TunedModel for the Tuned Model of a Tuning Job."""
 
   model: Optional[str]
-  """Output only. The resource name of the TunedModel. Format: `projects/{project}/locations/{location}/models/{model}@{version_id}` When tuning from a base model, the version_id will be 1. For continuous tuning, the version id will be incremented by 1 from the last version id in the parent model. E.g., `projects/{project}/locations/{location}/models/{model}@{last_version_id + 1}`"""
+  """Output only. The resource name of the TunedModel.
+      Format: `projects/{project}/locations/{location}/models/{model}@{version_id}`
+      When tuning from a base model, the version_id will be 1.
+      For continuous tuning, the version id will be incremented by 1 from the
+      last version id in the parent model. E.g., `projects/{project}/locations/{location}/models/{model}@{last_version_id + 1}`
+      """
 
   endpoint: Optional[str]
-  """Output only. A resource name of an Endpoint. Format: `projects/{project}/locations/{location}/endpoints/{endpoint}`."""
+  """Output only. A resource name of an Endpoint.
+      Format: `projects/{project}/locations/{location}/endpoints/{endpoint}`.
+      """
 
   checkpoints: Optional[list[TunedModelCheckpointDict]]
   """The checkpoints associated with this TunedModel.
@@ -10714,22 +10868,24 @@ _CancelTuningJobParametersOrDict = Union[
 
 
 class TuningExample(_common.BaseModel):
+  """A single example for tuning."""
 
-  text_input: Optional[str] = Field(
-      default=None, description="""Text model input."""
-  )
   output: Optional[str] = Field(
-      default=None, description="""The expected model output."""
+      default=None, description="""Required. The expected model output."""
+  )
+  text_input: Optional[str] = Field(
+      default=None, description="""Optional. Text model input."""
   )
 
 
 class TuningExampleDict(TypedDict, total=False):
-
-  text_input: Optional[str]
-  """Text model input."""
+  """A single example for tuning."""
 
   output: Optional[str]
-  """The expected model output."""
+  """Required. The expected model output."""
+
+  text_input: Optional[str]
+  """Optional. Text model input."""
 
 
 TuningExampleOrDict = Union[TuningExample, TuningExampleDict]
@@ -11541,10 +11697,11 @@ class ListFilesResponse(_common.BaseModel):
       default=None, description="""Used to retain the full HTTP response."""
   )
   next_page_token: Optional[str] = Field(
-      default=None, description="""A token to retrieve next page of results."""
+      default=None,
+      description="""A token that can be sent as a `page_token` into a subsequent `ListFiles` call.""",
   )
   files: Optional[list[File]] = Field(
-      default=None, description="""The list of files."""
+      default=None, description="""The list of `File`s."""
   )
 
 
@@ -11555,10 +11712,10 @@ class ListFilesResponseDict(TypedDict, total=False):
   """Used to retain the full HTTP response."""
 
   next_page_token: Optional[str]
-  """A token to retrieve next page of results."""
+  """A token that can be sent as a `page_token` into a subsequent `ListFiles` call."""
 
   files: Optional[list[FileDict]]
-  """The list of files."""
+  """The list of `File`s."""
 
 
 ListFilesResponseOrDict = Union[ListFilesResponse, ListFilesResponseDict]
@@ -12236,6 +12393,25 @@ class BatchJob(_common.BaseModel):
     return self.state.name in JOB_STATES_ENDED
 
 
+class GenerationConfigThinkingConfig(ThinkingConfig):
+  """Config for thinking feature.
+
+  This class will be deprecated. Please use `ThinkingConfig` instead.
+  """
+
+
+class GenerationConfigThinkingConfigDict(ThinkingConfigDict):
+  """Config for thinking feature.
+
+  This class will be deprecated. Please use `ThinkingConfig` instead.
+  """
+
+
+GenerationConfigThinkingConfigOrDict = Union[
+    GenerationConfigThinkingConfig, GenerationConfigThinkingConfigDict
+]
+
+
 class BatchJobDict(TypedDict, total=False):
   """Config for batches.create return value."""
 

google/genai/version.py

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

{google_genai-1.44.0.dist-info → google_genai-1.46.0.dist-info}/METADATA

@@ -1,12 +1,11 @@
 Metadata-Version: 2.4
 Name: google-genai
-Version: 1.44.0
+Version: 1.46.0
 Summary: GenAI Python SDK
 Author-email: Google LLC <googleapis-packages@google.com>
-License: Apache-2.0
+License-Expression: Apache-2.0
 Project-URL: Homepage, https://github.com/googleapis/python-genai
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
@@ -15,6 +14,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Internet
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.9
@@ -279,6 +279,25 @@ http_options = types.HttpOptions(
 client=Client(..., http_options=http_options)
 ```
 
+### Custom base url
+
+In some cases you might need a custom base url (for example, API gateway proxy
+ server) and bypass some authentication checks for project, location, or API key.
+You may pass the custom base url like this:
+
+```python
+
+base_url = 'https://test-api-gateway-proxy.com'
+client = Client(
+  vertexai=True,
+  http_options={
+      'base_url': base_url,
+      'headers': {'Authorization': 'Bearer test_token'},
+  },
+)
+
+```
+
 ## Types
 
 Parameter types can be specified as either dictionaries(`TypedDict`) or
@@ -292,7 +311,7 @@ See the 'Create a client' section above to initialize a client.
 
 ### Generate Content
 
-#### with text content
+#### with text content input (text output)
 
 ```python
 response = client.models.generate_content(
@@ -301,6 +320,28 @@ response = client.models.generate_content(
 print(response.text)
 ```
 
+#### with text content input (image output)
+
+```python
+from google.genai import types
+
+response = client.models.generate_content(
+    model='gemini-2.5-flash-image',
+    contents='A cartoon infographic for flying sneakers',
+    config=types.GenerateContentConfig(
+    response_modalities=["IMAGE"],
+      image_config=types.ImageConfig(
+          aspect_ratio="9:16",
+      ),
+    ),
+)
+
+for part in response.parts:
+  if part.inline_data:
+    generated_image = part.as_image()
+    generated_image.show()
+```
+
 #### with uploaded file (Gemini Developer API only)
 download the file in console.
 

{google_genai-1.44.0.dist-info → google_genai-1.46.0.dist-info}/RECORD

@@ -1,17 +1,17 @@
 google/genai/__init__.py,sha256=SKz_9WQKA3R4OpJIDJlgssVfizLNDG2tuWtOD9pxrPE,729
 google/genai/_adapters.py,sha256=Kok38miNYJff2n--l0zEK_hbq0y2rWOH7k75J7SMYbQ,1744
-google/genai/_api_client.py,sha256=oTXkMUpmG0pfiE17wIGxhEBMOHT0-EOXE9k1mFF9XSs,62680
+google/genai/_api_client.py,sha256=_y6XAs65RXUqCi-G4vKiTkGM7x14eSYaNbJLbbdcagc,62975
 google/genai/_api_module.py,sha256=lj8eUWx8_LBGBz-49qz6_ywWm3GYp3d8Bg5JoOHbtbI,902
 google/genai/_automatic_function_calling_util.py,sha256=xXNkJR-pzSMkeSXMz3Jw-kMHFbTJEiRJ3wocuwtWW4I,11627
 google/genai/_base_transformers.py,sha256=wljA6m4tLl4XLGlBC2DNOls5N9-X9tffBq0M7i8jgpw,1034
 google/genai/_base_url.py,sha256=E5H4dew14Y16qfnB3XRnjSCi19cJVlkaMNoM_8ip-PM,1597
-google/genai/_common.py,sha256=SWlfo_Yg6KK-gnSYUMU4EgWFvGmAbi99xPrp-ZR7atA,24150
+google/genai/_common.py,sha256=6_psdFl0iBRwgyIKOuGtugpTCHPGB2zZzsJCVcI_2oI,24114
 google/genai/_extra_utils.py,sha256=YLw64xzAKD_fQJp327-GGZM3kQ0sVdhNXMeDaaNkVFE,23011
-google/genai/_live_converters.py,sha256=jhGi2U7G8XC27qE-9LY6B-jc5mAHK1vS_Nx9_-jBNF0,42115
+google/genai/_live_converters.py,sha256=b4TZW_BobO4fPkoIiOKVDcwKmQl5FvXaucENY55_YWo,42296
 google/genai/_local_tokenizer_loader.py,sha256=cGN1F0f7hNjRIGCGTLeox7IGAZf_YcvZjSp2rCyhUak,7465
 google/genai/_mcp_utils.py,sha256=HuWJ8FUjquv40Mf_QjcL5r5yXWrS-JjINsjlOSbbyAc,3870
 google/genai/_operations_converters.py,sha256=8w4WSeA_KSyc56JcL1MTknZHIds0gF3E8YdriluUJfY,8708
-google/genai/_replay_api_client.py,sha256=p8FyEtJ2kkAEPo62Q03zP6WsyH8-bhYR8se5T80tTN8,22727
+google/genai/_replay_api_client.py,sha256=oCPZULWpmjahOn5pvY7KkCB_cksNwm7pc4nuTnqqqV8,22956
 google/genai/_test_api_client.py,sha256=4ruFIy5_1qcbKqqIBu3HSQbpSOBrxiecBtDZaTGFR1s,4797
 google/genai/_tokens_converters.py,sha256=xQY6yWtt7iJtfygfmd29d9mjjGKOpy0xG3yTdlr7APk,14137
 google/genai/_transformers.py,sha256=tx6FecRkfQbEmmgXZrb8ndIRacAfluKIFlyQilslWG0,42782
@@ -24,16 +24,16 @@ google/genai/files.py,sha256=2TkcZo7iviHA48OEjc9YnyirZ-umBUN7Z4Gdr4nHyJI,31551
 google/genai/live.py,sha256=1YfDR2VTqeHp2YJkgX2j1KHDaLcGCLN4Y6O9T4cM-4U,40996
 google/genai/live_music.py,sha256=Y7I7jh5SAKgyjBIMLboH0oTnZJ18uOT2SpRDKURvp94,6783
 google/genai/local_tokenizer.py,sha256=EKZ72cV2Zfutlo_efMOPnLRNZN4WQe57rD3G80cF340,14109
-google/genai/models.py,sha256=TDLTUqTaUPxsm7NBACd_T9M9fo7vkjvpsskO0zNkMzQ,226022
+google/genai/models.py,sha256=Zhl9ns-JJfUhYt_XTycx6DzMB7OP8eA6rpPwbq6q3vQ,227545
 google/genai/operations.py,sha256=KgM5vsagUnAMGk9wKxuQYBUh_6bwrPQ9BzZvydiumQA,16208
 google/genai/pagers.py,sha256=m0SfWWn1EJs2k1On3DZx371qb8g2BRm_188ExsicIRc,7098
 google/genai/py.typed,sha256=RsMFoLwBkAvY05t6izop4UHZtqOPLiKp3GkIEizzmQY,40
 google/genai/tokens.py,sha256=4BPW0gGWFeFVk3INkuY2tfREnsrvzQDhouvRI6_F9Q8,12235
-google/genai/tunings.py,sha256=VmCBW_RR16QbzVpimi7pTEv6XTVeyDGpwqmJqetUj0o,58175
-google/genai/types.py,sha256=oqO4Jz5fi_QG-Qn-NhDc8frOS4ezU30A-iHSuVLLyXU,560764
-google/genai/version.py,sha256=0a7FbSHg9E9Hna1gzIXHqRPylS_ExnriVNkKmCT0SxQ,627
-google_genai-1.44.0.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-google_genai-1.44.0.dist-info/METADATA,sha256=V2p7mXdE4WchoCapPeQZ-EUDtRhHKy2dD3zDk6StyQU,45280
-google_genai-1.44.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-google_genai-1.44.0.dist-info/top_level.txt,sha256=_1QvSJIhFAGfxb79D6DhB7SUw2X6T4rwnz_LLrbcD3c,7
-google_genai-1.44.0.dist-info/RECORD,,
+google/genai/tunings.py,sha256=QO7n8hRXJhiw7B_Jr2dBxxnhvnKGhtkPH6721Jt2k2w,57071
+google/genai/types.py,sha256=T5I04cmt668wxI28OX9F-8xahHnmfqotSczwpc1xMgg,567055
+google/genai/version.py,sha256=meVKVLiGBg5qMEJ0AIQYDf7Icw5Mxy1_bXQeMsePcig,627
+google_genai-1.46.0.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+google_genai-1.46.0.dist-info/METADATA,sha256=XH1pYkjPp84lsrs-fteMEsQGrmHS2OENsfTSnKcbMPQ,46242
+google_genai-1.46.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+google_genai-1.46.0.dist-info/top_level.txt,sha256=_1QvSJIhFAGfxb79D6DhB7SUw2X6T4rwnz_LLrbcD3c,7
+google_genai-1.46.0.dist-info/RECORD,,