google-genai 1.59.0__py3-none-any.whl → 1.60.0__py3-none-any.whl

google/genai/_interactions/resources/interactions.py

@@ -96,7 +96,7 @@ class InteractionsResource(SyncAPIResource):
 
           model: The name of the `Model` used for generating the interaction.
 
-          background: Whether to run the model interaction in the background.
+          background: Input only. Whether to run the model interaction in the background.
 
           generation_config: Input only. Configuration parameters for the model interaction.
 
@@ -161,7 +161,7 @@ class InteractionsResource(SyncAPIResource):
 
           stream: Input only. Whether the interaction will be streamed.
 
-          background: Whether to run the model interaction in the background.
+          background: Input only. Whether to run the model interaction in the background.
 
           generation_config: Input only. Configuration parameters for the model interaction.
 
@@ -224,7 +224,7 @@ class InteractionsResource(SyncAPIResource):
 
           agent_config: Configuration for the agent.
 
-          background: Whether to run the model interaction in the background.
+          background: Input only. Whether to run the model interaction in the background.
 
           previous_interaction_id: The ID of the previous interaction, if any.
 
@@ -289,7 +289,7 @@ class InteractionsResource(SyncAPIResource):
 
           agent_config: Configuration for the agent.
 
-          background: Whether to run the model interaction in the background.
+          background: Input only. Whether to run the model interaction in the background.
 
           previous_interaction_id: The ID of the previous interaction, if any.
 
@@ -350,7 +350,7 @@ class InteractionsResource(SyncAPIResource):
 
           stream: Input only. Whether the interaction will be streamed.
 
-          background: Whether to run the model interaction in the background.
+          background: Input only. Whether to run the model interaction in the background.
 
           generation_config: Input only. Configuration parameters for the model interaction.
 
@@ -713,7 +713,7 @@ class AsyncInteractionsResource(AsyncAPIResource):
 
           model: The name of the `Model` used for generating the interaction.
 
-          background: Whether to run the model interaction in the background.
+          background: Input only. Whether to run the model interaction in the background.
 
           generation_config: Input only. Configuration parameters for the model interaction.
 
@@ -778,7 +778,7 @@ class AsyncInteractionsResource(AsyncAPIResource):
 
           stream: Input only. Whether the interaction will be streamed.
 
-          background: Whether to run the model interaction in the background.
+          background: Input only. Whether to run the model interaction in the background.
 
           generation_config: Input only. Configuration parameters for the model interaction.
 
@@ -841,7 +841,7 @@ class AsyncInteractionsResource(AsyncAPIResource):
 
           agent_config: Configuration for the agent.
 
-          background: Whether to run the model interaction in the background.
+          background: Input only. Whether to run the model interaction in the background.
 
           previous_interaction_id: The ID of the previous interaction, if any.
 
@@ -906,7 +906,7 @@ class AsyncInteractionsResource(AsyncAPIResource):
 
           agent_config: Configuration for the agent.
 
-          background: Whether to run the model interaction in the background.
+          background: Input only. Whether to run the model interaction in the background.
 
           previous_interaction_id: The ID of the previous interaction, if any.
 
@@ -967,7 +967,7 @@ class AsyncInteractionsResource(AsyncAPIResource):
 
           stream: Input only. Whether the interaction will be streamed.
 
-          background: Whether to run the model interaction in the background.
+          background: Input only. Whether to run the model interaction in the background.
 
           generation_config: Input only. Configuration parameters for the model interaction.
 

google/genai/_interactions/types/interaction_create_params.py

@@ -68,7 +68,7 @@ class BaseCreateModelInteractionParams(TypedDict, total=False):
     api_version: str
 
     background: bool
-    """Whether to run the model interaction in the background."""
+    """Input only. Whether to run the model interaction in the background."""
 
     generation_config: GenerationConfigParam
     """Input only. Configuration parameters for the model interaction."""
