8000 ADK changes · azoom/forked-adk-python@49acad1 · GitHub
[go: up one dir, main page]

Skip to content

Commit 49acad1

Browse files
google-genai-botcopybara-github
authored andcommitted
ADK changes
PiperOrigin-RevId: 802455693
1 parent 455dcbd commit 49acad1

File tree

1 file changed

+10
-14
lines changed

1 file changed

+10
-14
lines changed

src/google/adk/cli/adk_web_server.py

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,13 @@
5050
from watchdog.observers import Observer
5151

5252
from . import agent_graph
53-
from ..agents.base_agent import BaseAgent
5453
from ..agents.live_request_queue import LiveRequest
5554
from ..agents.live_request_queue import LiveRequestQueue
5655
from ..agents.run_config import RunConfig
5756
from ..agents.run_config import StreamingMode
5857
from ..artifacts.base_artifact_service import BaseArtifactService
5958
from ..auth.credential_service.base_credential_service import BaseCredentialService
6059
from ..errors.not_found_error import NotFoundError
61-
from ..evaluation.base_eval_service import BaseEvalService
6260
from ..evaluation.base_eval_service import InferenceConfig
6361
from ..evaluation.base_eval_service import InferenceRequest
6462
from ..evaluation.constants import MISSING_EVAL_DEPENDENCIES_MESSAGE
@@ -314,17 +312,6 @@ def __init__(
314312
self.current_app_name_ref: SharedValue[str] = SharedValue(value="")
315313
self.runner_dict = {}
316314

317-
def _get_eval_service(self, agent: BaseAgent):
318-
from ..evaluation.local_eval_service import LocalEvalService # pylint: disable=g-import-not-at-top
319-
320-
return LocalEvalService(
321-
root_agent=agent,
322-
eval_sets_manager=self.eval_sets_manager,
323-
eval_set_results_manager=self.eval_set_results_manager,
324-
session_service=self.session_service,
325-
artifact_service=self.artifact_service,
326-
)
327-
328315
async def get_runner_async(self, app_name: str) -> Runner:
329316
"""Returns the runner for the given app."""
330317
if app_name in self.runners_to_clean:
@@ -789,6 +776,7 @@ async def run_eval(
789776
# Create a mapping from eval set file to all the evals that needed to be
790777
# run.
791778
try:
779+
from ..evaluation.local_eval_service import LocalEvalService
792780
from .cli_eval import _collect_eval_results
793781
from .cli_eval import _collect_inferences
794782

@@ -801,7 +789,15 @@ async def run_eval(
801789

802790
root_agent = self.agent_loader.load_agent(app_name)
803791

804-
eval_service = self._get_eval_service(root_agent)
792+
eval_case_results = []
793+
794+
eval_service = LocalEvalService(
795+
root_agent=root_agent,
796+
eval_sets_manager=self.eval_sets_manager,
797+
eval_set_results_manager=self.eval_set_results_manager,
798+
session_service=self.session_service,
799+
artifact_service=self.artifact_service,
800+
)
805801
inference_request = InferenceRequest(
806802
app_name=app_name,
807803
eval_set_id=eval_set.eval_set_id,

0 commit comments

Comments
 (0)
0