google-adk 0.4.0__py3-none-any.whl → 0.5.0__py3-none-any.whl

google/adk/cli/cli_eval.py

@@ -20,7 +20,7 @@ import os
 import sys
 import traceback
 from typing import Any
-from typing import Generator
+from typing import AsyncGenerator
 from typing import Optional
 import uuid
 
@@ -146,7 +146,7 @@ def parse_and_get_evals_to_run(
   return eval_set_to_evals
 
 
-def run_evals(
+async def run_evals(
     eval_set_to_evals: dict[str, list[str]],
     root_agent: Agent,
     reset_func: Optional[Any],
@@ -154,7 +154,7 @@ def run_evals(
     session_service=None,
     artifact_service=None,
     print_detailed_results=False,
-) -> Generator[EvalResult, None, None]:
+) -> AsyncGenerator[EvalResult, None]:
   try:
     from ..evaluation.agent_evaluator import EvaluationGenerator
     from ..evaluation.response_evaluator import ResponseEvaluator
@@ -181,14 +181,16 @@ def run_evals(
         print(f"Running Eval: {eval_set_file}:{eval_name}")
         session_id = f"{EVAL_SESSION_ID_PREFIX}{str(uuid.uuid4())}"
 
-        scrape_result = EvaluationGenerator._process_query_with_root_agent(
-            data=eval_data,
-            root_agent=root_agent,
-            reset_func=reset_func,
-            initial_session=initial_session,
-            session_id=session_id,
-            session_service=session_service,
-            artifact_service=artifact_service,
+        scrape_result = (
+            await EvaluationGenerator._process_query_with_root_agent(
+                data=eval_data,
+                root_agent=root_agent,
+                reset_func=reset_func,
+                initial_session=initial_session,
+                session_id=session_id,
+                session_service=session_service,
+                artifact_service=artifact_service,
+            )
         )
 
         eval_metric_results = []

google/adk/cli/cli_tools_click.py

@@ -258,12 +258,14 @@ def cli_eval(
 
   try:
     eval_results = list(
-        run_evals(
-            eval_set_to_evals,
-            root_agent,
-            reset_func,
-            eval_metrics,
-            print_detailed_results=print_detailed_results,
+        asyncio.run(
+            run_evals(
+                eval_set_to_evals,
+                root_agent,
+                reset_func,
+                eval_metrics,
+                print_detailed_results=print_detailed_results,
+            )
         )
     )
   except ModuleNotFoundError:

google/adk/cli/fast_api.py

@@ -467,7 +467,7 @@ def get_fast_api_app(
       )
     root_agent = await _get_root_agent_async(app_name)
     eval_results = list(
-        run_evals(
+        await run_evals(
             eval_set_to_evals,
             root_agent,
             getattr(root_agent, "reset_data", None),
@@ -503,7 +503,7 @@ def get_fast_api_app(
       "/apps/{app_name}/users/{user_id}/sessions/{session_id}/artifacts/{artifact_name}",
       response_model_exclude_none=True,
   )
-  def load_artifact(
+  async def load_artifact(
       app_name: str,
       user_id: str,
       session_id: str,
@@ -511,7 +511,7 @@ def get_fast_api_app(
       version: Optional[int] = Query(None),
   ) -> Optional[types.Part]:
     app_name = agent_engine_id if agent_engine_id else app_name
-    artifact = artifact_service.load_artifact(
+    artifact = await artifact_service.load_artifact(
         app_name=app_name,
         user_id=user_id,
         session_id=session_id,
@@ -526,7 +526,7 @@ def get_fast_api_app(
       "/apps/{app_name}/users/{user_id}/sessions/{session_id}/artifacts/{artifact_name}/versions/{version_id}",
       response_model_exclude_none=True,
   )
-  def load_artifact_version(
+  async def load_artifact_version(
       app_name: str,
       user_id: str,
       session_id: str,
@@ -534,7 +534,7 @@ def get_fast_api_app(
       version_id: int,
   ) -> Optional[types.Part]:
     app_name = agent_engine_id if agent_engine_id else app_name
-    artifact = artifact_service.load_artifact(
+    artifact = await artifact_service.load_artifact(
         app_name=app_name,
         user_id=user_id,
         session_id=session_id,
@@ -549,11 +549,11 @@ def get_fast_api_app(
       "/apps/{app_name}/users/{user_id}/sessions/{session_id}/artifacts",
       response_model_exclude_none=True,
   )
-  def list_artifact_names(
+  async def list_artifact_names(
       app_name: str, user_id: str, session_id: str
   ) -> list[str]:
     app_name = agent_engine_id if agent_engine_id else app_name
-    return artifact_service.list_artifact_keys(
+    return await artifact_service.list_artifact_keys(
         app_name=app_name, user_id=user_id, session_id=session_id
     )
 
@@ -561,11 +561,11 @@ def get_fast_api_app(
       "/apps/{app_name}/users/{user_id}/sessions/{session_id}/artifacts/{artifact_name}/versions",
       response_model_exclude_none=True,
   )
-  def list_artifact_versions(
+  async def list_artifact_versions(
       app_name: str, user_id: str, session_id: str, artifact_name: str
   ) -> list[int]:
     app_name = agent_engine_id if agent_engine_id else app_name
-    return artifact_service.list_versions(
+    return await artifact_service.list_versions(
         app_name=app_name,
         user_id=user_id,
         session_id=session_id,
@@ -575,11 +575,11 @@ def get_fast_api_app(
   @app.delete(
       "/apps/{app_name}/users/{user_id}/sessions/{session_id}/artifacts/{artifact_name}",
   )
-  def delete_artifact(
+  async def delete_artifact(
       app_name: str, user_id: str, session_id: str, artifact_name: str
   ):
     app_name = agent_engine_id if agent_engine_id else app_name
-    artifact_service.delete_artifact(
+    await artifact_service.delete_artifact(
         app_name=app_name,
         user_id=user_id,
         session_id=session_id,