chore: fix list method in _VertexAiPipelineBasedService class

sararob · copybara-github · commit 369ab65c34c1 · 2022-11-18T07:02:49.000-08:00
PiperOrigin-RevId: 489464748
diff --git a/google/cloud/aiplatform/_pipeline_based_service/pipeline_based_service.py b/google/cloud/aiplatform/_pipeline_based_service/pipeline_based_service.py
@@ -391,13 +391,21 @@ def list(
 
         for pipeline_execution in filtered_pipeline_executions:
             if "pipeline_job_resource_name" in pipeline_execution.metadata:
-                service_pipeline_job = cls(
-                    pipeline_execution.metadata["pipeline_job_resource_name"],
-                    project=project,
-                    location=location,
-                    credentials=credentials,
-                )
-                service_pipeline_jobs.append(service_pipeline_job)
+                # This is wrapped in a try/except for cases when both
+                # `_coponent_identifier` and `_template_name_identifier` are
+                # set. In that case, even though all pipelines returned by the
+                # Execution.list() call will match the `_component_identifier`,
+                #  some may not match the `_template_name_identifier`
+                try:
+                    service_pipeline_job = cls(
+                        pipeline_execution.metadata["pipeline_job_resource_name"],
+                        project=project,
+                        location=location,
+                        credentials=credentials,
+                    )
+                    service_pipeline_jobs.append(service_pipeline_job)
+                except ValueError:
+                    continue
 
         return service_pipeline_jobs
 
diff --git a/tests/unit/aiplatform/test_pipeline_based_service.py b/tests/unit/aiplatform/test_pipeline_based_service.py
@@ -596,15 +596,9 @@ def test_create_and_submit_pipeline_job(
             == test_backing_pipeline_job.resource_name
         )
 
-    @pytest.mark.parametrize(
-        "job_spec_json",
-        [_TEST_PIPELINE_JOB],
-    )
     def test_list_pipeline_based_service(
         self,
         mock_pipeline_based_service_get,
-        mock_load_yaml_and_json,
-        job_spec_json,
         get_execution_mock,
         list_executions_mock,
     ):
@@ -635,3 +629,25 @@ def test_list_pipeline_based_service(
         # only 1 of the 2 executions in list_executions_mock matches the
         # properties of FakePipelineBasedService
         assert len(test_list_request) == 1
+
+    def test_list_pipeline_based_service_with_template_name_identifier(
+        self,
+        mock_pipeline_based_service_get,
+        get_execution_mock,
+        list_executions_mock,
+    ):
+        aiplatform.init(
+            project=_TEST_PROJECT,
+            location=_TEST_LOCATION,
+            credentials=_TEST_CREDENTIALS,
+        )
+
+        self.FakePipelineBasedService._template_name_identifier = (
+            _TEST_INVALID_PIPELINE_NAME_IDENTIFIER
+        )
+
+        test_list_request = self.FakePipelineBasedService.list()
+
+        # None of the mock pipelines match the `_template_name_identifier`
+        # set above, so the returned list should be empty
+        assert len(test_list_request) == 0
