fix: remove redundant contents in Automatic Function Calling history

PiperOrigin-RevId: 723151823

Author: yyyu-google

google/genai/models.py

@@ -4702,15 +4702,18 @@ def generate_content(
       )
       if not func_response_parts:
         break
-      contents = t.t_contents(self._api_client, contents)
-      contents.append(response.candidates[0].content)
-      contents.append(
-          types.Content(
-              role='user',
-              parts=func_response_parts,
-          )
+      func_call_content = response.candidates[0].content
+      func_response_content = types.Content(
+          role='user',
+          parts=func_response_parts,
       )
-      automatic_function_calling_history.extend(contents)
+      contents = t.t_contents(self._api_client, contents)
+      if not automatic_function_calling_history:
+        automatic_function_calling_history.extend(contents)
+      contents.append(func_call_content)
+      contents.append(func_response_content)
+      automatic_function_calling_history.append(func_call_content)
+      automatic_function_calling_history.append(func_response_content)
     if _extra_utils.should_append_afc_history(config):
       response.automatic_function_calling_history = (
           automatic_function_calling_history
@@ -5700,15 +5703,18 @@ async def generate_content(
       )
       if not func_response_parts:
         break
-      contents = t.t_contents(self._api_client, contents)
-      contents.append(response.candidates[0].content)
-      contents.append(
-          types.Content(
-              role='user',
-              parts=func_response_parts,
-          )
+      func_call_content = response.candidates[0].content
+      func_response_content = types.Content(
+          role='user',
+          parts=func_response_parts,
       )
-      automatic_function_calling_history.extend(contents)
+      contents = t.t_contents(self._api_client, contents)
+      if not automatic_function_calling_history:
+        automatic_function_calling_history.extend(contents)
+      contents.append(func_call_content)
+      contents.append(func_response_content)
+      automatic_function_calling_history.append(func_call_content)
+      automatic_function_calling_history.append(func_response_content)
 
     if _extra_utils.should_append_afc_history(config):
       response.automatic_function_calling_history = (

google/genai/tests/chats/test_send_message.py

@@ -50,6 +50,33 @@ def square_integer(given_integer: int) -> int:
   return given_integer*given_integer
 
 
+def power_disco_ball(power: bool) -> bool:
+    """Powers the spinning disco ball."""
+    print(f"Disco ball is {'spinning!' if power else 'stopped.'}")
+    return True
+
+def start_music(energetic: bool, loud: bool, bpm: int) -> str:
+    """Play some music matching the specified parameters.
+
+    Args:
+      energetic: Whether the music is energetic or not.
+      loud: Whether the music is loud or not.
+      bpm: The beats per minute of the music.
+
+    Returns: The name of the song being played.
+    """
+    print(f"Starting music! {energetic=} {loud=}, {bpm=}")
+    return "Never gonna give you up."
+
+def dim_lights(brightness: float) -> bool:
+    """Dim the lights.
+
+    Args:
+      brightness: The brightness of the lights, 0.0 is off, 1.0 is full.
+    """
+    print(f"Lights are now set to {brightness:.0%}")
+    return True
+
 def test_text(client):
   chat = client.chats.create(model='gemini-1.5-flash')
   chat.send_message(
@@ -165,6 +192,100 @@ def test_with_afc_history(client):
   assert '51' in chat_history[3].parts[0].text
 
 
+def test_with_afc_multiple_remote_calls(client):
+
+  house_fns = [power_disco_ball, start_music, dim_lights]
+  config = {
+      'tools': house_fns,
+      # Force the model to act (call 'any' function), instead of chatting.
+      'tool_config': {
+          'function_calling_config': {
+              'mode': 'ANY',
+          }
+      },
+      'automatic_function_calling': {
+          'maximum_remote_calls': 3,
+      }
+  }
+  chat = client.chats.create(model='gemini-1.5-flash', config=config)
+  chat.send_message('Turn this place into a party!')
+  curated_history = chat._curated_history
+
+  assert len(curated_history) == 8
+  assert curated_history[0].role == 'user'
+  assert curated_history[0].parts[0].text == 'Turn this place into a party!'
+  assert curated_history[1].role == 'model'
+  assert len(curated_history[1].parts) == 3
+  for part in curated_history[1].parts:
+    assert part.function_call
+  assert curated_history[2].role == 'user'
+  assert len(curated_history[2].parts) == 3
+  for part in curated_history[2].parts:
+    assert part.function_response
+  assert curated_history[3].role == 'model'
+  assert len(curated_history[3].parts) == 1
+  assert curated_history[3].parts[0].function_call
+  assert curated_history[4].role == 'user'
+  assert len(curated_history[4].parts) == 1
+  assert curated_history[4].parts[0].function_response
+  assert curated_history[5].role == 'model'
+  assert len(curated_history[5].parts) == 1
+  assert curated_history[5].parts[0].function_call
+  assert curated_history[6].role == 'user'
+  assert len(curated_history[6].parts) == 1
+  assert curated_history[6].parts[0].function_response
+  assert curated_history[7].role == 'model'
+  assert len(curated_history[7].parts) == 1
+  assert curated_history[7].parts[0].function_call
+
+
+def test_with_afc_multiple_remote_calls_async(client):
+
+  house_fns = [power_disco_ball, start_music, dim_lights]
+  config = {
+      'tools': house_fns,
+      # Force the model to act (call 'any' function), instead of chatting.
+      'tool_config': {
+          'function_calling_config': {
+              'mode': 'ANY',
+          }
+      },
+      'automatic_function_calling': {
+          'maximum_remote_calls': 3,
+      }
+  }
+  chat = client.chats.create(model='gemini-1.5-flash', config=config)
+  chat.send_message('Turn this place into a party!')
+  curated_history = chat._curated_history
+
+  assert len(curated_history) == 8
+  assert curated_history[0].role == 'user'
+  assert curated_history[0].parts[0].text == 'Turn this place into a party!'
+  assert curated_history[1].role == 'model'
+  assert len(curated_history[1].parts) == 3
+  for part in curated_history[1].parts:
+    assert part.function_call
+  assert curated_history[2].role == 'user'
+  assert len(curated_history[2].parts) == 3
+  for part in curated_history[2].parts:
+    assert part.function_response
+  assert curated_history[3].role == 'model'
+  assert len(curated_history[3].parts) == 1
+  assert curated_history[3].parts[0].function_call
+  assert curated_history[4].role == 'user'
+  assert len(curated_history[4].parts) == 1
+  assert curated_history[4].parts[0].function_response
+  assert curated_history[5].role == 'model'
+  assert len(curated_history[5].parts) == 1
+  assert curated_history[5].parts[0].function_call
+  assert curated_history[6].role == 'user'
+  assert len(curated_history[6].parts) == 1
+  assert curated_history[6].parts[0].function_response
+  assert curated_history[7].role == 'model'
+  assert len(curated_history[7].parts) == 1
+  assert curated_history[7].parts[0].function_call
+
+
 def test_with_afc_disabled(client):
   chat = client.chats.create(
       model='gemini-1.5-flash',