Fixed default pipeline run log when service log is not enabled (#907)

Author: lu-ohai

ads/pipeline/ads_pipeline_run.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8; -*-
 
-# Copyright (c) 2022, 2023 Oracle and/or its affiliates.
+# Copyright (c) 2022, 2024 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 import copy
 import logging
@@ -689,6 +689,16 @@ def _build_filter_expression(self, steps: List = [], log_type: str = None) -> st
         sources = []
         subjects = []
         skipped_step_list = []
+
+        is_service_logging_enabled = False
+        try:
+            if self.service_logging:
+                is_service_logging_enabled = True
+        except LogNotConfiguredError:
+            logger.warning(
+                "Service log is not configured for pipeline. Streaming custom log."
+            )
+
         for step_run in self.step_runs:
             if not steps or (step_run.step_name in steps):
                 step_name = step_run.step_name
@@ -703,7 +713,8 @@ def _build_filter_expression(self, steps: List = [], log_type: str = None) -> st
                         subjects.append(f"subject = '{step_name}'")
                     else:
                         sources.append(f"source = '*{job_run_id}'")
-                        subjects.append(f"subject = '{step_name}'")
+                        if is_service_logging_enabled:
+                            subjects.append(f"subject = '{step_name}'")
                 else:
                     subjects.append(f"subject = '{step_name}'")
 

tests/unitary/default_setup/pipeline/test_pipeline_run.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Copyright (c) 2023 Oracle and/or its affiliates.
+# Copyright (c) 2024 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 from datetime import datetime
@@ -391,6 +391,8 @@ def test_stream_log(self, mock_stream, mock_sync):
             **PIPELINE_RUN_LOG_DETAILS
         )
         pipeline_run.time_accepted = datetime.now()
+        service_logging = OCILog()
+        pipeline_run._set_service_logging_resource(service_logging)
         pipeline_run._PipelineRun__stream_log(
             ConsolidatedLog(OCILog()),
             [custom_script_step.step_name, ml_job_step.step_name],
@@ -749,6 +751,9 @@ def test_build_filter_expression(self):
             ml_job_step_without_job_run_id,
         ]
 
+        service_logging = OCILog()
+        pipeline_run._set_service_logging_resource(service_logging)
+
         consolidated_log_expression = pipeline_run._build_filter_expression()
 
         assert (