Skip to content

Commit 47eb0ae

Browse files
jaycee-lijaycee-li
authored
fix: Study.list() method (#1594)
* fix: high level list method * Revert "fix: high level list method" This reverts commit 17c9bdd. * Revert "Revert "fix: high level list method"" This reverts commit b4308fd. * fix: unit tests for list() * fix: blacken
1 parent 28e56ef commit 47eb0ae

File tree

8 files changed

+20
-22
lines changed

8 files changed

+20
-22
lines changed

‎google/cloud/aiplatform/base.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# -*- coding: utf-8 -*-
22

3-
# Copyright 2020 Google LLC
3+
# Copyright 2022 Google LLC
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.
@@ -1077,9 +1077,11 @@ def _list(
10771077
or initializer.global_config.common_location_path(
10781078
project=project, location=location
10791079
),
1080-
"filter": filter,
10811080
}
10821081

1082+
if filter:
1083+
list_request["filter"] = filter
1084+
10831085
if order_by:
10841086
list_request["order_by"] = order_by
10851087

‎tests/unit/aiplatform/test_datasets.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1421,9 +1421,7 @@ def test_list_dataset_no_order_or_filter(self, list_datasets_mock):
14211421

14221422
ds_list = aiplatform.TabularDataset.list()
14231423

1424-
list_datasets_mock.assert_called_once_with(
1425-
request={"parent": _TEST_PARENT, "filter": None}
1426-
)
1424+
list_datasets_mock.assert_called_once_with(request={"parent": _TEST_PARENT})
14271425

14281426
# Ensure returned list is smaller since it filtered out non-tabular datasets
14291427
assert len(ds_list) < len(_TEST_DATASET_LIST)

‎tests/unit/aiplatform/test_featurestores.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -984,7 +984,7 @@ def test_list_featurestores(self, list_featurestores_mock):
984984
my_featurestore_list = aiplatform.Featurestore.list()
985985

986986
list_featurestores_mock.assert_called_once_with(
987-
request={"parent": _TEST_PARENT, "filter": None}
987+
request={"parent": _TEST_PARENT}
988988
)
989989
assert len(my_featurestore_list) == len(_TEST_FEATURESTORE_LIST)
990990
for my_featurestore in my_featurestore_list:
@@ -1028,7 +1028,7 @@ def test_list_entity_types(self, list_entity_types_mock):
10281028
my_entity_type_list = my_featurestore.list_entity_types()
10291029

10301030
list_entity_types_mock.assert_called_once_with(
1031-
request={"parent": _TEST_FEATURESTORE_NAME, "filter": None}
1031+
request={"parent": _TEST_FEATURESTORE_NAME}
10321032
)
10331033
assert len(my_entity_type_list) == len(_TEST_ENTITY_TYPE_LIST)
10341034
for my_entity_type in my_entity_type_list:
@@ -1770,7 +1770,7 @@ def test_list_entity_types(self, featurestore_name, list_entity_types_mock):
17701770
)
17711771

17721772
list_entity_types_mock.assert_called_once_with(
1773-
request={"parent": _TEST_FEATURESTORE_NAME, "filter": None}
1773+
request={"parent": _TEST_FEATURESTORE_NAME}
17741774
)
17751775
assert len(my_entity_type_list) == len(_TEST_ENTITY_TYPE_LIST)
17761776
for my_entity_type in my_entity_type_list:
@@ -1784,7 +1784,7 @@ def test_list_features(self, list_features_mock):
17841784
my_feature_list = my_entity_type.list_features()
17851785

17861786
list_features_mock.assert_called_once_with(
1787-
request={"parent": _TEST_ENTITY_TYPE_NAME, "filter": None}
1787+
request={"parent": _TEST_ENTITY_TYPE_NAME}
17881788
)
17891789
assert len(my_feature_list) == len(_TEST_FEATURE_LIST)
17901790
for my_feature in my_feature_list:
@@ -2851,7 +2851,7 @@ def test_list_features(self, entity_type_name, featurestore_id, list_features_mo
28512851
)
28522852

28532853
list_features_mock.assert_called_once_with(
2854-
request={"parent": _TEST_ENTITY_TYPE_NAME, "filter": None}
2854+
request={"parent": _TEST_ENTITY_TYPE_NAME}
28552855
)
28562856
assert len(my_feature_list) == len(_TEST_FEATURE_LIST)
28572857
for my_feature in my_feature_list:

‎tests/unit/aiplatform/test_matching_engine_index.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -246,9 +246,7 @@ def test_list_indexes(self, list_indexes_mock):
246246

247247
my_indexes_list = aiplatform.MatchingEngineIndex.list()
248248

