mirror of
https://github.com/encounter/adk-python.git
synced 2026-07-09 18:19:28 -07:00
fix: Prevent ContextFilterPlugin from creating orphaned function responses
When truncating conversation history, make sure function_response messages always have their corresponding function_call included Close #4027 Co-authored-by: George Weale <gweale@google.com> PiperOrigin-RevId: 852377919
This commit is contained in:
committed by
Copybara-Service
parent
688f48fffb
commit
e32f017979
@@ -14,11 +14,14 @@
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from collections.abc import Sequence
|
||||
import logging
|
||||
from typing import Callable
|
||||
from typing import List
|
||||
from typing import Optional
|
||||
|
||||
from google.genai import types
|
||||
|
||||
from ..agents.callback_context import CallbackContext
|
||||
from ..events.event import Event
|
||||
from ..models.llm_request import LlmRequest
|
||||
@@ -28,6 +31,37 @@ from .base_plugin import BasePlugin
|
||||
logger = logging.getLogger("google_adk." + __name__)
|
||||
|
||||
|
||||
def _adjust_split_index_to_avoid_orphaned_function_responses(
|
||||
contents: Sequence[types.Content], split_index: int
|
||||
) -> int:
|
||||
"""Moves `split_index` left until function calls/responses stay paired.
|
||||
|
||||
When truncating context, we must avoid keeping a `function_response` while
|
||||
dropping its matching preceding `function_call`.
|
||||
|
||||
Args:
|
||||
contents: Full conversation contents in chronological order.
|
||||
split_index: Candidate split index (keep `contents[split_index:]`).
|
||||
|
||||
Returns:
|
||||
A (possibly smaller) split index that preserves call/response pairs.
|
||||
"""
|
||||
needed_call_ids = set()
|
||||
for i in range(len(contents) - 1, -1, -1):
|
||||
parts = contents[i].parts
|
||||
if parts:
|
||||
for part in reversed(parts):
|
||||
if part.function_response and part.function_response.id:
|
||||
needed_call_ids.add(part.function_response.id)
|
||||
if part.function_call and part.function_call.id:
|
||||
needed_call_ids.discard(part.function_call.id)
|
||||
|
||||
if i <= split_index and not needed_call_ids:
|
||||
return i
|
||||
|
||||
return 0
|
||||
|
||||
|
||||
class ContextFilterPlugin(BasePlugin):
|
||||
"""A plugin that filters the LLM context to reduce its size."""
|
||||
|
||||
@@ -76,6 +110,12 @@ class ContextFilterPlugin(BasePlugin):
|
||||
start_index -= 1
|
||||
split_index = start_index
|
||||
break
|
||||
# Adjust split_index to avoid orphaned function_responses.
|
||||
split_index = (
|
||||
_adjust_split_index_to_avoid_orphaned_function_responses(
|
||||
contents, split_index
|
||||
)
|
||||
)
|
||||
contents = contents[split_index:]
|
||||
|
||||
if self._custom_filter:
|
||||
|
||||
Reference in New Issue
Block a user