ODSC-29065: fix some bug;

Author: z7ye

ads/opctl/backend/local.py

@@ -52,6 +52,7 @@
 )
 from ads.pipeline.ads_pipeline import Pipeline, PipelineStep
 from ads.common.oci_client import OCIClientFactory
+from ads.config import NO_CONTAINER
 
 class CondaPackNotFound(Exception):  # pragma: no cover
     pass
@@ -679,9 +680,11 @@ def predict(self) -> None:
         None
             Nothing.
         """
+        
+        # model artifact in artifact directory
         artifact_directory = self.config["execution"].get("artifact_directory")
         ocid = self.config["execution"].get("ocid")
-        data = self.config["execution"].get("payload")
+        
         model_folder = os.path.expanduser(
             self.config["execution"].get("model_save_folder", DEFAULT_MODEL_FOLDER)
         )
@@ -706,70 +709,62 @@ def predict(self) -> None:
                 timeout=timeout,
                 force_overwrite=True,
             )
-        conda_slug, conda_path = None, None
-        if ocid:
+        if (
+            not os.path.exists(artifact_directory)
+            or len(os.listdir(artifact_directory)) == 0
+        ):
+            raise ValueError(
+                f"`artifact_directory` {artifact_directory} does not exist or is empty."
+            )
+                
+        # conda
+        conda_slug, conda_path = self.config["execution"].get("conda_slug"), self.config["execution"].get("conda_path")
+        if not conda_slug and not conda_path and ocid:
             conda_slug, conda_path = self._get_conda_info_from_custom_metadata(ocid)
-        if not conda_path:
-            if (
-                not os.path.exists(artifact_directory)
-                or len(os.listdir(artifact_directory)) == 0
-            ):
-                raise ValueError(
-                    f"`artifact_directory` {artifact_directory} does not exist or is empty."
-                )
+        if not conda_path and not conda_path:
             conda_slug, conda_path = self._get_conda_info_from_runtime(
                 artifact_dir=artifact_directory
             )
-        if not conda_path or not conda_slug:
-            raise ValueError("Conda information cannot be detected.")
-        compartment_id = self.config["execution"].get(
-            "compartment_id", self.config["infrastructure"].get("compartment_id")
-        )
-        project_id = self.config["execution"].get(
-            "project_id", self.config["infrastructure"].get("project_id")
-        )
-        if not compartment_id or not project_id:
-            raise ValueError("`compartment_id` and `project_id` must be provided.")
-        extra_cmd = (
-            DEFAULT_MODEL_DEPLOYMENT_FOLDER
-            + " "
-            + data
-            + " "
-            + compartment_id
-            + " "
-            + project_id
-        )
+
+        self.config["execution"]["image"] = ML_JOB_IMAGE
+        
+        # bind_volumnes
         bind_volumes = {}
+        SCRIPT = "script.py"
         if not is_in_notebook_session():
             bind_volumes = {
                 os.path.expanduser(
                     os.path.dirname(self.config["execution"]["oci_config"])
                 ): {"bind": os.path.join(DEFAULT_IMAGE_HOME_DIR, ".oci")}
             }
             dir_path = os.path.dirname(os.path.realpath(__file__))
-            script = "script.py"
+
             self.config["execution"]["source_folder"] = os.path.abspath(
                 os.path.join(dir_path, "..")
             )
-            self.config["execution"]["entrypoint"] = script
+            self.config["execution"]["entrypoint"] = SCRIPT
             bind_volumes[artifact_directory] = {"bind": DEFAULT_MODEL_DEPLOYMENT_FOLDER}
-        if self.config["execution"].get("conda_slug", conda_slug):
-            self.config["execution"]["image"] = ML_JOB_IMAGE
-            if not self.config["execution"].get("conda_slug"):
-                self.config["execution"]["conda_slug"] = conda_slug
-                self.config["execution"]["slug"] = conda_slug
-            self.config["execution"]["conda_path"] = conda_path
-            exit_code = self._run_with_conda_pack(
-                bind_volumes, extra_cmd, install=True, conda_uri=conda_path
-            )
+        
+        # payload
+        data = self.config["execution"].get("payload")
+        
+        if is_in_notebook_session() or NO_CONTAINER:
+            script_path = os.path.join(self.config['execution']['source_folder'], SCRIPT)
+            run_command(cmd=f"python {script_path} " + f"{artifact_directory} "+ f"'{data}'", shell=True)
         else:
-            raise ValueError("Either conda pack info or image should be specified.")
-
-        if exit_code != 0:
-            raise RuntimeError(
-                f"`predict` did not complete successfully. Exit code: {exit_code}. "
-                f"Run with the --debug argument to view container logs."
-            )
+            extra_cmd = (
+            DEFAULT_MODEL_DEPLOYMENT_FOLDER
+            + " "
+            + data
+        )
+            exit_code = self._run_with_conda_pack(
+                    bind_volumes, extra_cmd, install=True, conda_uri=conda_path
+                )
+            if exit_code != 0:
+                raise RuntimeError(
+                    f"`predict` did not complete successfully. Exit code: {exit_code}. "
+                    f"Run with the --debug argument to view container logs."
+                )
 
     def _get_conda_info_from_custom_metadata(self, ocid):
         """

