Skip to content

Commit 3082f97

Browse files
jialuzhjialuzh
authored
chore: Remove stuff (googleapis#313)
1 parent 5cdb9af commit 3082f97

4 files changed

Lines changed: 12 additions & 43 deletions

File tree

‎google/cloud/aiplatform/__init__.py‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,25 +48,21 @@
4848
"""
4949
init = initializer.global_config.init
5050

51-
log_param = metadata.metadata_service.log_param
5251
log_params = metadata.metadata_service.log_params
53-
log_metric = metadata.metadata_service.log_metric
5452
log_metrics = metadata.metadata_service.log_metrics
55-
set_experiment = metadata.metadata_service.set_experiment
5653
get_experiment = metadata.metadata_service.get_experiment
54+
get_pipeline = metadata.metadata_service.get_pipeline
5755
set_run = metadata.metadata_service.set_run
5856

5957

6058
__all__ = (
6159
"explain",
6260
"gapic",
6361
"init",
64-
"log_param",
6562
"log_params",
66-
"log_metric",
6763
"log_metrics",
6864
"get_experiment",
69-
"set_experiment",
65+
"get_pipeline",
7066
"set_run",
7167
"AutoMLImageTrainingJob",
7268
"AutoMLTabularTrainingJob",

‎google/cloud/aiplatform/initializer.py‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,23 +56,21 @@ def init(
5656
project: Optional[str] = None,
5757
location: Optional[str] = None,
5858
experiment: Optional[str] = None,
59-
run: Optional[str] = None,
6059
staging_bucket: Optional[str] = None,
6160
credentials: Optional[auth_credentials.Credentials] = None,
6261
encryption_spec_key_name: Optional[str] = None,
6362
):
64-
"""Updates common initalization parameters with provided options.
63+
"""Updates common initialization parameters with provided options.
6564
6665
Args:
6766
project (str): The default project to use when making API calls.
6867
location (str): The default location to use when making API calls. If not
6968
set defaults to us-central-1
7069
experiment (str): The experiment name
71-
run (str): The run name
7270
staging_bucket (str): The default staging bucket to use to stage artifacts
7371
when making API calls. In the form gs://...
74-
credentials (google.auth.crendentials.Credentials): The default custom
75-
credentials to use when making API calls. If not provided crendentials
72+
credentials (google.auth.credentials.Credentials): The default custom
73+
credentials to use when making API calls. If not provided credentials
7674
will be ascertained from the environment.
7775
encryption_spec_key_name (Optional[str]):
7876
Optional. The Cloud KMS resource identifier of the customer
@@ -91,13 +89,6 @@ def init(
9189
self._location = location
9290
if experiment:
9391
metadata.metadata_service.set_experiment(experiment)
94-
if run:
95-
if not experiment:
96-
raise ValueError(
97-
"No experiment set. Provide an experiment for this run, e.g., aiplatform.init("
98-
"experiment='my-experiment')."
99-
)
100-
metadata.metadata_service.set_run(run)
10192
if staging_bucket:
10293
self._staging_bucket = staging_bucket
10394
if credentials:

‎google/cloud/aiplatform/metadata/metadata.py‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ def set_experiment(self, experiment: str):
4343
def set_run(self, run: str):
4444
if not self._experiment:
4545
raise ValueError(
46-
"No experiment set for this run. Make sure to call aiplatform.init(experiment='my-experiment') or "
47-
"aiplatform.set_experiment(experiment='my-experiment') before trying to set_run. "
46+
"No experiment set for this run. Make sure to call aiplatform.init(experiment='my-experiment') "
47+
"before trying to set_run. "
4848
)
4949
execution = _Execution.get_or_create(
5050
resource_id=run,
@@ -53,9 +53,6 @@ def set_run(self, run: str):
5353
)
5454
self._run = execution.name
5555

56-
def log_param(self, name: str, value: Union[float, int, str]):
57-
return self.log_params({name: value})
58-
5956
def log_params(self, params: Dict[str, Union[float, int, str]]):
6057
self._validate_experiment_and_run(method_name="log_params")
6158
execution = _Execution.get_or_create(
@@ -66,9 +63,6 @@ def log_params(self, params: Dict[str, Union[float, int, str]]):
6663
execution.update(metadata=params)
6764
self._run = execution.name
6865

69-
def log_metric(self, name: str, value: Union[str, float, int]):
70-
return self.log_metrics({name: value})
71-
7266
def log_metrics(self, metrics: Dict[str, Union[str, float, int]]):
7367
self._validate_experiment_and_run(method_name="log_metrics")
7468
# Only one metrics artifact for the (experiment, run) tuple.
@@ -83,16 +77,18 @@ def log_metrics(self, metrics: Dict[str, Union[str, float, int]]):
8377
def get_experiment(self, experiment: str):
8478
raise NotImplementedError("get_experiment not implemented")
8579

80+
def get_pipeline(self, pipeline: str):
81+
raise NotImplementedError("get_pipeline not implemented")
82+
8683
def _validate_experiment_and_run(self, method_name: str):
8784
if not self._experiment:
8885
raise ValueError(
8986
f"No experiment set. Make sure to call aiplatform.init(experiment='my-experiment') "
90-
f"or aiplatform.set_experiment(experiment='my-experiment') before trying to {method_name}. "
87+
f"before trying to {method_name}. "
9188
)
9289
if not self._run:
9390
raise ValueError(
94-
f"No run set. Make sure to call aiplatform.init(experiment='my-experiment', "
95-
f"run='my-run') or aiplatform.set_run('my-run') before trying to {method_name}. "
91+
f"No run set. Make sure to call aiplatform.set_run('my-run') before trying to {method_name}. "
9692
)
9793

9894

‎tests/unit/aiplatform/test_initializer.py‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
_TEST_LOCATION_2 = "europe-west4"
4040
_TEST_INVALID_LOCATION = "test-invalid-location"
4141
_TEST_EXPERIMENT = "test-experiment"
42-
_TEST_RUN = "test-run"
4342
_TEST_STAGING_BUCKET = "test-bucket"
4443

4544

@@ -77,19 +76,6 @@ def test_init_experiment_calls_metadata_service(self, set_experiment_mock):
7776
initializer.global_config.init(experiment=_TEST_EXPERIMENT)
7877
set_experiment_mock.assert_called_once_with(_TEST_EXPERIMENT)
7978

80-
def test_init_run_alone_without_experiment_raises(self):
81-
with pytest.raises(ValueError):
82-
initializer.global_config.init(run=_TEST_RUN)
83-
84-
@patch.object(metadata_service, "set_run")
85-
@patch.object(metadata_service, "set_experiment")
86-
def test_init_experiment_and_run_calls_metadata_service(
87-
self, set_experiment_mock, set_run_mock
88-
):
89-
initializer.global_config.init(experiment=_TEST_EXPERIMENT, run=_TEST_RUN)
90-
set_experiment_mock.assert_called_once_with(_TEST_EXPERIMENT)
91-
set_run_mock.assert_called_once_with(_TEST_RUN)
92-
9379
def test_init_staging_bucket_sets_staging_bucket(self):
9480
initializer.global_config.init(staging_bucket=_TEST_STAGING_BUCKET)
9581
assert initializer.global_config.staging_bucket == _TEST_STAGING_BUCKET

0 commit comments

Comments
 (0)