adding model download

Author: Ziqun Ye

ads/opctl/backend/local.py

@@ -627,9 +627,9 @@ def __init__(self, config: Dict) -> None:
         self.client = OCIClientFactory(**self.oci_auth).data_science
 
     def predict(self) -> None:
-        
         ocid = self.config["execution"].get("ocid")
         data = self.config["execution"].get("data")
+        model_folder = self.config["execution"].get("model_folder", DEFAULT_MODEL_FOLDER)
         conda_slug, conda_path = self._get_conda_info(ocid)
         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"))
@@ -647,8 +647,9 @@ def predict(self) -> None:
             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, ".."))
-            # bind_volumes[os.path.join(dir_path, "..", "script.py")] = {"bind": script}
+
             self.config["execution"]["entrypoint"] = script
+            bind_volumes[os.path.join(model_folder)] = {"bind": script}
         if self.config["execution"].get("image"):
             exit_code = self._run_with_image(bind_volumes)
         elif self.config["execution"].get("conda_slug", conda_slug):
@@ -666,17 +667,17 @@ def predict(self) -> None:
                 f"Run with the --debug argument to view container logs."
             )
 
-    def _download_model(self, ocid, region):
+    def _download_model(self, ocid, region, bucket_uri, timeout):
         dsc_model = DataScienceModel.from_id(ocid)
         dsc_model.download_artifact(
-        target_dir=self.config["execution"].get("source_folder", DEFAULT_MODEL_FOLDER),
+        target_dir=os.path.join(self.config["execution"].get("source_folder", DEFAULT_MODEL_FOLDER), ocid),
         force_overwrite=True,
         overwrite_existing_artifact=True,
         remove_existing_artifact=True,
         auth=self.oci_auth,
         region=region,
-        timeout=600,
-        bucket_urr=None,
+        timeout=timeout,
+        bucket_uri=bucket_uri,
         )
 
     def _get_conda_info(self, ocid):

ads/opctl/script.py

@@ -1,24 +1,24 @@
 import json
-import os
 import sys
 import tempfile
-import uuid
 
 from ads.model.generic_model import GenericModel
 
 
-def verify(ocid, data, compartment_id, project_id):
+def verify(artifact_dir, data, compartment_id, project_id):
     with tempfile.TemporaryDirectory() as td:
-        model = GenericModel.from_model_catalog(ocid,
-                                                artifact_dir=os.path.join(td, str(uuid.uuid4())),
-                                                force_overwrite=True, compartment_id=compartment_id, project_id=project_id)
+        model = GenericModel.from_model_artifact(artifact_dir=artifact_dir,
+                                                force_overwrite=True,
+                                                compartment_id=compartment_id,
+                                                project_id=project_id)
+
         data = json.loads(data)
         print(model.verify(data, auto_serialize_data=False))
 
 
 def main():
     args = sys.argv[1:]
-    verify(ocid = args[0], data=args[1], compartment_id=args[2], project_id=args[3])
+    verify(artifact_dir = args[0], data=args[1], compartment_id=args[2], project_id=args[3])
     return 0