Skip to content

fix(evals): extract bucket name from eval_storage_uri when a path is given #6882

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chelsealong wants to merge 1 commit into
base: main
Choose a base branch
from
+30 −1
Open

fix(evals): extract bucket name from eval_storage_uri when a path is given #6882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/google/adk/cli/utils/evals.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ def create_gcs_eval_managers_from_uri(
' google-adk[gcp]\nOr: pip install google-cloud-storage>=2.18'
) from e

gcs_bucket = eval_storage_uri.split('://')[1]
gcs_bucket = eval_storage_uri.split('://')[1].split('/')[0]
eval_sets_manager = GcsEvalSetsManager(
bucket_name=gcs_bucket, project=os.environ['GOOGLE_CLOUD_PROJECT']
)
Expand Down
29 changes: 29 additions & 0 deletions tests/unittests/cli/utils/test_evals.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,35 @@ def test_create_gcs_eval_managers_from_uri_success(
)


@mock.patch.dict(os.environ, {'GOOGLE_CLOUD_PROJECT': 'test-project'})
@mock.patch(
'google.adk.evaluation.gcs_eval_set_results_manager.GcsEvalSetResultsManager',
autospec=True,
)
@mock.patch(
'google.adk.evaluation.gcs_eval_sets_manager.GcsEvalSetsManager',
autospec=True,
)
def test_create_gcs_eval_managers_from_uri_extracts_bucket_from_path(
mock_gcs_eval_sets_manager, mock_gcs_eval_set_results_manager
):
mock_gcs_eval_sets_manager.return_value = mock.MagicMock(
spec=GcsEvalSetsManager
)
mock_gcs_eval_set_results_manager.return_value = mock.MagicMock(
spec=GcsEvalSetResultsManager
)

evals.create_gcs_eval_managers_from_uri('gs://test-bucket/some/path')

mock_gcs_eval_sets_manager.assert_called_once_with(
bucket_name='test-bucket', project='test-project'
)
mock_gcs_eval_set_results_manager.assert_called_once_with(
bucket_name='test-bucket', project='test-project'
)


def test_create_gcs_eval_managers_from_uri_failure():
with pytest.raises(ValueError):
evals.create_gcs_eval_managers_from_uri('unsupported-uri')
Expand Down