Merge branch 'main' into fix/anthropic-thinking-streaming-continuity

Resolved conflicts in contributing/samples/gepa/{experiment,run_experiment}.py
by taking main's version: utils.py was renamed to gepa_utils.py upstream,
which supersedes the local blank-line-only formatting fix.

Author: gurjot-05

.github/workflows/pre-commit.yml

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: pre-commit
+name: Pre-commit Checks
 
 on:
   push:

contributing/samples/gepa/experiment.py

@@ -31,6 +31,7 @@
 import gepa
 from gepa.core.adapter import EvaluationBatch
 from gepa.core.adapter import GEPAAdapter
+import gepa_utils
 from litellm import provider_list
 import rater_lib
 from retry import retry
@@ -43,7 +44,6 @@
 from tau_bench.types import EnvRunResult
 from tau_bench.types import RunConfig
 import tau_bench_agent as tau_bench_agent_lib
-import utils
 
 
 def run_tau_bench_rollouts(
@@ -582,7 +582,7 @@ def run_gepa(
       task_lm=None,  # this must be None when a custom adapter is used
       adapter=tau_bench_adapter,
       max_metric_calls=config.max_metric_calls,
-      reflection_lm=utils.reflection_inference_fn(config.reflection_model),
+      reflection_lm=gepa_utils.reflection_inference_fn(config.reflection_model),
       reflection_minibatch_size=config.reflection_minibatch_size,
       run_dir=output_dir,
   )

contributing/samples/gepa/utils.py contributing/samples/gepa/gepa_utils.pycontributing/samples/gepa/utils.py renamed to contributing/samples/gepa/gepa_utils.py

@@ -24,8 +24,8 @@
 from absl import app
 from absl import flags
 import experiment
+import gepa_utils
 from google.genai import types
-import utils
 
 _OUTPUT_DIR = flags.DEFINE_string(
     'output_dir',
@@ -105,7 +105,7 @@ def main(argv: Sequence[str]) -> None:
   for logger in loggers:
     logger.setLevel(logging.WARNING)
 
-  types.logger.addFilter(utils.FilterInferenceWarnings())
+  types.logger.addFilter(gepa_utils.FilterInferenceWarnings())
   output_dir = os.path.join(
       _OUTPUT_DIR.value, datetime.now().strftime('%Y%m%d%H%M%S%f')
   )

contributing/samples/gepa/run_experiment.py

@@ -179,7 +179,7 @@ def convert_genai_part_to_a2a_part(
 ) -> Optional[a2a_types.Part]:
   """Convert a Google GenAI Part to an A2A Part."""
 
-  if part.text:
+  if part.text is not None:
     a2a_part = a2a_types.TextPart(text=part.text)
     if part.thought is not None:
       a2a_part.metadata = {_get_adk_metadata_key('thought'): part.thought}

src/google/adk/a2a/converters/part_converter.py

@@ -12,6 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import importlib
+from typing import TYPE_CHECKING
+
 from .base_agent import BaseAgent
 from .context import Context
 from .invocation_context import InvocationContext
@@ -20,11 +23,13 @@
 from .llm_agent import Agent
 from .llm_agent import LlmAgent
 from .loop_agent import LoopAgent
-from .mcp_instruction_provider import McpInstructionProvider
 from .parallel_agent import ParallelAgent
 from .run_config import RunConfig
 from .sequential_agent import SequentialAgent
 
+if TYPE_CHECKING:
+  from .mcp_instruction_provider import McpInstructionProvider
+
 __all__ = [
     'Agent',
     'BaseAgent',
@@ -39,3 +44,16 @@
     'LiveRequestQueue',
     'RunConfig',
 ]
+
+
+def __getattr__(name: str):
+  if name == 'McpInstructionProvider':
+    try:
+      module = importlib.import_module(f'{__name__}.mcp_instruction_provider')
+    except ImportError as e:
+      raise ImportError(
+          '`McpInstructionProvider` requires the `mcp` package.'
+          ' Install with: pip install google-adk[extensions]'
+      ) from e
+    return module.McpInstructionProvider
+  raise AttributeError(f'module {__name__!r} has no attribute {name!r}')

src/google/adk/agents/__init__.py

@@ -22,13 +22,47 @@
 from ..events.event import Event
 from ..sessions.base_session_service import BaseSessionService
 from ..sessions.session import Session
+from ..telemetry.tracing import _build_compaction_attributes
+from ..telemetry.tracing import _build_compaction_result_attributes
+from ..telemetry.tracing import tracer
 from .app import App
 from .app import EventsCompactionConfig
 from .llm_event_summarizer import LlmEventSummarizer
 
 logger = logging.getLogger('google_adk.' + __name__)
 
 
+async def _summarize_events_with_trace(
+    *,
+    session: Session,
+    config: EventsCompactionConfig,
+    events_to_compact: list[Event],
+    trigger: str,
+) -> Event | None:
+  """Summarizes events within a trace span labeled for compaction."""
+  if config.summarizer is None:
+    return None
+
+  attributes = _build_compaction_attributes(
+      session_id=session.id,
+      trigger=trigger,
+      summarizer_type=type(config.summarizer).__name__,
+      event_count=len(events_to_compact),
+      token_threshold=config.token_threshold,
+      event_retention_size=config.event_retention_size,
+      compaction_interval=config.compaction_interval,
+      overlap_size=config.overlap_size,
+  )
+
+  with tracer.start_as_current_span(f'compact_events {trigger}') as span:
+    span.set_attributes(attributes)
+    compaction_event = await config.summarizer.maybe_summarize_events(
+        events=events_to_compact
+    )
+    span.set_attributes(_build_compaction_result_attributes(compaction_event))
+    return compaction_event
+
+
 def _count_text_chars_in_content(content: types.Content | None) -> int:
   """Returns the number of text characters in a content object."""
   total_chars = 0
@@ -383,8 +417,11 @@ async def _run_compaction_for_token_threshold_config(
   if config.summarizer is None:
     return False
 
-  compaction_event = await config.summarizer.maybe_summarize_events(
-      events=events_to_compact
+  compaction_event = await _summarize_events_with_trace(
+      session=session,
+      config=config,
+      events_to_compact=events_to_compact,
+      trigger='token_threshold',
   )
   if compaction_event:
     await session_service.append_event(session=session, event=compaction_event)
@@ -602,8 +639,11 @@ async def _run_compaction_for_sliding_window(
   if config.summarizer is None:
     return None
 
-  compaction_event = await config.summarizer.maybe_summarize_events(
-      events=events_to_compact
+  compaction_event = await _summarize_events_with_trace(
+      session=session,
+      config=config,
+      events_to_compact=events_to_compact,
+      trigger='sliding_window',
   )
   if compaction_event:
     await session_service.append_event(session=session, event=compaction_event)

src/google/adk/apps/compaction.py

@@ -104,11 +104,13 @@ async def maybe_summarize_events(
         contents=[Content(role='user', parts=[Part(text=prompt)])],
     )
     summary_content = None
+    summary_usage_metadata = None
     async for llm_response in self._llm.generate_content_async(
         llm_request, stream=False
     ):
       if llm_response.content:
         summary_content = llm_response.content
+        summary_usage_metadata = llm_response.usage_metadata
         break
 
     if summary_content is None:
@@ -132,4 +134,5 @@ async def maybe_summarize_events(
         author='user',
         actions=actions,
         invocation_id=Event.new_id(),
+        usage_metadata=summary_usage_metadata,
     )

src/google/adk/apps/llm_event_summarizer.py

@@ -12,12 +12,25 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import annotations
+
+import importlib
+from typing import TYPE_CHECKING
+
 from .auth_credential import AuthCredential
 from .auth_credential import AuthCredentialTypes
 from .auth_credential import OAuth2Auth
-from .auth_handler import AuthHandler
 from .auth_schemes import AuthScheme
 from .auth_schemes import AuthSchemeType
 from .auth_schemes import OpenIdConnectWithConfig
 from .auth_tool import AuthConfig
 from .base_auth_provider import BaseAuthProvider
+
+if TYPE_CHECKING:
+  from .auth_handler import AuthHandler
+
+
+def __getattr__(name: str):
+  if name == 'AuthHandler':
+    return importlib.import_module(f'{__name__}.auth_handler').AuthHandler
+  raise AttributeError(f'module {__name__!r} has no attribute {name!r}')

src/google/adk/auth/__init__.py

@@ -36,9 +36,7 @@
 from ...agents.live_request_queue import LiveRequestQueue
 from ...agents.readonly_context import ReadonlyContext
 from ...agents.run_config import StreamingMode
-from ...auth.auth_handler import AuthHandler
 from ...auth.auth_tool import AuthConfig
-from ...auth.credential_manager import CredentialManager
 from ...events.event import Event
 from ...models.base_llm_connection import BaseLlmConnection
 from ...models.llm_request import LlmRequest
@@ -144,6 +142,8 @@ async def _resolve_toolset_auth(
       continue
 
     auth_config_copy = auth_config.model_copy(deep=True)
+    from ...auth.credential_manager import CredentialManager
+
     try:
       credential = await CredentialManager(
           auth_config_copy
@@ -173,7 +173,8 @@ async def _resolve_toolset_auth(
   if not pending_auth_requests:
     return
 
-  # Build auth requests dict with generated auth requests
+  from ...auth.auth_handler import AuthHandler
+
   auth_requests = {
       credential_id: AuthHandler(auth_config).generate_auth_request()
       for credential_id, auth_config in pending_auth_requests.items()