feat: enable responseId for Gemini Developer API

hkt74 · copybara-github · commit a57f7d90396e · 2025-07-31T16:32:43.000-07:00
remove thinking tests in v1alpha, thinking is GA now

PiperOrigin-RevId: 789512508
diff --git a/google/genai/batches.py b/google/genai/batches.py
@@ -1492,6 +1492,9 @@ def _GenerateContentResponse_from_mldev(
   if getv(from_object, ['promptFeedback']) is not None:
     setv(to_object, ['prompt_feedback'], getv(from_object, ['promptFeedback']))
 
+  if getv(from_object, ['responseId']) is not None:
+    setv(to_object, ['response_id'], getv(from_object, ['responseId']))
+
   if getv(from_object, ['usageMetadata']) is not None:
     setv(to_object, ['usage_metadata'], getv(from_object, ['usageMetadata']))
 
diff --git a/google/genai/models.py b/google/genai/models.py
@@ -3665,6 +3665,9 @@ def _GenerateContentResponse_from_mldev(
   if getv(from_object, ['promptFeedback']) is not None:
     setv(to_object, ['prompt_feedback'], getv(from_object, ['promptFeedback']))
 
+  if getv(from_object, ['responseId']) is not None:
+    setv(to_object, ['response_id'], getv(from_object, ['responseId']))
+
   if getv(from_object, ['usageMetadata']) is not None:
     setv(to_object, ['usage_metadata'], getv(from_object, ['usageMetadata']))
 
@@ -4317,15 +4320,15 @@ def _GenerateContentResponse_from_vertex(
   if getv(from_object, ['createTime']) is not None:
     setv(to_object, ['create_time'], getv(from_object, ['createTime']))
 
-  if getv(from_object, ['responseId']) is not None:
-    setv(to_object, ['response_id'], getv(from_object, ['responseId']))
-
   if getv(from_object, ['modelVersion']) is not None:
     setv(to_object, ['model_version'], getv(from_object, ['modelVersion']))
 
   if getv(from_object, ['promptFeedback']) is not None:
     setv(to_object, ['prompt_feedback'], getv(from_object, ['promptFeedback']))
 
+  if getv(from_object, ['responseId']) is not None:
+    setv(to_object, ['response_id'], getv(from_object, ['responseId']))
+
   if getv(from_object, ['usageMetadata']) is not None:
     setv(to_object, ['usage_metadata'], getv(from_object, ['usageMetadata']))
 
diff --git a/google/genai/tests/chats/test_send_message.py b/google/genai/tests/chats/test_send_message.py
@@ -147,7 +147,7 @@ def test_uploaded_file_uri(client):
         [
             'what is the image about?',
             types.Part.from_uri(
-                file_uri='https://generativelanguage.googleapis.com/v1beta/files/9w04rxmcgsp8',
+                file_uri='https://generativelanguage.googleapis.com/v1beta/files/az606f58k7zj',
                 mime_type='image/png',
             ),
         ],
diff --git a/google/genai/tests/models/test_generate_content.py b/google/genai/tests/models/test_generate_content.py
@@ -612,10 +612,6 @@ async def test_simple_shared_generation_config_stream_async(client):
 
 
 def test_log_probs(client):
-  # ML DEV discovery doc supports response_logprobs but the backend
-  # does not.
-  # TODO: update replay test json files when ML Dev backend is updated.
-  with pytest_helper.exception_if_mldev(client, errors.ClientError):
     client.models.generate_content(
         model='gemini-1.5-flash',
         contents='What is your name?',
@@ -2316,8 +2312,4 @@ async def test_error_handling_stream_async(client):
       continue
 
   except errors.ClientError as e:
-    assert (
-        e.message
-        == 'Developer instruction is not enabled for'
-        ' models/gemini-2.0-flash-exp-image-generation'
-    )
+    assert ('Developer instruction is not enabled' in e.message)
diff --git a/google/genai/tests/models/test_generate_content_config_zero_value.py b/google/genai/tests/models/test_generate_content_config_zero_value.py
@@ -68,10 +68,6 @@
                 'logprobs': 0,
             },
         ),
-        # ML DEV discovery doc supports response_logprobs but the backend
-        # does not.
-        # TODO: update replay test json files when ML Dev backend is updated.
-        exception_if_mldev='INVALID_ARGUMENT',
     ),
     pytest_helper.TestTableItem(
         name='test_presence_penalty_zero',
diff --git a/google/genai/tests/models/test_generate_content_model.py b/google/genai/tests/models/test_generate_content_model.py
@@ -25,18 +25,8 @@
     'projects/964831358985/locations/us-central1/endpoints/7226683110069370880'
 )
 
-tuned_model_with_model_name = 'tunedModels/generatenum5443-ekrw7ie9wis23zbeogbw6jq8'
 
 test_table: list[pytest_helper.TestTableItem] = [
-    pytest_helper.TestTableItem(
-        name='test_tuned_model_with_model_name',
-        parameters=types._GenerateContentParameters(
-            model=tuned_model_with_model_name,
-            contents=t.t_contents('how are you doing?'),
-        ),
-        exception_if_vertex='404',
-        skip_in_api_mode='It requires a specific ML Dev account.',
-    ),
     pytest_helper.TestTableItem(
         name='test_tuned_model',
         parameters=types._GenerateContentParameters(
@@ -102,18 +92,6 @@ def test_tuned_model_stream(client):
     assert chunks >= 2
 
 
-def test_tuned_model_with_model_name_stream(client):
-  with pytest_helper.exception_if_vertex(client, errors.ClientError):
-    chunks = 0
-    for chunk in client.models.generate_content_stream(
-        model=tuned_model_with_model_name,
-        contents='Tell me a story in 300 words.',
-    ):
-      chunks += 1
-      assert chunk.text is not None or chunk.candidates[0].finish_reason
-    assert chunks >= 1
-
-
 def test_start_with_models_stream(client):
   # vertex ai require publishers/ prefix for gemini
   with pytest_helper.exception_if_vertex(client, errors.ClientError):
diff --git a/google/genai/tests/models/test_generate_content_part.py b/google/genai/tests/models/test_generate_content_part.py
@@ -123,7 +123,7 @@
                             types.PartDict({
                                 'file_data': {
                                     'file_uri': (
-                                        'https://generativelanguage.googleapis.com/v1beta/files/dez0g1rajz7a'
+                                        'https://generativelanguage.googleapis.com/v1beta/files/az606f58k7zj'
                                     ),
                                     'mime_type': 'image/png',
                                 }
@@ -151,7 +151,7 @@
                             types.PartDict({
                                 'file_data': {
                                     'file_uri': (
-                                        'https://generativelanguage.googleapis.com/v1beta/files/f1rtzshxniw4'
+                                        'https://generativelanguage.googleapis.com/v1beta/files/wma71fsppgfp'
                                     ),
                                     'mime_type': 'image/jpeg',
                                 }
@@ -181,7 +181,7 @@
                             types.PartDict({
                                 'file_data': {
                                     'file_uri': (
-                                        'https://generativelanguage.googleapis.com/v1beta/files/8c7hpi2zez57'
+                                        'https://generativelanguage.googleapis.com/v1beta/files/r6ksskgddyxb'
                                     ),
                                     'mime_type': 'application/pdf',
                                 }
@@ -214,7 +214,7 @@
                             types.PartDict({
                                 'file_data': {
                                     'file_uri': (
-                                        'https://generativelanguage.googleapis.com/v1beta/files/siotqjy5g6mw'
+                                        'https://generativelanguage.googleapis.com/v1beta/files/57w3vpfomj71'
                                     ),
                                     'mime_type': 'video/mp4',
                                 }
@@ -248,9 +248,9 @@
                             types.PartDict({
                                 'file_data': {
                                     'file_uri': (
-                                        'https://generativelanguage.googleapis.com/v1beta/files/j2mpcv8edrqu'
+                                        'https://generativelanguage.googleapis.com/v1beta/files/wkvof7yeqitl'
                                     ),
-                                    'mime_type': 'audio/mp4',
+                                    'mime_type': 'audio/mpeg',
                                 }
                             })
                         ],
@@ -274,7 +274,7 @@
                         types.Part(text='summarize this video'),
                         types.Part(
                             file_data=types.FileData(
-                                file_uri='https://generativelanguage.googleapis.com/v1beta/files/tyvaih24jwje',
+                                file_uri='https://generativelanguage.googleapis.com/v1beta/files/57w3vpfomj71',
                                 mime_type= 'video/mp4',
                             ),
                             video_metadata=types.VideoMetadata(
@@ -672,7 +672,7 @@ def test_video_audio_uri(client):
 def test_file(client):
   with pytest_helper.exception_if_vertex(client, errors.ClientError):
     file = types.File(
-        uri='https://generativelanguage.googleapis.com/v1beta/files/cmpqbqoptyaa',
+        uri='https://generativelanguage.googleapis.com/v1beta/files/ly6p67c47xgq',
         mime_type='text/plain',
     )
     client.models.generate_content(
diff --git a/google/genai/tests/models/test_generate_content_thought.py b/google/genai/tests/models/test_generate_content_thought.py
@@ -22,36 +22,16 @@
 
 test_table: list[pytest_helper.TestTableItem] = [
     pytest_helper.TestTableItem(
-        name='test_generate_content_thought',
+        name='test_disable_thinking',
         parameters=types._GenerateContentParameters(
-            model='gemini-2.5-pro-preview-03-25',
+            model='gemini-2.5-flash',
             contents=t.t_contents('Explain the monty hall problem.'),
             config={
                 'thinking_config': {
-                    'include_thoughts': True,
-                    'thinking_budget': 10000},
+                    'thinking_budget': 0},
             },
         ),
     ),
-    pytest_helper.TestTableItem(
-        name='test_generate_content_thought_v1alpha',
-        parameters=types._GenerateContentParameters(
-            model='gemini-2.5-pro-preview-03-25',
-            contents=t.t_contents(
-                'What is the sum of natural numbers from 1 to 100?'
-            ),
-            config={
-                'thinking_config': {
-                    'include_thoughts': True,
-                    'thinking_budget': 10000
-                },
-                'http_options': {
-                    'api_version': 'v1alpha'
-                },
-            },
-        ),
-        exception_if_vertex='404',
-    ),
 ]
 
 
@@ -63,60 +43,22 @@
 )
 
 
-def test_thought_signature_with_thinking_budget(client):
-  with pytest_helper.exception_if_vertex(client, errors.ClientError):
+def test_thinking_budget(client):
     response = client.models.generate_content(
-        model='gemini-2.5-pro-preview-03-25',
+        model='gemini-2.5-pro',
         contents='What is the sum of natural numbers from 1 to 100?',
         config={
             'thinking_config': {
                 'include_thoughts': True,
                 'thinking_budget': 10000,
             },
-            'http_options': {'api_version': 'v1alpha'},
         },
     )
     has_thought = False
     if response.candidates:
-      for candidate in response.candidates:
-        for part in candidate.content.parts:
-          if part.thought:
-            has_thought = True
-            break
+        for candidate in response.candidates:
+            for part in candidate.content.parts:
+                if part.thought:
+                    has_thought = True
+                    break
     assert has_thought
-
-
-def test_thought_with_include_thoughts_v1alpha(client):
-  # Thoughts have been disabled in the API.
-  with pytest_helper.exception_if_vertex(client, errors.ClientError):
-    response = client.models.generate_content(
-        model='gemini-2.0-flash-thinking-exp',
-        contents='What is the sum of natural numbers from 1 to 100?',
-        config={
-            'thinking_config': {'include_thoughts': True},
-            'http_options': {'api_version': 'v1alpha'},
-        },
-    )
-    has_thought = False
-    if response.candidates:
-      for candidate in response.candidates:
-        for part in candidate.content.parts:
-          if part.thought:
-            has_thought = True
-            break
-    assert has_thought
-
-
-def test_no_thought_with_default_config(client):
-  with pytest_helper.exception_if_vertex(client, errors.ClientError):
-    response = client.models.generate_content(
-        model='gemini-2.0-flash-thinking-exp',
-        contents='What is the sum of natural numbers from 1 to 100?',
-    )
-    has_thought = False
-    for candidate in response.candidates:
-      for part in candidate.content.parts:
-        if part.thought:
-          has_thought = True
-          break
-    assert not has_thought
diff --git a/google/genai/tests/models/test_generate_content_tools.py b/google/genai/tests/models/test_generate_content_tools.py
@@ -286,7 +286,7 @@ def divide_floats(a: float, b: float) -> float:
     pytest_helper.TestTableItem(
         name='test_url_context',
         parameters=types._GenerateContentParameters(
-            model='gemini-2.5-flash-preview-04-17',
+            model='gemini-2.5-flash',
             contents=t.t_contents(
                 'what are the top headlines on https://news.google.com'
             ),
@@ -444,7 +444,7 @@ def customized_divide_integers(numerator: int, denominator: int) -> int:
     return numerator // denominator + 1
 
   response = client.models.generate_content(
-      model='gemini-2.5-flash-preview-04-17',
+      model='gemini-2.5-flash',
       contents='what is the result of 1000/2?',
       config={
           'tools': [customized_divide_integers],
@@ -843,7 +843,7 @@ def describe_cities(
 
   response = client.models.generate_content(
       model='gemini-1.5-flash',
-      contents='Can you describe the city of San Francisco?',
+      contents='Can you describe the city of San Francisco, USA?',
       config={
           'tools': [describe_cities],
           'automatic_function_calling': {'ignore_call_history': True},
diff --git a/google/genai/types.py b/google/genai/types.py
@@ -5124,11 +5124,6 @@ class GenerateContentResponse(_common.BaseModel):
       description="""Timestamp when the request is made to the server.
       """,
   )
-  response_id: Optional[str] = Field(
-      default=None,
-      description="""Identifier for each response.
-      """,
-  )
   model_version: Optional[str] = Field(
       default=None,
       description="""Output only. The model version used to generate the response.""",
@@ -5137,6 +5132,10 @@ class GenerateContentResponse(_common.BaseModel):
       default=None,
       description="""Output only. Content filter results for a prompt sent in the request. Note: Sent only in the first stream chunk. Only happens when no candidates were generated due to content violations.""",
   )
+  response_id: Optional[str] = Field(
+      default=None,
+      description="""Output only. response_id is used to identify each response. It is the encoding of the event_id.""",
+  )
   usage_metadata: Optional[GenerateContentResponseUsageMetadata] = Field(
       default=None, description="""Usage metadata about the response(s)."""
   )
@@ -5383,16 +5382,15 @@ class GenerateContentResponseDict(TypedDict, total=False):
   """Timestamp when the request is made to the server.
       """
 
-  response_id: Optional[str]
-  """Identifier for each response.
-      """
-
   model_version: Optional[str]
   """Output only. The model version used to generate the response."""
 
   prompt_feedback: Optional[GenerateContentResponsePromptFeedbackDict]
   """Output only. Content filter results for a prompt sent in the request. Note: Sent only in the first stream chunk. Only happens when no candidates were generated due to content violations."""
 
+  response_id: Optional[str]
+  """Output only. response_id is used to identify each response. It is the encoding of the event_id."""
+
   usage_metadata: Optional[GenerateContentResponseUsageMetadataDict]
   """Usage metadata about the response(s)."""
 

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ def test_uploaded_file_uri(client):`
`147`	`147`	`[`
`148`	`148`	`'what is the image about?',`
`149`	`149`	`types.Part.from_uri(`
`150`		`- file_uri='https://generativelanguage.googleapis.com/v1beta/files/9w04rxmcgsp8',`
	`150`	`+ file_uri='https://generativelanguage.googleapis.com/v1beta/files/az606f58k7zj',`
`151`	`151`	`mime_type='image/png',`
`152`	`152`	`),`
`153`	`153`	`],`