ads/opctl/cli.py

@@ -544,6 +544,7 @@ def init(debug: bool, **kwargs: Dict[str, Any]) -> None:
     suppress_traceback(debug)(init_cmd)(**kwargs)
 
 
+@commands.command()
 @click.option(
     "--ocid",
     nargs=1,
@@ -597,7 +598,13 @@ def init(debug: bool, **kwargs: Dict[str, Any]) -> None:
     "--conda-slug",
     nargs=1,
     required=False,
-    help="The conda env used to load the model and conduct the prediction. This is only used when model id is passed to `ocid` and a local predict is conducted. It should match the inference conda env specified in the runtime.yaml file which is the conda pack being used when conducting real model deployment.",
+    help="The conda slug used to load the model and conduct the prediction. This is only used when model id is passed to `ocid` and a local predict is conducted. It should match the inference conda env specified in the runtime.yaml file which is the conda pack being used when conducting real model deployment.",
+)
+@click.option(
+    "--conda-path",
+    nargs=1,
+    required=False,
+    help="The conda path used to load the model and conduct the prediction. This is only used when model id is passed to `ocid` and a local predict is conducted. It should match the inference conda env specified in the runtime.yaml file which is the conda pack being used when conducting real model deployment.",
 )
 @click.option(
     "--model-version",

ads/opctl/model/cmds.py

@@ -57,7 +57,6 @@ def _download_model(
     ocid, artifact_directory, oci_auth, region, bucket_uri, timeout, force_overwrite
 ):
     os.makedirs(artifact_directory, exist_ok=True)
-    os.chmod(artifact_directory, 777)
 
     try:
         dsc_model = DataScienceModel.from_id(ocid)

ads/opctl/script.py

@@ -1,31 +1,28 @@
 import json
 import sys
-import tempfile
 
 from ads.model.generic_model import GenericModel
 
 
-def verify(artifact_dir, data, compartment_id, project_id): # pragma: no cover
-    with tempfile.TemporaryDirectory() as td:
-        model = GenericModel.from_model_artifact(
-            uri=artifact_dir,
-            artifact_dir=artifact_dir,
-            force_overwrite=True,
-            compartment_id=compartment_id,
-            project_id=project_id,
-        )
+def verify(artifact_dir, data): # pragma: no cover
 
-        try:
-            data = json.loads(data)
-        except:
-            pass
-        print(model.verify(data, auto_serialize_data=False))
+    model = GenericModel.from_model_artifact(
+        uri=artifact_dir,
+        artifact_dir=artifact_dir,
+        force_overwrite=True,
+    )
+
+    try:
+        data = json.loads(data)
+    except:
+        pass
+    print(model.verify(data, auto_serialize_data=False))
 
 
 def main(): # pragma: no cover
     args = sys.argv[1:]
     verify(
-        artifact_dir=args[0], data=args[1], compartment_id=args[2], project_id=args[3]
+        artifact_dir=args[0], data=args[1]
     )
     return 0