Merge branch 'main' into fix/orphaned-tool-calls-crash-loop

Author: rohityan

contributing/samples/core_generate_content_config_config/root_agent.yaml

@@ -1,10 +1,12 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/google/adk-python/refs/heads/main/src/google/adk/agents/config_schemas/AgentConfig.json
 name: search_agent
-model: gemini-2.0-flash
+model: gemini-2.5-flash
 description: 'an agent whose job it is to perform Google search queries and answer questions about the results.'
 instruction: You are an agent whose job is to perform Google search queries and answer questions about the results.
 tools:
   - name: google_search
 generate_content_config:
   temperature: 0.1
   max_output_tokens: 2000
+  thinking_config:
+    include_thoughts: true

contributing/samples/litellm_streaming/__init__.py

@@ -0,0 +1,15 @@
+# Copyright 2026 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from . import agent

contributing/samples/litellm_streaming/agent.py

@@ -0,0 +1,27 @@
+# Copyright 2026 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""LiteLLM sample agent for SSE text streaming."""
+
+from __future__ import annotations
+
+from google.adk import Agent
+from google.adk.models.lite_llm import LiteLlm
+
+root_agent = Agent(
+    name='litellm_streaming_agent',
+    model=LiteLlm(model='gemini/gemini-2.5-flash'),
+    description='A LiteLLM agent used for streaming text responses.',
+    instruction='You are a verbose assistant',
+)

contributing/samples/litellm_streaming/main.py

@@ -0,0 +1,107 @@
+# Copyright 2026 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Runs the LiteLLM streaming sample with SSE enabled."""
+
+from __future__ import annotations
+
+import asyncio
+
+from dotenv import load_dotenv
+from google.adk.agents.run_config import RunConfig
+from google.adk.agents.run_config import StreamingMode
+from google.adk.cli.utils import logs
+from google.adk.runners import InMemoryRunner
+from google.genai import types
+
+from . import agent
+
+load_dotenv(override=True)
+logs.log_to_tmp_folder()
+
+
+async def _run_prompt(
+    *,
+    runner: InMemoryRunner,
+    user_id: str,
+    session_id: str,
+    prompt: str,
+) -> None:
+  """Runs one prompt and prints partial chunks in real time."""
+  content = types.Content(
+      role='user',
+      parts=[types.Part.from_text(text=prompt)],
+  )
+
+  print(f'User: {prompt}')
+  print('Agent: ', end='', flush=True)
+  saw_text = False
+  saw_partial_text = False
+
+  # For `adk web`, enable the `Streaming` toggle in the UI to get
+  # partial SSE responses similar to this script.
+  async for event in runner.run_async(
+      user_id=user_id,
+      session_id=session_id,
+      new_message=content,
+      run_config=RunConfig(streaming_mode=StreamingMode.SSE),
+  ):
+    if not event.content:
+      continue
+    text = ''.join(part.text for part in event.content.parts if part.text)
+    if not text:
+      continue
+
+    if event.partial:
+      print(text, end='', flush=True)
+      saw_text = True
+      saw_partial_text = True
+      continue
+
+    # With SSE mode, ADK emits a final aggregated event after partial chunks.
+    if not saw_partial_text:
+      print(text, end='', flush=True)
+      saw_text = True
+
+  if saw_text:
+    print()
+  else:
+    print('(no text response)')
+  print('------------------------------------')
+
+
+async def main() -> None:
+  app_name = 'litellm_streaming_demo'
+  user_id = 'user_1'
+  runner = InMemoryRunner(agent=agent.root_agent, app_name=app_name)
+  session = await runner.session_service.create_session(
+      app_name=app_name,
+      user_id=user_id,
+  )
+  prompts = [
+      'Write an essay about the roman empire',
+      'Now summarize the essay into one sentence.',
+  ]
+
+  for prompt in prompts:
+    await _run_prompt(
+        runner=runner,
+        user_id=user_id,
+        session_id=session.id,
+        prompt=prompt,
+    )
+
+
+if __name__ == '__main__':
+  asyncio.run(main())

contributing/samples/skills_agent/agent.py

@@ -52,9 +52,7 @@
     model="gemini-2.5-flash",
     name="skill_user_agent",
     description="An agent that can use specialized skills.",
-    instruction=(
-        "You are a helpful assistant that can leverage skills to perform tasks."
-    ),
+    instruction=skill_toolset.DEFAULT_SKILL_SYSTEM_INSTRUCTION,
     tools=[
         my_skill_toolset,
     ],

src/google/adk/__init__.py

@@ -15,8 +15,9 @@
 from __future__ import annotations
 
 from . import version
+from .agents.context import Context
 from .agents.llm_agent import Agent
 from .runners import Runner
 
 __version__ = version.__version__
-__all__ = ["Agent", "Runner"]
+__all__ = ["Agent", "Context", "Runner"]

src/google/adk/agents/__init__.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 from .base_agent import BaseAgent
+from .context import Context
 from .invocation_context import InvocationContext
 from .live_request_queue import LiveRequest
 from .live_request_queue import LiveRequestQueue
@@ -27,6 +28,7 @@
 __all__ = [
     'Agent',
     'BaseAgent',
+    'Context',
     'LlmAgent',
     'LoopAgent',
     'McpInstructionProvider',