Skip to content

Commit

Permalink
fix: check if training_task_metadata is populated before logging back…
Browse files Browse the repository at this point in the history
…ingCustomJob (#494)
  • Loading branch information
sasha-gitg committed Jun 21, 2021
1 parent 3b19fff commit 2e627f8
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
3 changes: 2 additions & 1 deletion google/cloud/aiplatform/training_jobs.py
Expand Up @@ -1243,7 +1243,8 @@ def _prepare_training_task_inputs_and_output_dir(

def _wait_callback(self):
if (
self._gca_resource.training_task_metadata.get("backingCustomJob")
self._gca_resource.training_task_metadata
and self._gca_resource.training_task_metadata.get("backingCustomJob")
and not self._has_logged_custom_job
):
_LOGGER.info(f"View backing custom job:\n{self._custom_job_console_uri()}")
Expand Down
12 changes: 9 additions & 3 deletions tests/unit/aiplatform/test_training_jobs.py
Expand Up @@ -443,13 +443,15 @@ def mock_pipeline_service_create():
yield mock_create_training_pipeline


def make_training_pipeline(state):
def make_training_pipeline(state, add_training_task_metadata=True):
return gca_training_pipeline.TrainingPipeline(
name=_TEST_PIPELINE_RESOURCE_NAME,
state=state,
model_to_upload=gca_model.Model(name=_TEST_MODEL_NAME),
training_task_inputs={"tensorboard": _TEST_TENSORBOARD_RESOURCE_NAME},
training_task_metadata={"backingCustomJob": _TEST_CUSTOM_JOB_RESOURCE_NAME},
training_task_metadata={"backingCustomJob": _TEST_CUSTOM_JOB_RESOURCE_NAME}
if add_training_task_metadata
else None,
)


Expand All @@ -460,7 +462,11 @@ def mock_pipeline_service_get():
) as mock_get_training_pipeline:
mock_get_training_pipeline.side_effect = [
make_training_pipeline(
gca_pipeline_state.PipelineState.PIPELINE_STATE_RUNNING
gca_pipeline_state.PipelineState.PIPELINE_STATE_RUNNING,
add_training_task_metadata=False,
),
make_training_pipeline(
gca_pipeline_state.PipelineState.PIPELINE_STATE_RUNNING,
),
make_training_pipeline(
gca_pipeline_state.PipelineState.PIPELINE_STATE_SUCCEEDED
Expand Down

0 comments on commit 2e627f8

Please sign in to comment.