Odsc 41744/move incorrect opctl information (#236)

Author: lu-ohai

ads/opctl/backend/ads_dataflow.py

@@ -189,9 +189,10 @@ def watch(self):
         Watch DataFlow Run from OCID.
         """
         run_id = self.config["execution"]["run_id"]
+        interval = self.config["execution"].get("interval")
         with AuthContext(auth=self.auth_type, profile=self.profile):
             run = DataFlowRun.from_ocid(run_id)
-            run.watch()
+            run.watch(interval=interval)
 
 
 class DataFlowRuntimeFactory(RuntimeFactory):

ads/opctl/backend/ads_ml_job.py

@@ -227,10 +227,11 @@ def watch(self):
         Watch Job Run from OCID.
         """
         run_id = self.config["execution"]["run_id"]
-
+        interval = self.config["execution"].get("interval")
+        wait = self.config["execution"].get("wait")
         with AuthContext(auth=self.auth_type, profile=self.profile):
             run = DataScienceJobRun.from_ocid(run_id)
-            run.watch()
+            run.watch(interval=interval, wait=wait)
 
     def _jinja_write(self, operator_slug, operator_folder):
         # TODO AH: fill in templates with relevant details

ads/opctl/backend/ads_ml_pipeline.py

@@ -91,8 +91,12 @@ def watch(self) -> None:
         """
         run_id = self.config["execution"]["run_id"]
         log_type = self.config["execution"].get("log_type")
+        interval = self.config["execution"].get("interval")
         with AuthContext(auth=self.auth_type, profile=self.profile):
-            PipelineRun.from_ocid(run_id).watch(log_type=log_type)
+            PipelineRun.from_ocid(run_id).watch(
+                interval=interval,
+                log_type=log_type
+            )
 
     def init(
         self,

ads/opctl/cli.py

@@ -233,42 +233,29 @@ def init_vscode(**kwargs):
         type=click.Choice(["api_key", "resource_principal"]),
         default=None,
     ),
+]
+
+_model_deployment_options = [
     click.option(
         "--wait-for-completion",
-        help="either to wait for process to complete or not",
+        help="either to wait for process to complete or not for model deployment",
         is_flag=True,
         required=False,
     ),
     click.option(
         "--max-wait-time",
-        help="maximum wait time in seconds for progress to complete",
+        help="maximum wait time in seconds for progress to complete for model deployment",
         type=int,
         required=False,
         default=1200,
     ),
     click.option(
         "--poll-interval",
-        help="poll interval in seconds",
+        help="poll interval in seconds for model deployment",
         type=int,
         required=False,
         default=10,
     ),
-    click.option(
-        "--log-type", help="the type of logging.", required=False, default=None
-    ),
-    click.option(
-        "--log-filter",
-        help="expression for filtering the logs.",
-        required=False,
-        default=None,
-    ),
-    click.option(
-        "--interval",
-        help="log interval in seconds",
-        type=int,
-        required=False,
-        default=3,
-    ),
 ]
 
 
@@ -464,21 +451,46 @@ def init_operator(**kwargs):
 
 @commands.command()
 @click.argument("ocid", nargs=1)
-@add_options(_options)
+@add_options(_model_deployment_options)
 def delete(**kwargs):
     suppress_traceback(kwargs["debug"])(delete_cmd)(**kwargs)
 
 
 @commands.command()
 @click.argument("ocid", nargs=1)
-@add_options(_options)
+@add_options(_model_deployment_options)
 def cancel(**kwargs):
     suppress_traceback(kwargs["debug"])(cancel_cmd)(**kwargs)
 
 
 @commands.command()
 @click.argument("ocid", nargs=1)
-@add_options(_options)
+@click.option(
+    "--log-type", 
+    help="the type of logging. Allowed value: `custom_log` and `service_log` for pipeline, `access` and `predict` for model deployment.", 
+    required=False, 
+    default=None
+)
+@click.option(
+    "--log-filter",
+    help="expression for filtering the logs for model deployment.",
+    required=False,
+    default=None,
+)
+@click.option(
+    "--interval",
+    help="log interval in seconds",
+    type=int,
+    required=False,
+    default=3,
+)
+@click.option(
+    "--wait",
+    help="time in seconds to keep updating the logs after the job run finished for job.",
+    type=int,
+    required=False,
+    default=90
+)
 def watch(**kwargs):
     """
     ``tail`` logs form a job run, dataflow run or pipeline run.
@@ -489,7 +501,7 @@ def watch(**kwargs):
 
 @commands.command()
 @click.argument("ocid", nargs=1)
-@add_options(_options)
+@add_options(_model_deployment_options)
 def activate(**kwargs):
     """
     Activates a data science service.
@@ -499,7 +511,7 @@ def activate(**kwargs):
 
 @commands.command()
 @click.argument("ocid", nargs=1)
-@add_options(_options)
+@add_options(_model_deployment_options)
 def deactivate(**kwargs):
     """
     Deactivates a data science service.

tests/unitary/with_extras/opctl/test_opctl_dataflow_backend.py

@@ -11,6 +11,7 @@
 
 import pytest
 import yaml
+from ads.jobs.builders.infrastructure.dataflow import DataFlowRun
 
 from ads.opctl.backend.ads_dataflow import DataFlowBackend
 
@@ -87,6 +88,23 @@ def test_dataflow_run(self, file_upload, job_run, job_create):
                 False,
             )
 
