fix: lazy-import GCS evaluation managers in evals utility

sasha-gitg · sasha-gitg · commit 5f91a9db032b · 2026-05-22T09:50:10.000-07:00
Fixes #5787 Change-Id: I0aadfb11fedc49c1d45d4fcd9f89087c27a0e6ea
diff --git a/pyproject.toml b/pyproject.toml
@@ -47,6 +47,7 @@ dependencies = [
   "packaging>=21",
   "pydantic>=2.12,<3",
   "python-dotenv>=1,<2",
+  "python-multipart>=0.0.9,<1",
   # go/keep-sorted start
   "pyyaml>=6.0.2,<7",
   "requests>=2.32.4,<3",
diff --git a/src/google/adk/cli/utils/evals.py b/src/google/adk/cli/utils/evals.py
@@ -15,17 +15,20 @@
 from __future__ import annotations
 
 import os
+from typing import Any, TYPE_CHECKING
 
 from pydantic import alias_generators
 from pydantic import BaseModel
 from pydantic import ConfigDict
 
 from ...evaluation.eval_case import Invocation
 from ...evaluation.evaluation_generator import EvaluationGenerator
-from ...evaluation.gcs_eval_set_results_manager import GcsEvalSetResultsManager
-from ...evaluation.gcs_eval_sets_manager import GcsEvalSetsManager
 from ...sessions.session import Session
 
+if TYPE_CHECKING:
+  from ...evaluation.gcs_eval_set_results_manager import GcsEvalSetResultsManager
+  from ...evaluation.gcs_eval_sets_manager import GcsEvalSetsManager
+
 
 class GcsEvalManagers(BaseModel):
   model_config = ConfigDict(
@@ -34,9 +37,9 @@ class GcsEvalManagers(BaseModel):
       arbitrary_types_allowed=True,
   )
 
-  eval_sets_manager: GcsEvalSetsManager
+  eval_sets_manager: 'GcsEvalSetsManager'
 
-  eval_set_results_manager: GcsEvalSetResultsManager
+  eval_set_results_manager: 'GcsEvalSetResultsManager'
 
 
 def convert_session_to_eval_invocations(session: Session) -> list[Invocation]:
@@ -66,8 +69,19 @@ def create_gcs_eval_managers_from_uri(
 
   Raises:
       ValueError: If the eval_storage_uri is not supported.
+      RuntimeError: If GCP optional dependencies are missing.
   """
   if eval_storage_uri.startswith('gs://'):
+    try:
+      from ...evaluation.gcs_eval_set_results_manager import GcsEvalSetResultsManager
+      from ...evaluation.gcs_eval_sets_manager import GcsEvalSetsManager
+    except ImportError as e:
+      raise RuntimeError(
+          'GCS evaluation managers require Google Cloud optional dependencies.\n'
+          'Please install them using: pip install google-adk[gcp]\n'
+          'Or: pip install google-cloud-storage>=2.18'
+      ) from e
+
     gcs_bucket = eval_storage_uri.split('://')[1]
     eval_sets_manager = GcsEvalSetsManager(
         bucket_name=gcs_bucket, project=os.environ['GOOGLE_CLOUD_PROJECT']
diff --git a/tests/unittests/cli/utils/test_evals.py b/tests/unittests/cli/utils/test_evals.py
@@ -25,11 +25,11 @@
 
 @mock.patch.dict(os.environ, {'GOOGLE_CLOUD_PROJECT': 'test-project'})
 @mock.patch(
-    'google.adk.cli.utils.evals.GcsEvalSetResultsManager',
+    'google.adk.evaluation.gcs_eval_set_results_manager.GcsEvalSetResultsManager',
     autospec=True,
 )
 @mock.patch(
-    'google.adk.cli.utils.evals.GcsEvalSetsManager',
+    'google.adk.evaluation.gcs_eval_sets_manager.GcsEvalSetsManager',
     autospec=True,
 )
 def test_create_gcs_eval_managers_from_uri_success(

Original file line number	Diff line number	Diff line change
`@@ -25,11 +25,11 @@`
`25`	`25`
`26`	`26`	`@mock.patch.dict(os.environ, {'GOOGLE_CLOUD_PROJECT': 'test-project'})`
`27`	`27`	`@mock.patch(`
`28`		`- 'google.adk.cli.utils.evals.GcsEvalSetResultsManager',`
	`28`	`+ 'google.adk.evaluation.gcs_eval_set_results_manager.GcsEvalSetResultsManager',`
`29`	`29`	`autospec=True,`
`30`	`30`	`)`
`31`	`31`	`@mock.patch(`
`32`		`- 'google.adk.cli.utils.evals.GcsEvalSetsManager',`
	`32`	`+ 'google.adk.evaluation.gcs_eval_sets_manager.GcsEvalSetsManager',`
`33`	`33`	`autospec=True,`
`34`	`34`	`)`
`35`	`35`	`def test_create_gcs_eval_managers_from_uri_success(`