feat: remove special handling for Gemini 3 function response ordering

PiperOrigin-RevId: 917837583

Author: google-genai-bot

core/src/main/java/com/google/adk/flows/llmflows/BaseLlmFlow.java

@@ -685,7 +685,8 @@ private Flowable<Event> buildPostprocessingEvents(
 
     Event modelResponseEvent =
         buildModelResponseEvent(baseEventForLlmResponse, llmRequest, updatedResponse);
-    if (modelResponseEvent.functionCalls().isEmpty()) {
+    if (modelResponseEvent.functionCalls().isEmpty()
+        || modelResponseEvent.partial().orElse(false)) {
       return processorEvents.concatWith(Flowable.just(modelResponseEvent));
     }
 

core/src/main/java/com/google/adk/flows/llmflows/Contents.java

@@ -57,13 +57,6 @@ public Single<RequestProcessor.RequestProcessingResult> processRequest(
     }
     LlmAgent llmAgent = (LlmAgent) context.agent();
 
-    String modelName;
-    try {
-      modelName = llmAgent.resolvedModel().modelName().orElse("");
-    } catch (IllegalStateException e) {
-      modelName = "";
-    }
-
     ImmutableList<Event> sessionEvents;
     synchronized (context.session().events()) {
       sessionEvents = ImmutableList.copyOf(context.session().events());
@@ -75,17 +68,13 @@ public Single<RequestProcessor.RequestProcessingResult> processRequest(
               request.toBuilder()
                   .contents(
                       getCurrentTurnContents(
-                          context.branch().orElse(null),
-                          sessionEvents,
-                          context.agent().name(),
-                          modelName))
+                          context.branch().orElse(null), sessionEvents, context.agent().name()))
                   .build(),
               ImmutableList.of()));
     }
 
     ImmutableList<Content> contents =
-        getContents(
-            context.branch().orElse(null), sessionEvents, context.agent().name(), modelName);
+        getContents(context.branch().orElse(null), sessionEvents, context.agent().name());
 
     return Single.just(
         RequestProcessor.RequestProcessingResult.create(
@@ -94,19 +83,19 @@ public Single<RequestProcessor.RequestProcessingResult> processRequest(
 
   /** Gets contents for the current turn only (no conversation history). */
   private ImmutableList<Content> getCurrentTurnContents(
-      @Nullable String currentBranch, List<Event> events, String agentName, String modelName) {
+      @Nullable String currentBranch, List<Event> events, String agentName) {
     // Find the latest event that starts the current turn and process from there.
     for (int i = events.size() - 1; i >= 0; i--) {
       Event event = events.get(i);
       if (event.author().equals("user") || isOtherAgentReply(agentName, event)) {
-        return getContents(currentBranch, events.subList(i, events.size()), agentName, modelName);
+        return getContents(currentBranch, events.subList(i, events.size()), agentName);
       }
     }
     return ImmutableList.of();
   }
 
   private ImmutableList<Content> getContents(
-      @Nullable String currentBranch, List<Event> events, String agentName, String modelName) {
+      @Nullable String currentBranch, List<Event> events, String agentName) {
     List<Event> filteredEvents = new ArrayList<>();
     boolean hasCompactEvent = false;
 
@@ -148,7 +137,7 @@ private ImmutableList<Content> getContents(
     }
 
     List<Event> resultEvents = rearrangeEventsForLatestFunctionResponse(filteredEvents);
-    resultEvents = rearrangeEventsForAsyncFunctionResponsesInHistory(resultEvents, modelName);
+    resultEvents = rearrangeEventsForAsyncFunctionResponsesInHistory(resultEvents);
 
     return resultEvents.stream()
         .map(Event::content)
@@ -564,8 +553,7 @@ private static List<Event> rearrangeEventsForLatestFunctionResponse(List<Event>
     return resultEvents;
   }
 
-  private static List<Event> rearrangeEventsForAsyncFunctionResponsesInHistory(
-      List<Event> events, String modelName) {
+  private static List<Event> rearrangeEventsForAsyncFunctionResponsesInHistory(List<Event> events) {
     Map<String, Integer> functionCallIdToResponseEventIndex = new HashMap<>();
     for (int i = 0; i < events.size(); i++) {
       final int index = i;
@@ -592,11 +580,6 @@ private static List<Event> rearrangeEventsForAsyncFunctionResponsesInHistory(
     List<Event> resultEvents = new ArrayList<>();
     // Keep track of response events already added to avoid duplicates when merging
     Set<Integer> processedResponseIndices = new HashSet<>();
-    List<Event> responseEventsBuffer = new ArrayList<>();
-
-    // Gemini 3 requires function calls to be grouped first and only then function responses:
-    // FC1 FC2 FR1 FR2
-    boolean shouldBufferResponseEvents = modelName.contains("gemini-3");
 
     for (int i = 0; i < events.size(); i++) {
       Event event = events.get(i);
@@ -641,47 +624,21 @@ private static List<Event> rearrangeEventsForAsyncFunctionResponsesInHistory(
 
           for (int index : sortedIndices) {
             if (processedResponseIndices.add(index)) { // Add index and check if it was newly added
-              responseEventsBuffer.add(events.get(index));
               responseEventsToAdd.add(events.get(index));
             }
           }
 
-          if (!shouldBufferResponseEvents) {
-            if (responseEventsToAdd.size() == 1) {
-              resultEvents.add(responseEventsToAdd.get(0));
-            } else if (responseEventsToAdd.size() > 1) {
-              resultEvents.add(mergeFunctionResponseEvents(responseEventsToAdd));
-            }
+          if (responseEventsToAdd.size() == 1) {
+            resultEvents.add(responseEventsToAdd.get(0));
+          } else if (responseEventsToAdd.size() > 1) {
+            resultEvents.add(mergeFunctionResponseEvents(responseEventsToAdd));
           }
         }
       } else {
-        // gemini-3 specific part: buffer response events
-        if (shouldBufferResponseEvents) {
-          if (!responseEventsBuffer.isEmpty()) {
-            if (responseEventsBuffer.size() == 1) {
-              resultEvents.add(responseEventsBuffer.get(0));
-            } else {
-              resultEvents.add(mergeFunctionResponseEvents(responseEventsBuffer));
-            }
-            responseEventsBuffer.clear();
-          }
-        }
         resultEvents.add(event);
       }
     }
 
-    // gemini-3 specific part: buffer response events
-    if (shouldBufferResponseEvents) {
-      if (!responseEventsBuffer.isEmpty()) {
-        if (responseEventsBuffer.size() == 1) {
-          resultEvents.add(responseEventsBuffer.get(0));
-        } else {
-          resultEvents.add(mergeFunctionResponseEvents(responseEventsBuffer));
-        }
-        responseEventsBuffer.clear();
-      }
-    }
-
     return resultEvents;
   }