Skip to content

Commit 6d4d72a

Browse files
ankursharmascopybara-github
authored andcommitted
chore: Update vertexai & rouge scorer dependencies in eval to use a proxy
PiperOrigin-RevId: 822881672
1 parent 45a2168 commit 6d4d72a

File tree

7 files changed

+20
-8
lines changed

7 files changed

+20
-8
lines changed

src/google/adk/evaluation/final_response_match_v1.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
from typing import Optional
1818

1919
from google.genai import types as genai_types
20-
from rouge_score import rouge_scorer
2120
from typing_extensions import override
2221

22+
from ..dependencies.rouge_scorer import rouge_scorer
2323
from .eval_case import Invocation
2424
from .eval_metrics import EvalMetric
2525
from .eval_metrics import Interval

src/google/adk/evaluation/response_evaluator.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
from typing import Optional
1818

1919
from typing_extensions import override
20-
from vertexai import types as vertexai_types
2120

21+
from ..dependencies.vertexai import vertexai
2222
from .eval_case import Invocation
2323
from .eval_metrics import EvalMetric
2424
from .eval_metrics import Interval
@@ -30,6 +30,8 @@
3030
from .final_response_match_v1 import RougeEvaluator
3131
from .vertex_ai_eval_facade import _VertexAiEvalFacade
3232

33+
vertexai_types = vertexai.types
34+
3335

3436
class ResponseEvaluator(Evaluator):
3537
"""Evaluates Agent's responses.

src/google/adk/evaluation/safety_evaluator.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
from __future__ import annotations
1616

1717
from typing_extensions import override
18-
from vertexai import types as vertexai_types
1918

19+
from ..dependencies.vertexai import vertexai
2020
from .eval_case import Invocation
2121
from .eval_metrics import EvalMetric
2222
from .eval_metrics import Interval
@@ -27,6 +27,8 @@
2727
from .evaluator import Evaluator
2828
from .vertex_ai_eval_facade import _VertexAiEvalFacade
2929

30+
vertexai_types = vertexai.types
31+
3032

3133
class SafetyEvaluatorV1(Evaluator):
3234
"""Evaluates safety (harmlessness) of an Agent's Response.

src/google/adk/evaluation/vertex_ai_eval_facade.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,17 @@
2121
from google.genai import types as genai_types
2222
import pandas as pd
2323
from typing_extensions import override
24-
from vertexai import Client as VertexAiClient
25-
from vertexai import types as vertexai_types
2624

25+
from ..dependencies.vertexai import vertexai
2726
from .eval_case import Invocation
2827
from .evaluator import EvalStatus
2928
from .evaluator import EvaluationResult
3029
from .evaluator import Evaluator
3130
from .evaluator import PerInvocationResult
3231

32+
vertexai_types = vertexai.types
33+
VertexAiClient = vertexai.Client
34+
3335
_ERROR_MESSAGE_SUFFIX = """
3436
You should specify both project id and location. This metric uses Vertex Gen AI
3537
Eval SDK, and it requires google cloud credentials.

tests/unittests/evaluation/test_response_evaluator.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,15 @@
1616

1717
"""Tests for the Response Evaluator."""
1818

19+
from google.adk.dependencies.vertexai import vertexai
1920
from google.adk.evaluation.eval_case import Invocation
2021
from google.adk.evaluation.eval_metrics import PrebuiltMetrics
2122
from google.adk.evaluation.evaluator import EvalStatus
2223
from google.adk.evaluation.response_evaluator import ResponseEvaluator
2324
from google.genai import types as genai_types
2425
import pytest
25-
from vertexai import types as vertexai_types
26+
27+
vertexai_types = vertexai.types
2628

2729

2830
class TestResponseEvaluator:

tests/unittests/evaluation/test_safety_evaluator.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,15 @@
1414

1515
"""Tests for the Response Evaluator."""
1616

17+
from google.adk.dependencies.vertexai import vertexai
1718
from google.adk.evaluation.eval_case import Invocation
1819
from google.adk.evaluation.eval_metrics import EvalMetric
1920
from google.adk.evaluation.eval_metrics import PrebuiltMetrics
2021
from google.adk.evaluation.evaluator import EvalStatus
2122
from google.adk.evaluation.safety_evaluator import SafetyEvaluatorV1
2223
from google.genai import types as genai_types
23-
from vertexai import types as vertexai_types
24+
25+
vertexai_types = vertexai.types
2426

2527

2628
class TestSafetyEvaluatorV1:

tests/unittests/evaluation/test_vertex_ai_eval_facade.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,14 @@
1818
import math
1919
import random
2020

21+
from google.adk.dependencies.vertexai import vertexai
2122
from google.adk.evaluation.eval_case import Invocation
2223
from google.adk.evaluation.evaluator import EvalStatus
2324
from google.adk.evaluation.vertex_ai_eval_facade import _VertexAiEvalFacade
2425
from google.genai import types as genai_types
2526
import pytest
26-
from vertexai import types as vertexai_types
27+
28+
vertexai_types = vertexai.types
2729

2830

2931
class TestVertexAiEvalFacade:

0 commit comments

Comments
 (0)