@@ -136,7 +136,7 @@ class BaseCreateAgentInteractionParams(TypedDict, total=False):
     """Configuration for the agent."""
 
     background: bool
-    """Whether to run the model interaction in the background."""
+    """Input only. Whether to run the model interaction in the background."""
 
     previous_interaction_id: str
     """The ID of the previous interaction, if any."""

google/genai/batches.py

@@ -1013,6 +1013,11 @@ def _GenerateContentConfig_to_mldev(
         getv(from_object, ['enable_enhanced_civic_answers']),
     )
 
+  if getv(from_object, ['model_armor_config']) is not None:
+    raise ValueError(
+        'model_armor_config parameter is not supported in Gemini API.'
+    )
+
   return to_object
 
 

google/genai/models.py

@@ -1117,6 +1117,11 @@ def _GenerateContentConfig_to_mldev(
         getv(from_object, ['enable_enhanced_civic_answers']),
     )
 
+  if getv(from_object, ['model_armor_config']) is not None:
+    raise ValueError(
+        'model_armor_config parameter is not supported in Gemini API.'
+    )
+
   return to_object
 
 
@@ -1279,6 +1284,13 @@ def _GenerateContentConfig_to_vertex(
         'enable_enhanced_civic_answers parameter is not supported in Vertex AI.'
     )
 
+  if getv(from_object, ['model_armor_config']) is not None:
+    setv(
+        parent_object,
+        ['modelArmorConfig'],
+        getv(from_object, ['model_armor_config']),
+    )
+
   return to_object
 
 

google/genai/tests/models/test_generate_content.py

@@ -546,6 +546,22 @@ test_table: list[pytest_helper.TestTableItem] = [
         ),
         exception_if_vertex='not supported',
     ),
+    pytest_helper.TestTableItem(
+        name='test_model_armor_config',
+        parameters=types._GenerateContentParameters(
+            model=GEMINI_FLASH_LATEST,
+            contents=t.t_contents('What is your name?'),
+            config={
+                'model_armor_config': {
+                    'prompt_template_name': '',
+                    'response_template_name': '',
+                    # Intentionally left blank just to test that the SDK doesn't
+                    # throw an exception.
+                },
+            },
+        ),
+        exception_if_mldev='not supported',
+    ),
 ]
 
 pytestmark = pytest_helper.setup(

google/genai/types.py

@@ -5003,6 +5003,38 @@ SpeechConfigUnion = Union[str, SpeechConfig]
 SpeechConfigUnionDict = Union[str, SpeechConfig, SpeechConfigDict]
 
 
+class ModelArmorConfig(_common.BaseModel):
+  """Configuration for Model Armor integrations of prompt and responses.
+
+  This data type is not supported in Gemini API.
+  """
+
+  prompt_template_name: Optional[str] = Field(
+      default=None,
+      description="""Optional. The name of the Model Armor template to use for prompt sanitization.""",
+  )
+  response_template_name: Optional[str] = Field(
+      default=None,
+      description="""Optional. The name of the Model Armor template to use for response sanitization.""",
+  )
+
+
+class ModelArmorConfigDict(TypedDict, total=False):
+  """Configuration for Model Armor integrations of prompt and responses.
+
+  This data type is not supported in Gemini API.
+  """
+
+  prompt_template_name: Optional[str]
+  """Optional. The name of the Model Armor template to use for prompt sanitization."""
+
+  response_template_name: Optional[str]
+  """Optional. The name of the Model Armor template to use for response sanitization."""
+
+
+ModelArmorConfigOrDict = Union[ModelArmorConfig, ModelArmorConfigDict]
+
+
 class GenerateContentConfig(_common.BaseModel):
   """Optional model configuration parameters.
 
@@ -5219,6 +5251,12 @@ class GenerateContentConfig(_common.BaseModel):
       models. This field is not supported in Vertex AI.
       """,
   )