+    @patch(
+        "ads.opctl.backend.ads_dataflow.DataFlowRun.watch",
+        return_value=DataFlowRun(),
+    )
+    @patch(
+        "ads.opctl.backend.ads_dataflow.DataFlowRun.from_ocid",
+        return_value=DataFlowRun(),
+    )
+    def test_watch(self, mock_from_ocid, mock_watch):
+        config = self.config
+        config["execution"]["run_id"] = "test_dataflow_run_id"
+        config["execution"]["interval"] = 10
+        backend = DataFlowBackend(config)
+        backend.watch()
+        mock_from_ocid.assert_called_with("test_dataflow_run_id")
+        mock_watch.assert_called_with(interval=10)
+
     @pytest.mark.parametrize(
         "runtime_type",
         ["dataFlow", "dataFlowNotebook"],

tests/unitary/with_extras/opctl/test_opctl_ml_job_backend.py

@@ -109,6 +109,24 @@ def test_run_with_image(self, rt, job_run, job_create):
         job_create.assert_called()
         job_run.assert_called()
 
+    @patch(
+        "ads.opctl.backend.ads_ml_job.DataScienceJobRun.watch",
+        return_value=DataScienceJobRun(),
+    )
+    @patch(
+        "ads.opctl.backend.ads_ml_job.DataScienceJobRun.from_ocid",
+        return_value=DataScienceJobRun(),
+    )
+    def test_watch(self, mock_from_ocid, mock_watch):
+        config = self.config
+        config["execution"]["run_id"] = "test_job_run_id"
+        config["execution"]["interval"] = 10
+        config["execution"]["wait"] = 15
+        backend = MLJobBackend(config)
+        backend.watch()
+        mock_from_ocid.assert_called_with("test_job_run_id")
+        mock_watch.assert_called_with(interval=10, wait=15)
+
     @pytest.mark.parametrize(
         "runtime_type",
         ["container", "script", "python", "notebook", "gitPython"],

tests/unitary/with_extras/opctl/test_opctl_ml_pipeline_backend.py

@@ -129,10 +129,11 @@ def test_watch(self, mock_from_ocid, mock_watch):
         config = self.config
         config["execution"]["run_id"] = "test_pipeline_run_id"
         config["execution"]["log_type"] = "custom_log"
+        config["execution"]["interval"] = 10
         backend = PipelineBackend(config)
         backend.watch()
         mock_from_ocid.assert_called_with("test_pipeline_run_id")
-        mock_watch.assert_called_with(log_type="custom_log")
+        mock_watch.assert_called_with(interval=10, log_type="custom_log")
 
     @pytest.mark.parametrize(
         "runtime_type",