Skip to content

Fix: Bug when callback_context._invocation_context is missing in Glob… #3180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
+7 −8
Open

Fix: Bug when callback_context._invocation_context is missing in Glob… #3180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
17a3ecb
fix: Bug when callback_context._invocation_context is missing in Glob…
UlookEE Oct 15, 2025
a0d09ec
Fix test fail
UlookEE Oct 15, 2025
e67bfde
Merge branch 'main' into fix_global_instruction_plugin
UlookEE Oct 16, 2025
5329415
Merge branch 'main' into fix_global_instruction_plugin
UlookEE Oct 17, 2025
0a7ae87
Merge branch 'main' into fix_global_instruction_plugin
UlookEE Oct 18, 2025
dda3284
Merge branch 'main' into fix_global_instruction_plugin
UlookEE Oct 20, 2025
d5abf76
Merge branch 'main' into fix_global_instruction_plugin
UlookEE Oct 22, 2025
1684022
Merge branch 'main' into fix_global_instruction_plugin
UlookEE Oct 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/google/adk/plugins/global_instruction_plugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,8 @@ async def before_model_callback(
return None

# Resolve the global instruction (handle both string and InstructionProvider)
readonly_context = ReadonlyContext(callback_context.invocation_context)
final_global_instruction = await self._resolve_global_instruction(
readonly_context
callback_context
)

if not final_global_instruction:
Expand Down
12 changes: 6 additions & 6 deletions tests/unittests/plugins/test_global_instruction_plugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ async def test_global_instruction_plugin_with_string():
mock_invocation_context.session = mock_session

mock_callback_context = Mock(spec=CallbackContext)
mock_callback_context.invocation_context = mock_invocation_context
mock_callback_context._invocation_context = mock_invocation_context

llm_request = LlmRequest(
model="gemini-1.5-flash",
Expand Down Expand Up @@ -80,10 +80,10 @@ async def build_global_instruction(readonly_context: ReadonlyContext) -> str:
)

mock_invocation_context = Mock(spec=InvocationContext)
mock_invocation_context.session = mock_session

mock_callback_context = Mock(spec=CallbackContext)
mock_callback_context.invocation_context = mock_invocation_context
mock_callback_context._invocation_context = mock_invocation_context
mock_callback_context.session = mock_session

llm_request = LlmRequest(
model="gemini-1.5-flash",
Expand Down Expand Up @@ -119,7 +119,7 @@ async def test_global_instruction_plugin_empty_instruction():
mock_invocation_context.session = mock_session

mock_callback_context = Mock(spec=CallbackContext)
mock_callback_context.invocation_context = mock_invocation_context
mock_callback_context._invocation_context = mock_invocation_context

llm_request = LlmRequest(
model="gemini-1.5-flash",
Expand Down Expand Up @@ -156,7 +156,7 @@ async def test_global_instruction_plugin_leads_existing():
mock_invocation_context.session = mock_session

mock_callback_context = Mock(spec=CallbackContext)
mock_callback_context.invocation_context = mock_invocation_context
mock_callback_context._invocation_context = mock_invocation_context

llm_request = LlmRequest(
model="gemini-1.5-flash",
Expand Down Expand Up @@ -191,7 +191,7 @@ async def test_global_instruction_plugin_prepends_to_list():
mock_invocation_context.session = mock_session

mock_callback_context = Mock(spec=CallbackContext)
mock_callback_context.invocation_context = mock_invocation_context
mock_callback_context._invocation_context = mock_invocation_context

llm_request = LlmRequest(
model="gemini-1.5-flash",
Expand Down