Merge branch 'main' into after-agent-callback-replace

Author: dylan-apex

contributing/samples/litellm_inline_tool_call/__init__.py

@@ -0,0 +1,17 @@
+# Copyright 2025 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 __future__ import annotations
+
+from . import agent

contributing/samples/litellm_inline_tool_call/agent.py

@@ -0,0 +1,174 @@
+# Copyright 2025 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 __future__ import annotations
+
+import datetime
+import json
+import re
+from typing import Any
+from zoneinfo import ZoneInfo
+from zoneinfo import ZoneInfoNotFoundError
+
+from google.adk.agents.llm_agent import Agent
+from google.adk.models.lite_llm import LiteLlm
+from google.adk.models.lite_llm import LiteLLMClient
+
+
+class InlineJsonToolClient(LiteLLMClient):
+  """LiteLLM client that emits inline JSON tool calls for testing."""
+
+  async def acompletion(self, model, messages, tools, **kwargs):
+    del tools, kwargs  # Only needed for API parity.
+
+    tool_message = _find_last_role(messages, role="tool")
+    if tool_message:
+      tool_summary = _coerce_to_text(tool_message.get("content"))
+      return {
+          "id": "mock-inline-tool-final-response",
+          "model": model,
+          "choices": [{
+              "message": {
+                  "role": "assistant",
+                  "content": (
+                      f"The instrumentation tool responded with: {tool_summary}"
+                  ),
+              },
+              "finish_reason": "stop",
+          }],
+          "usage": {
+              "prompt_tokens": 60,
+              "completion_tokens": 12,
+              "total_tokens": 72,
+          },
+      }
+
+    timezone = _extract_timezone(messages) or "Asia/Taipei"
+    inline_call = json.dumps(
+        {
+            "name": "get_current_time",
+            "arguments": {"timezone_str": timezone},
+        },
+        separators=(",", ":"),
+    )
+
+    return {
+        "id": "mock-inline-tool-call",
+        "model": model,
+        "choices": [{
+            "message": {
+                "role": "assistant",
+                "content": (
+                    f"{inline_call}\nLet me double-check the clock for you."
+                ),
+            },
+            "finish_reason": "tool_calls",
+        }],
+        "usage": {
+            "prompt_tokens": 45,
+            "completion_tokens": 15,
+            "total_tokens": 60,
+        },
+    }
+
+
+def _find_last_role(
+    messages: list[dict[str, Any]], role: str
+) -> dict[str, Any]:
+  """Returns the last message with the given role."""
+  for message in reversed(messages):
+    if message.get("role") == role:
+      return message
+  return {}
+
+
+def _coerce_to_text(content: Any) -> str:
+  """Best-effort conversion from OpenAI message content to text."""
+  if isinstance(content, str):
+    return content
+  if isinstance(content, dict):
+    return _coerce_to_text(content.get("text"))
+  if isinstance(content, list):
+    texts = []
+    for part in content:
+      if isinstance(part, dict):
+        texts.append(part.get("text") or "")
+      elif isinstance(part, str):
+        texts.append(part)
+    return " ".join(text for text in texts if text)
+  return ""
+
+
+_TIMEZONE_PATTERN = re.compile(r"([A-Za-z]+/[A-Za-z_]+)")
+
+
+def _extract_timezone(messages: list[dict[str, Any]]) -> str | None:
+  """Extracts an IANA timezone string from the last user message."""
+  user_message = _find_last_role(messages, role="user")
+  text = _coerce_to_text(user_message.get("content"))
+  if not text:
+    return None
+  match = _TIMEZONE_PATTERN.search(text)
+  if match:
+    return match.group(1)
+  lowered = text.lower()
+  if "taipei" in lowered:
+    return "Asia/Taipei"
+  if "new york" in lowered:
+    return "America/New_York"
+  if "london" in lowered:
+    return "Europe/London"
+  if "tokyo" in lowered:
+    return "Asia/Tokyo"
+  return None
+
+
+def get_current_time(timezone_str: str) -> dict[str, str]:
+  """Returns mock current time for the provided timezone."""
+  try:
+    tz = ZoneInfo(timezone_str)
+  except ZoneInfoNotFoundError as exc:
+    return {
+        "status": "error",
+        "report": f"Unable to parse timezone '{timezone_str}': {exc}",
+    }
+  now = datetime.datetime.now(tz)
+  return {
+      "status": "success",
+      "report": (
+          f"The current time in {timezone_str} is"
+          f" {now.strftime('%Y-%m-%d %H:%M:%S %Z')}."
+      ),
+  }
+
+
+_mock_model = LiteLlm(
+    model="mock/inline-json-tool-calls",
+    llm_client=InlineJsonToolClient(),
+)
+
+root_agent = Agent(
+    name="litellm_inline_tool_tester",
+    model=_mock_model,
+    description=(
+        "Demonstrates LiteLLM inline JSON tool-call parsing without an external"
+        " VLLM deployment."
+    ),
+    instruction=(
+        "You are a deterministic clock assistant. Always call the"
+        " get_current_time tool before answering user questions. After the tool"
+        " responds, summarize what it returned."
+    ),
+    tools=[get_current_time],
+)

