Skip to content

Commit 1e63423

Browse files
inamdarmihircopybara-github
authored andcommitted
fix: stamp the model response event when finalizing it
Merge google#7759 The model response event was built before the model call and kept that time as its timestamp, so it could sort before events appended during the call or emitted by response processors. Session services that reload events by timestamp then replayed them out of order on resume. Model response events are now stamped right before finalization. Fixes google#7695 PiperOrigin-RevId: 1009209339
1 parent ff66b1f commit 1e63423

2 files changed

Lines changed: 57 additions & 2 deletions

File tree

‎src/google/adk/flows/llm_flows/base_llm_flow.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,6 @@ async def _run_one_step_async(
401401
# fresh id only after a complete event so distinct responses differ.
402402
if not event.partial:
403403
model_response_event.id = Event.new_id()
404-
model_response_event.timestamp = platform_time.get_time()
405404
yield event
406405

407406
async def _preprocess_async(
@@ -498,7 +497,8 @@ async def _postprocess_async(
498497
):
499498
return
500499

501-
# Builds the event.
500+
# Stamp at build time so timestamp order matches append order.
501+
model_response_event.timestamp = platform_time.get_time()
502502
model_response_event = self._finalize_model_response_event(
503503
llm_request, llm_response, model_response_event
504504
)

‎tests/unittests/flows/llm_flows/test_base_llm_flow.py‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@
5050
from google.adk.models.llm_request import LlmRequest
5151
from google.adk.models.llm_response import LlmResponse
5252
from google.adk.models.registry import LLMRegistry
53+
from google.adk.planners.base_planner import BasePlanner
54+
from google.adk.platform import time as platform_time
5355
from google.adk.plugins.base_plugin import BasePlugin
5456
from google.adk.sessions.in_memory_session_service import InMemorySessionService
5557
from google.adk.tools.base_toolset import BaseToolset
@@ -3868,3 +3870,56 @@ async def mock_step(_ctx):
38683870

38693871
assert step_invocations == 1
38703872
assert yielded_events == [fc_event]
3873+
3874+
3875+
@pytest.mark.asyncio
3876+
async def test_model_response_event_timestamp_matches_yield_order():
3877+
"""Model-response event is stamped when built, after earlier step events."""
3878+
now = 1_000.0
3879+
platform_time.set_time_provider(lambda: now)
3880+
3881+
class _ClockAdvancingLlm(BaseLlm):
3882+
model: str = 'clock-advancing'
3883+
3884+
async def generate_content_async(self, llm_request, stream=False):
3885+
nonlocal now
3886+
now = 2_000.0
3887+
yield LlmResponse(
3888+
content=types.Content(
3889+
role='model', parts=[types.Part.from_text(text='hi')]
3890+
)
3891+
)
3892+
3893+
class _StateUpdatingPlanner(BasePlanner):
3894+
3895+
def build_planning_instruction(self, readonly_context, llm_request):
3896+
return None
3897+
3898+
def process_planning_response(self, callback_context, response_parts):
3899+
nonlocal now
3900+
now = 3_000.0
3901+
callback_context.state['plan'] = 'step 1'
3902+
return None
3903+
3904+
try:
3905+
agent = Agent(
3906+
name='test_agent',
3907+
model=_ClockAdvancingLlm(),
3908+
planner=_StateUpdatingPlanner(),
3909+
)
3910+
invocation_context = await testing_utils.create_invocation_context(
3911+
agent=agent, user_content='test message'
3912+
)
3913+
flow = SingleFlow()
3914+
3915+
events = []
3916+
async for event in flow.run_async(invocation_context):
3917+
events.append(event)
3918+
now += 1_000.0
3919+
finally:
3920+
platform_time.reset_time_provider()
3921+
3922+
assert len(events) == 2
3923+
assert events[0].actions.state_delta == {'plan': 'step 1'}
3924+
assert events[1].content.parts[0].text == 'hi'
3925+
assert [e.timestamp for e in events] == [3_000.0, 4_000.0]

0 commit comments

Comments
 (0)