+  model_armor_config: Optional[ModelArmorConfig] = Field(
+      default=None,
+      description="""Settings for prompt and response sanitization using the Model Armor
+      service. If supplied, safety_settings must not be supplied.
+      """,
+  )
 
   @pydantic.field_validator('response_schema', mode='before')
   @classmethod
@@ -5429,6 +5467,11 @@ class GenerateContentConfigDict(TypedDict, total=False):
       models. This field is not supported in Vertex AI.
       """
 
+  model_armor_config: Optional[ModelArmorConfigDict]
+  """Settings for prompt and response sanitization using the Model Armor
+      service. If supplied, safety_settings must not be supplied.
+      """
+
 
 GenerateContentConfigOrDict = Union[
     GenerateContentConfig, GenerateContentConfigDict

google/genai/version.py

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

{google_genai-1.59.0.dist-info → google_genai-1.60.0.dist-info}/METADATA

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

{google_genai-1.59.0.dist-info → google_genai-1.60.0.dist-info}/RECORD

@@ -15,7 +15,7 @@ google/genai/_replay_api_client.py,sha256=-sZY8pM8JulqTfuqIKaKHCy9MNXF7HJnX6fCzy
 google/genai/_test_api_client.py,sha256=4ruFIy5_1qcbKqqIBu3HSQbpSOBrxiecBtDZaTGFR1s,4797
 google/genai/_tokens_converters.py,sha256=ILPWqhCU1MP2xi0Zg_Zz3fmZ37Yr-hGyg6iey9c4u_E,15593
 google/genai/_transformers.py,sha256=rVhKCz9Xi8PTMVOj4F5ITqQWMzUYeNLYacSIFlDjZwc,43191
-google/genai/batches.py,sha256=DzCiHli8ncxRbsey3x6xAvwFOxjrvh4_S5uD8mwDtl4,78786
+google/genai/batches.py,sha256=LVnPsGb5Xjy6SYXmlvvW0ooIwAGs3DZ5-lfkDOHJqYU,78946
 google/genai/caches.py,sha256=24GhR6Nj-1Bdaey6ff6NNmP5pIjvlO0S1Dv_-CrCtyI,48118
 google/genai/chats.py,sha256=q3_iONHx8l-Y7EG29_f45yjFDdL2VFefUDLMdJtw0sE,16583
 google/genai/client.py,sha256=odJ3erYMO1tkvn_9AOyfLawNX2tZf71fbVzqmmLEjOY,21327
@@ -27,14 +27,14 @@ google/genai/interactions.py,sha256=GLpo-rTdxb1JfL3LXE0c52JWaEGloLnPeCI9hoO_M2g,
 google/genai/live.py,sha256=aBa_JndziEQjxhdpqChmGHaG4m9npOp9Z0HTXnoZdl8,41804
 google/genai/live_music.py,sha256=Y7I7jh5SAKgyjBIMLboH0oTnZJ18uOT2SpRDKURvp94,6783
 google/genai/local_tokenizer.py,sha256=EKZ72cV2Zfutlo_efMOPnLRNZN4WQe57rD3G80cF340,14109
-google/genai/models.py,sha256=9TfxuOxJwfMqjL435D7vdgf9Gwn77gqRf_8_5aGdnN8,238719
+google/genai/models.py,sha256=jiQF2S3P5dwQXTNBhG0sxO3yotftpTz60kpu1sxYyA0,239060
 google/genai/operations.py,sha256=FXJOnYp2HA5Xqa5mHW67mSa9p1D_EaGGyUoKc09xFPQ,16384
 google/genai/pagers.py,sha256=1i8NXDuKuQznFin5H5-I0hmj6H5YMTYsEJP7S0ITSbY,7158
 google/genai/py.typed,sha256=RsMFoLwBkAvY05t6izop4UHZtqOPLiKp3GkIEizzmQY,40
 google/genai/tokens.py,sha256=4BPW0gGWFeFVk3INkuY2tfREnsrvzQDhouvRI6_F9Q8,12235
 google/genai/tunings.py,sha256=HNC3c_9MFwXDp-hcChvmDqkFinrD4kyLkNZPFiW72Tw,75536
-google/genai/types.py,sha256=3QImav8ZsdiDTIJ0WXD3Zdt9lGFOa3QM1b8btB3IS0Y,654139
-google/genai/version.py,sha256=H3kn3PFLP6OtMUhb44ZpK3GoCu4DYa2iZwmtsLpWtWI,627
+google/genai/types.py,sha256=9VGATlIl4lVQqPlxaxxPnZ6fo5Wwz_A3LlaX9vEpRuU,655631
+google/genai/version.py,sha256=NrUrMC5oUj0Akkrt589uYawRh_EXZlW2d02A-AC26x0,627
 google/genai/_interactions/__init__.py,sha256=Zl5wlyZ1be3a1ENIERjj9ocpELL89RdZkHF3MnCkB3M,3571
 google/genai/_interactions/_base_client.py,sha256=9U2GjsnrAEmFEIEWIDylGX9P-c038S9TqzcK2FKoKTw,74460
 google/genai/_interactions/_client.py,sha256=VkBifJIA0IchcNRUUb4E8w02udzmJMedYPXYnqX1iKc,21234
@@ -63,7 +63,7 @@ google/genai/_interactions/_utils/_transform.py,sha256=TjAN4LumRdzvMD0rcrFQhrlC3
 google/genai/_interactions/_utils/_typing.py,sha256=Z5S4PcLWBL5GEhqU6j_XKaoh9ANrTSDyMDDTlMB0KJ8,5385
 google/genai/_interactions/_utils/_utils.py,sha256=qWdNSrAUkn_wYeK5YFSeHyZWtEYJQkbh_Sg2t7impKQ,12851
 google/genai/_interactions/resources/__init__.py,sha256=TNMFv_-Zv9ayAgjkecVIBOnIK-goQIIvkvR3WiQl_DA,1207
-google/genai/_interactions/resources/interactions.py,sha256=6D94_eI2VQfxse4X3qfVInAw6SesxknOLtu917xFBMs,56663
+google/genai/_interactions/resources/interactions.py,sha256=kldMEhXJnMpnLWDTFfAKiymOrTexfgufN0w6mwix8aE,56783
 google/genai/_interactions/types/__init__.py,sha256=saQGU4fshC1Oa5JsjjEEjXM_sJSlld3hnvHc8iiZAdQ,7970
 google/genai/_interactions/types/allowed_tools.py,sha256=Hke2IEAT_lc51MCt0_tGZGx3yvE7HTSawIlm-prCCGg,1047
 google/genai/_interactions/types/allowed_tools_param.py,sha256=PAAFKM2qX_Pj_pTxqcc0IQvii9soKLW_scMud2nUwMc,1092
@@ -120,7 +120,7 @@ google/genai/_interactions/types/image_content_param.py,sha256=Qof1jfT9Ey83hI-l6
 google/genai/_interactions/types/image_mime_type.py,sha256=JSM0MElIy62mLFjKiuheHeV0px02I-Nrh8H2yZTDU3I,884
 google/genai/_interactions/types/image_mime_type_param.py,sha256=syGoPn7nm3LoxqFbJhg3q9Bno68ywKU9hzoufbOm8xQ,930
 google/genai/_interactions/types/interaction.py,sha256=awI9GIgg8SHNDq7E-UGi4dQgSJY_uD_hzOP46HzR8oU,4096
-google/genai/_interactions/types/interaction_create_params.py,sha256=DL2huAy_rXYFWGveakzYel_zh7HE5_fA60nha8wPswk,6894
+google/genai/_interactions/types/interaction_create_params.py,sha256=g8uIldqCWOvdICxR6_iRjGiHvikL2xgSvENnNSk-xMY,6918
 google/genai/_interactions/types/interaction_event.py,sha256=JkLyt1ikUZrDmQ9SZKc3WxJ9cVytEwu8X70vo3SrcNQ,1175
 google/genai/_interactions/types/interaction_get_params.py,sha256=kJnLjBS-uX6K4JeDdp1gaezb-I58aWtHBl3w8TNn3Os,1628
 google/genai/_interactions/types/interaction_sse_event.py,sha256=v59HGzqpW0ywuytcXYoCoSBnK7IxO1fnArbC6upCugc,1275
@@ -265,7 +265,7 @@ google/genai/tests/models/test_delete.py,sha256=OBl8mfHychtjWy6v19Das3ikYtBwN3po
 google/genai/tests/models/test_edit_image.py,sha256=2QG3ufsRGqryk9jSgyiTgMnuT8VuSZJvghatwEA3NXo,9369
 google/genai/tests/models/test_embed_content.py,sha256=RncjpLuaRO4sjTzTsiXVK5TJQ3poX2aApbZdqsOuh_0,2933
 google/genai/tests/models/test_function_call_streaming.py,sha256=8R6upyqnrBkajl_OH8V1lYepuMD9KV2oTTIbMfQoX9A,14787
-google/genai/tests/models/test_generate_content.py,sha256=JKKEabFaRP7eG84nA60WwxsUP5-tIG3DGDicXCCiTTk,79158
+google/genai/tests/models/test_generate_content.py,sha256=lGOOjqzgiSqlcr8ZXYmQEiixC2eskfjYyyzNo5w3M3M,79758
 google/genai/tests/models/test_generate_content_cached_content.py,sha256=gwZTuvvjtavtYKHZMM6_qOikWSh08LWWZ6z-qGhk9DE,4754
 google/genai/tests/models/test_generate_content_config_zero_value.py,sha256=TNBTFFA9HLidwEF3tV1FV413kilLZWhrnN8MAulxqcc,3335
 google/genai/tests/models/test_generate_content_from_apikey.py,sha256=i-cqsmyfBfkP_Xu-x3l3lO9aUhBLViU4fNuNiDik2JU,1452
@@ -351,8 +351,8 @@ google/genai/tests/types/test_part_type.py,sha256=a_0eE2CgE7Ju6ePmu3DrupsZZCFiyD
 google/genai/tests/types/test_schema_from_json_schema.py,sha256=WiraJx5mRLW8lKHiWsyHTBYge4jVpeCYklbqGd4BkZQ,13894
 google/genai/tests/types/test_schema_json_schema.py,sha256=zn1gjsXcHTztzmajr8YX3Yb6rWnchjgjw6Yj1NZnG-0,15536
 google/genai/tests/types/test_types.py,sha256=Tqc_PpGo9-XH1xfkAjTCM9xngan_4w__hgpA0BkyA8g,84416
-google_genai-1.59.0.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-google_genai-1.59.0.dist-info/METADATA,sha256=v31Jclwt0khI19C_kozO_-tckmdfzoEQD_IG6mruQxU,53135
-google_genai-1.59.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-google_genai-1.59.0.dist-info/top_level.txt,sha256=_1QvSJIhFAGfxb79D6DhB7SUw2X6T4rwnz_LLrbcD3c,7
-google_genai-1.59.0.dist-info/RECORD,,
+google_genai-1.60.0.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+google_genai-1.60.0.dist-info/METADATA,sha256=4rcfkSYtjZJOIFcdtuYUrmAgON5CaQ6LPNl5geBLzA0,53135
+google_genai-1.60.0.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
+google_genai-1.60.0.dist-info/top_level.txt,sha256=_1QvSJIhFAGfxb79D6DhB7SUw2X6T4rwnz_LLrbcD3c,7
+google_genai-1.60.0.dist-info/RECORD,,

{google_genai-1.59.0.dist-info → google_genai-1.60.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.1)
 Root-Is-Purelib: true
 Tag: py3-none-any