Merge branch 'main' into ODSC-39781/deprecate_model_deployment_properties_api

Author: lu-ohai

ads/model/deployment/model_deployment.py

@@ -44,7 +44,7 @@
 )
 from ads.common import utils as ads_utils
 from .common import utils
-from .common.utils import OCIClientManager, State
+from .common.utils import State
 from .model_deployment_properties import ModelDeploymentProperties
 from oci.data_science.models import (
     LogDetails,
@@ -205,7 +205,10 @@ class ModelDeployment(Builder):
     ...        .with_health_check_port(<health_check_port>)
     ...        .with_env({"key":"value"})
     ...        .with_deployment_mode("HTTPS_ONLY")
-    ...        .with_model_uri(<model_uri>))
+    ...        .with_model_uri(<model_uri>)
+    ...        .with_bucket_uri(<bucket_uri>)
+    ...        .with_auth(<auth>)
+    ...        .with_timeout(<time_out>))
     ...    )
     ... )
     >>> ds_model_deployment.deploy()
@@ -1636,15 +1639,24 @@ def _build_model_deployment_configuration_details(self) -> Dict:
 
         model_id = runtime.model_uri
         if not model_id.startswith("ocid"):
-            model_id = OCIClientManager().prepare_artifact(
-                model_uri=runtime.model_uri,
-                properties=dict(
-                    display_name=self.display_name,
-                    compartment_id=self.infrastructure.compartment_id
-                    or COMPARTMENT_OCID,
-                    project_id=self.infrastructure.project_id or PROJECT_OCID,
-                ),
+            
+            from ads.model.datascience_model import DataScienceModel
+            
+            dsc_model = DataScienceModel(
+                name=self.display_name,
+                compartment_id=self.infrastructure.compartment_id
+                or COMPARTMENT_OCID,
+                project_id=self.infrastructure.project_id or PROJECT_OCID,
+                artifact=runtime.model_uri,
+            ).create(
+                bucket_uri=runtime.bucket_uri,
+                auth=runtime.auth,
+                region=runtime.region,
+                overwrite_existing_artifact=runtime.overwrite_existing_artifact,
+                remove_existing_artifact=runtime.remove_existing_artifact,
+                timeout=runtime.timeout
             )
+            model_id = dsc_model.id
 
         model_configuration_details = {
             infrastructure.CONST_BANDWIDTH_MBPS: infrastructure.bandwidth_mbps

ads/model/deployment/model_deployment_runtime.py

@@ -36,6 +36,18 @@ class ModelDeploymentRuntime(Builder):
         The output stream ids of model deployment.
     model_uri: str
         The model uri of model deployment.
+    bucket_uri: str
+        The OCI Object Storage URI where large size model artifacts will be copied to.
+    auth: Dict
+        The default authentication is set using `ads.set_auth` API.
+    region: str
+        The destination Object Storage bucket region.
+    overwrite_existing_artifact: bool
+        Whether overwrite existing target bucket artifact or not.
+    remove_existing_artifact: bool
+        Whether artifacts uploaded to object storage bucket need to be removed or not.
+    timeout: int
+        The connection timeout in seconds for the client.
 
     Methods
     -------
@@ -49,6 +61,18 @@ class ModelDeploymentRuntime(Builder):
         Sets the output stream ids of model deployment
     with_model_uri(model_uri)
         Sets the model uri of model deployment
+    with_bucket_uri(bucket_uri)
+        Sets the bucket uri when uploading large size model.
+    with_auth(auth)
+        Sets the default authentication when uploading large size model.
+    with_region(region)
+        Sets the region when uploading large size model.
+    with_overwrite_existing_artifact(overwrite_existing_artifact)
+        Sets whether to overwrite existing artifact when uploading large size model.
+    with_remove_existing_artifact(remove_existing_artifact)
+        Sets whether to remove existing artifact when uploading large size model.
+    with_timeout(timeout)
+        Sets the connection timeout when uploading large size model.
     """
 
     CONST_MODEL_ID = "modelId"
@@ -60,6 +84,12 @@ class ModelDeploymentRuntime(Builder):
     CONST_INPUT_STREAM_IDS = "inputStreamIds"
     CONST_OUTPUT_STREAM_IDS = "outputStreamIds"
     CONST_ENVIRONMENT_CONFIG_DETAILS = "environmentConfigurationDetails"
+    CONST_BUCKET_URI = "bucketUri"
+    CONST_AUTH = "auth"
+    CONST_REGION = "region"
+    CONST_OVERWRITE_EXISTING_ARTIFACT = "overwriteExistingArtifact"
+    CONST_REMOVE_EXISTING_ARTIFACT = "removeExistingArtifact"
+    CONST_TIMEOUT = "timeout"
 
     attribute_map = {
         CONST_ENV: "env",
@@ -68,6 +98,12 @@ class ModelDeploymentRuntime(Builder):
         CONST_OUTPUT_STREAM_IDS: "output_stream_ids",
         CONST_DEPLOYMENT_MODE: "deployment_mode",
         CONST_MODEL_URI: "model_uri",
+        CONST_BUCKET_URI: "bucket_uri",
+        CONST_AUTH: "auth",
+        CONST_REGION: "region",
+        CONST_OVERWRITE_EXISTING_ARTIFACT: "overwrite_existing_artifact",
+        CONST_REMOVE_EXISTING_ARTIFACT: "remove_existing_artifact",
+        CONST_TIMEOUT: "timeout"
     }
 
     ENVIRONMENT_CONFIG_DETAILS_PATH = (
@@ -236,7 +272,172 @@ def with_model_uri(self, model_uri: str) -> "ModelDeploymentRuntime":
             The ModelDeploymentRuntime instance (self).
         """
         return self.set_spec(self.CONST_MODEL_URI, model_uri)
+    
+    @property
+    def bucket_uri(self) -> str:
+        """The bucket uri of model.
+
+        Returns
+        -------
+        str
+            The bucket uri of model.
+        """
+        return self.get_spec(self.CONST_BUCKET_URI, None)
+
+    def with_bucket_uri(self, bucket_uri: str) -> "ModelDeploymentRuntime":
+        """Sets the bucket uri of model.
+
+        Parameters
+        ----------
+        bucket_uri: str
+            The bucket uri of model.
+
+        Returns
+        -------
+        ModelDeploymentRuntime
+            The ModelDeploymentRuntime instance (self).
+        """
+        return self.set_spec(self.CONST_BUCKET_URI, bucket_uri)
+    
+    @property
+    def auth(self) -> Dict:
+        """The auth when uploading large-size model.
+
+        Returns
+        -------
+        Dict
+            The auth when uploading large-size model.
+        """
+        return self.get_spec(self.CONST_AUTH, {})
+    
+    def with_auth(self, auth: Dict) -> "ModelDeploymentRuntime":
+        """Sets the auth when uploading large-size model.
+
+        Parameters
+        ----------
+        auth: Dict
+            The auth when uploading large-size model.
+
+        Returns
+        -------
+        ModelDeploymentRuntime
+            The ModelDeploymentRuntime instance (self).
+        """
+        return self.set_spec(self.CONST_AUTH, auth)
+    
+    @property
+    def region(self) -> str:
+        """The region when uploading large-size model.
 
+        Returns
+        -------
+        str
+            The region when uploading large-size model.
+        """
+        return self.get_spec(self.CONST_REGION, None)
+    
+    def with_region(self, region: str) -> "ModelDeploymentRuntime":
+        """Sets the region when uploading large-size model.
+
+        Parameters
+        ----------
+        region: str
+            The region when uploading large-size model.
+
+        Returns
+        -------
+        ModelDeploymentRuntime
+            The ModelDeploymentRuntime instance (self).
+        """
+        return self.set_spec(self.CONST_REGION, region)
+    
+    @property
+    def overwrite_existing_artifact(self) -> bool:
+        """Overwrite existing artifact when uploading large size model.
+
+        Returns
+        -------
+        bool
+            Overwrite existing artifact when uploading large size model.
+        """
+        return self.get_spec(self.CONST_OVERWRITE_EXISTING_ARTIFACT, True)
+    
+    def with_overwrite_existing_artifact(
+        self, 
+        overwrite_existing_artifact: bool
+    ) -> "ModelDeploymentRuntime":
+        """Sets whether to overwrite existing artifact when uploading large size model.
+
+        Parameters
+        ----------
+        overwrite_existing_artifact: bool
+            Overwrite existing artifact when uploading large size model.
+
+        Returns
+        -------
+        ModelDeploymentRuntime
+            The ModelDeploymentRuntime instance (self).
+        """
+        return self.set_spec(
+            self.CONST_OVERWRITE_EXISTING_ARTIFACT,
+            overwrite_existing_artifact
+        )
+    
+    @property
+    def remove_existing_artifact(self) -> bool:
+        """Remove existing artifact when uploading large size model.
+
+        Returns
+        -------
+        bool
+            Remove existing artifact when uploading large size model.
+        """
+        return self.get_spec(self.CONST_REMOVE_EXISTING_ARTIFACT, True)
+    
+    def with_remove_existing_artifact(
+        self,
+        remove_existing_artifact: bool
+    ) -> "ModelDeploymentRuntime":
+        """Sets whether to remove existing artifact when uploading large size model.
+
+        Parameters
+        ----------
+        remove_existing_artifact: bool
+            Remove existing artifact when uploading large size model.
+
+        Returns
+        -------
+        ModelDeploymentRuntime
+            The ModelDeploymentRuntime instance (self).
+        """
+        return self.set_spec(self.CONST_REMOVE_EXISTING_ARTIFACT, remove_existing_artifact)
+    
+    @property
+    def timeout(self) -> int:
+        """The timeout when uploading large-size model.
+
+        Returns
+        -------
+        int
+            The timeout when uploading large-size model.
+        """
+        return self.get_spec(self.CONST_TIMEOUT, None)
+    
+    def with_timeout(self, timeout: int) -> "ModelDeploymentRuntime":
+        """Sets the timeout when uploading large-size model.
+
+        Parameters
+        ----------
+        timeout: int
+            The timeout when uploading large-size model.
+
+        Returns
+        -------
+        ModelDeploymentRuntime
+            The ModelDeploymentRuntime instance (self).
+        """
+        return self.set_spec(self.CONST_TIMEOUT, timeout)
+    
     def init(self) -> "ModelDeploymentRuntime":
         """Initializes a starter specification for the runtime.
 

docs/source/user_guide/model_registration/model_deploy_byoc.rst

@@ -114,7 +114,13 @@ Below is an example of deploying model on container runtime using ``ModelDeploym
         .with_health_check_port(5000)
         .with_env({"key":"value"})
         .with_deployment_mode("HTTPS_ONLY")
-        .with_model_uri("<MODEL_URI>")
+        .with_model_uri("<path_to_artifact>")
+        .with_auth({"auth_key":"auth_value"})
+        .with_region("us-ashburn-1")
+        .with_overwrite_existing_artifact(True)
+        .with_remove_existing_artifact(True)
+        .with_timeout(100)
+        .with_bucket_uri("oci://<bucket>@<namespace>/<prefix>")
     )
 
     # configure model deployment
@@ -169,14 +175,21 @@ Below is an example of deploying model on container runtime using ``ModelDeploym
         kind: runtime
         type: container
         spec:
-          modelUri: <MODEL_URI>
+          modelUri: <path_to_artifact>
           image: iad.ocir.io/<namespace>/<image>:<tag>
           imageDigest: <IMAGE_DIGEST>
           entrypoint: ["python","/opt/ds/model/deployed_model/api.py"]
           serverPort: 5000
           healthCheckPort: 5000
           env:
             WEB_CONCURRENCY: "10"
+          auth:
+            auth_key: auth_value
+          region: us-ashburn-1
+          overwriteExistingArtifact: True
+          removeExistingArtifact: True
+          timeout: 100
+          bucketUri: oci://<bucket>@<namespace>/<prefix>
           deploymentMode: HTTPS_ONLY
     """