Prevent session state injection for provider supplied instructions

When the user provides instruction provider, we assume that they will inject the session state parameters if needed. This assumption allows users to return code snippets in the instruction provider without any template replacement.

PiperOrigin-RevId: 759705471
This commit is contained in:
Selcuk Gun
2025-05-16 12:09:48 -07:00
committed by Copybara-Service
parent 5ee17a3268
commit 9e9dfa7472
4 changed files with 74 additions and 23 deletions
+11 -5
View File
@@ -53,18 +53,24 @@ class _InstructionsLlmRequestProcessor(BaseLlmRequestProcessor):
if (
isinstance(root_agent, LlmAgent) and root_agent.global_instruction
): # not empty str
raw_si = await root_agent.canonical_global_instruction(
ReadonlyContext(invocation_context)
raw_si, bypass_state_injection = (
await root_agent.canonical_global_instruction(
ReadonlyContext(invocation_context)
)
)
si = await _populate_values(raw_si, invocation_context)
si = raw_si
if not bypass_state_injection:
si = await _populate_values(raw_si, invocation_context)
llm_request.append_instructions([si])
# Appends agent instructions if set.
if agent.instruction: # not empty str
raw_si = await agent.canonical_instruction(
raw_si, bypass_state_injection = await agent.canonical_instruction(
ReadonlyContext(invocation_context)
)
si = await _populate_values(raw_si, invocation_context)
si = raw_si
if not bypass_state_injection:
si = await _populate_values(raw_si, invocation_context)
llm_request.append_instructions([si])
# Maintain async generator behavior