249-
list_indexes_mock.assert_called_once_with(
250-
request={"parent": _TEST_PARENT, "filter": None}
251-
)
249+
list_indexes_mock.assert_called_once_with(request={"parent": _TEST_PARENT})
252250
assert len(my_indexes_list) == len(_TEST_INDEX_LIST)
253251
for my_index in my_indexes_list:
254252
assert type(my_index) == aiplatform.MatchingEngineIndex

‎tests/unit/aiplatform/test_matching_engine_index_endpoint.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ def test_list_index_endpoints(self, list_index_endpoints_mock):
440440
my_index_endpoints_list = aiplatform.MatchingEngineIndexEndpoint.list()
441441

442442
list_index_endpoints_mock.assert_called_once_with(
443-
request={"parent": _TEST_PARENT, "filter": None}
443+
request={"parent": _TEST_PARENT}
444444
)
445445
assert len(my_index_endpoints_list) == len(_TEST_INDEX_ENDPOINT_LIST)
446446
for my_index_endpoint in my_index_endpoints_list:

‎tests/unit/aiplatform/test_models.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2382,7 +2382,7 @@ def test_get_model_evaluation_without_id(
23822382
test_model.get_model_evaluation()
23832383

23842384
list_model_evaluations_mock.assert_called_once_with(
2385-
request={"parent": _TEST_MODEL_RESOURCE_NAME, "filter": None}
2385+
request={"parent": _TEST_MODEL_RESOURCE_NAME}
23862386
)
23872387

23882388
def test_list_model_evaluations(
@@ -2397,7 +2397,7 @@ def test_list_model_evaluations(
23972397
eval_list = test_model.list_model_evaluations()
23982398

23992399
list_model_evaluations_mock.assert_called_once_with(
2400-
request={"parent": _TEST_MODEL_RESOURCE_NAME, "filter": None}
2400+
request={"parent": _TEST_MODEL_RESOURCE_NAME}
24012401
)
24022402

24032403
assert len(eval_list) == len(_TEST_MODEL_EVAL_LIST)

‎tests/unit/aiplatform/test_pipeline_jobs.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1289,7 +1289,7 @@ def test_list_pipeline_job(
12891289
job.list()
12901290

12911291
mock_pipeline_service_list.assert_called_once_with(
1292-
request={"parent": _TEST_PARENT, "filter": None}
1292+
request={"parent": _TEST_PARENT}
12931293
)
12941294

12951295
@pytest.mark.usefixtures(

‎tests/unit/aiplatform/test_tensorboard.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -735,7 +735,7 @@ def test_list_tensorboard_experiments(self, list_tensorboard_experiment_mock):
735735
tensorboard.TensorboardExperiment.list(tensorboard_name=_TEST_NAME)
736736

737737
list_tensorboard_experiment_mock.assert_called_once_with(
738-
request={"parent": _TEST_NAME, "filter": None}
738+
request={"parent": _TEST_NAME}
739739
)
740740

741741

@@ -785,7 +785,7 @@ def test_init_tensorboard_run_with_id_only_with_project_and_location(
785785
name=_TEST_TENSORBOARD_RUN_NAME, retry=base._DEFAULT_RETRY
786786
)
787787
list_tensorboard_time_series_mock.assert_called_once_with(
788-
request={"parent": _TEST_TENSORBOARD_RUN_NAME, "filter": None}
788+
request={"parent": _TEST_TENSORBOARD_RUN_NAME}
789789
)
790790

791791
@pytest.mark.usefixtures("list_tensorboard_time_series_mock")
@@ -900,11 +900,11 @@ def test_list_tensorboard_runs(
900900
)
901901

902902
list_tensorboard_run_mock.assert_called_once_with(
903-
request={"parent": _TEST_TENSORBOARD_EXPERIMENT_NAME, "filter": None}
903+
request={"parent": _TEST_TENSORBOARD_EXPERIMENT_NAME}
904904
)
905905

906906
list_tensorboard_time_series_mock.assert_called_once_with(
907-
request={"parent": _TEST_TENSORBOARD_RUN_NAME, "filter": None}
907+
request={"parent": _TEST_TENSORBOARD_RUN_NAME}
908908
)
909909

910910
@pytest.mark.usefixtures(
@@ -1064,5 +1064,5 @@ def test_list_tensorboard_time_series(self, list_tensorboard_time_series_mock):
10641064
)
10651065

10661066
list_tensorboard_time_series_mock.assert_called_once_with(
1067-
request={"parent": _TEST_TENSORBOARD_RUN_NAME, "filter": None}
1067+
request={"parent": _TEST_TENSORBOARD_RUN_NAME}
10681068
)

0 commit comments

Comments
 (0)