From f7531b2749841e21b9d93c75d34c2b06043575cf Mon Sep 17 00:00:00 2001 From: Gaurav Gandhi Date: Tue, 11 Aug 2026 20:56:02 +0530 Subject: [PATCH] fix(cli): resolve NameError in legacy create-eval-set route create_eval_set_legacy in dev_server.py constructed an EvalSet via UserEvalSet(...), a name that is never imported or defined anywhere in the package. CreateEvalSetRequest.eval_set is typed EvalSet (already imported in this file), which is the class that was clearly intended. Every call to the deprecated POST /dev/apps/{app_name}/eval_sets/{eval_set_id} route crashed unconditionally with NameError: name 'UserEvalSet' is not defined. A strict-xfail regression test for exactly this bug already existed (test_create_eval_set_legacy_route_creates_eval_set, added 2026-08-06), so this change removes the xfail marker instead of adding a new test. Note: ruff's F821 (undefined-name) rule is not enabled in this repo's lint config (pyproject.toml sets lint.select = ["F401"] only), which is why this went uncaught by CI. --- src/google/adk/cli/dev_server.py | 2 +- tests/unittests/cli/test_fast_api.py | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/google/adk/cli/dev_server.py b/src/google/adk/cli/dev_server.py index e046bca5ba1..5cc5189fcbc 100644 --- a/src/google/adk/cli/dev_server.py +++ b/src/google/adk/cli/dev_server.py @@ -838,7 +838,7 @@ async def create_eval_set_legacy( await create_eval_set( app_name=app_name, create_eval_set_request=CreateEvalSetRequest( - eval_set=UserEvalSet(eval_set_id=eval_set_id, eval_cases=[]), + eval_set=EvalSet(eval_set_id=eval_set_id, eval_cases=[]), ), ) diff --git a/tests/unittests/cli/test_fast_api.py b/tests/unittests/cli/test_fast_api.py index 5e2c82403fe..58f3c4b50b2 100755 --- a/tests/unittests/cli/test_fast_api.py +++ b/tests/unittests/cli/test_fast_api.py @@ -4209,10 +4209,6 @@ def test_get_eval_result_returns_saved_eval_set_result( assert data["evalSetId"] == "my_eval_set" -@pytest.mark.xfail( - strict=True, - reason="legacy create-eval-set route references an undefined name", -) def test_create_eval_set_legacy_route_creates_eval_set( test_app, mock_eval_sets_manager ):