contributing/samples/live_bidi_debug_utils/pcm_audio_player.py

@@ -0,0 +1,39 @@
+# Copyright 2025 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.
+import numpy as np
+import sounddevice as sd
+
+# input audio example. replace with the input audio you want to test
+FILE_PATH = 'adk_live_audio_storage_input_audio_1762910896736.pcm'
+# output audio example. replace with the input audio you want to test
+FILE_PATH = 'adk_live_audio_storage_output_audio_1762910893258.pcm;rate=24000'
+# PCM rate is always 24,000 for input and output
+SAMPLE_RATE = 24000
+CHANNELS = 1
+DTYPE = np.int16  # Common types: int16, float32
+
+# Read and play
+with open(FILE_PATH, 'rb') as f:
+  # Load raw data into numpy array
+  raw_data = f.read()
+  audio_array = np.frombuffer(raw_data, dtype=DTYPE)
+
+  # Reshape if stereo (interleaved)
+  if CHANNELS > 1:
+    audio_array = audio_array.reshape((-1, CHANNELS))
+
+  # Play
+  print('Playing...')
+  sd.play(audio_array, SAMPLE_RATE)
+  sd.wait()

contributing/samples/live_bidi_streaming_single_agent/agent.py

@@ -65,8 +65,8 @@ async def check_prime(nums: list[int]) -> str:
 
 
 root_agent = Agent(
-    model='gemini-live-2.5-flash-preview-native-audio-09-2025',  # vertex
-    # model='gemini-2.5-flash-native-audio-preview-09-2025',  # for AI studio
+    # model='gemini-live-2.5-flash-preview-native-audio-09-2025',  # vertex
+    model='gemini-2.5-flash-native-audio-preview-09-2025',  # for AI studio
     # key
     name='roll_dice_agent',
     description=(

pyproject.toml

@@ -14,11 +14,11 @@ classifiers = [ # List of https://pypi.org/classifiers/
   "Intended Audience :: Science/Research",
   "Programming Language :: Python",
   "Programming Language :: Python :: 3",
-  "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
   "Programming Language :: Python :: 3.13",
+  "Programming Language :: Python :: 3.14",
   "Operating System :: OS Independent",
   "Topic :: Software Development :: Libraries :: Python Modules",
   "License :: OSI Approved :: Apache Software License",
@@ -43,6 +43,7 @@ dependencies = [
   "google-cloud-storage>=3.0.0, <4.0.0",                     # For GCS Artifact service
   "google-genai>=1.45.0, <2.0.0",                            # Google GenAI SDK
   "graphviz>=0.20.2, <1.0.0",                                # Graphviz for graph rendering
+  "jsonschema>=4.23.0, <5.0.0",                              # Agent Builder config validation
   "mcp>=1.8.0, <2.0.0;python_version>='3.10'",               # For MCP Toolset
   "opentelemetry-api>=1.37.0, <=1.37.0",                     # OpenTelemetry - limit upper version for sdk and api to not risk breaking changes from unstable _logs package.
   "opentelemetry-exporter-gcp-logging>=1.9.0a0, <2.0.0",
@@ -115,7 +116,7 @@ test = [
   # go/keep-sorted start
   "a2a-sdk>=0.3.0,<0.4.0;python_version>='3.10'",
   "anthropic>=0.43.0",                            # For anthropic model tests
-  "crewai[tools];python_version>='3.10'",         # For CrewaiTool tests
+  "crewai[tools];python_version>='3.10' and python_version<'3.14'",         # For CrewaiTool tests
   "kubernetes>=29.0.0",                           # For GkeCodeExecutor
   "langchain-community>=0.3.17",
   "langgraph>=0.2.60, <0.4.8",                    # For LangGraphAgent
@@ -145,7 +146,7 @@ docs = [
 extensions = [
   "anthropic>=0.43.0",                          # For anthropic model support
   "beautifulsoup4>=3.2.2",                      # For load_web_page tool.
-  "crewai[tools];python_version>='3.10'",       # For CrewaiTool
+  "crewai[tools];python_version>='3.10' and python_version<'3.14'",       # For CrewaiTool
   "docker>=7.0.0",                              # For ContainerCodeExecutor
   "kubernetes>=29.0.0",                         # For GkeCodeExecutor
   "langgraph>=0.2.60, <0.4.8",                  # For LangGraphAgent