ODSC 29065/Model Deployment opctl for local dev #134

z7ye · 2023-04-05T03:54:07Z

Description

Download Model

ads opctl model download ocid1.datasciencemodel.oc1.*** -f --bucket-uri oci://ads_test@ociodscdev/model

Auto Detect and Install Conda

ads opctl predict --ocid ocid1.datasciencemodel.oc1.iad.*** --payload '[[-1.68671955,2.25814541,1.48317577,1.51661083,-0.20669947,-0.4260807,-1.02519643,-0.5068027,0.25248417,0.62665134,0.23441123,-0.27358368,0.82731396,-0.14530245,0.80733585]]' --bucket-uri oci://ads_test@ociodscdev/model --conda-pack-folder ~/.ads_ops/conda2

Small artifacts

ads opctl predict --ocid ocid1.datasciencemodel.oc1.iad.*** --payload '[[-1.68671955,2.25814541,1.48317577,1.51661083,-0.20669947,-0.4260807,-1.02519643,-0.5068027,0.25248417,0.62665134,0.23441123,-0.27358368,0.82731396,-0.14530245,0.80733585]]' --conda-slug onnx110_p38_cpu_v2

Artifacts Dir

ads opctl predict --artifact-directory ~/.ads_ops/models/ocid1.datasciencemodel.oc1.iad.*** --payload '[[-1.68671955,2.25814541,1.48317577,1.51661083,-0.20669947,-0.4260807,-1.02519643,-0.5068027,0.25248417,0.62665134,0.23441123,-0.27358368,0.82731396,-0.14530245,0.80733585]]' --conda-slug onnx110_p38_cpu_v2

Large Artifacts

ads opctl predict --ocid ocid1.datasciencemodel.oc1.iad.*** --payload '[[-1.68671955,2.25814541,1.48317577,1.51661083,-0.20669947,-0.4260807,-1.02519643,-0.5068027,0.25248417,0.62665134,0.23441123,-0.27358368,0.82731396,-0.14530245,0.80733585]]' --conda-slug onnx110_p38_cpu_v2 --bucket-uri oci://ads_test@ociodscdev/model

oracle-contributor-agreement · 2023-04-05T03:54:11Z

Thank you for your pull request and welcome to our community! To contribute, please sign the Oracle Contributor Agreement (OCA).
The following contributors of this PR have not signed the OCA:

To sign the OCA, please create an Oracle account and sign the OCA in Oracle's Contributor Agreement Application.

When signing the OCA, please provide your GitHub username. After signing the OCA and getting an OCA approval from Oracle, this PR will be automatically updated.

If you are an Oracle employee, please make sure that you are a member of the main Oracle GitHub organization, and your membership in this organization is public.

mrDzurb · 2023-04-29T06:59:08Z

ads/opctl/backend/local.py

-                f"Conda pack {conda_pack_path} not found. Please run `ads opctl conda create` or `ads opctl conda install`."
-            )
+            if install:
+                logger.info(f"Downloading the conda pack {slug} to this conda pack {conda_pack_folder}. If this conda pack is already installed locally in a different location, pass in `conda_pack_folder` to avoid downloading it again.")


Maybe?

Downloading a `{slug}` to the `{conda_pack_folder}`. If this conda pack is already installed locally in a different location, pass in `conda_pack_folder` to avoid downloading it again.

yup. fixed.

mrDzurb · 2023-04-30T15:39:22Z

ads/opctl/backend/base.py

        self.config = config
-        self.oci_auth = get_signer(
+        self.oci_auth = create_signer(
+            config["execution"].get("auth"),


This is a good change :)

mrDzurb · 2023-04-30T15:41:29Z

ads/opctl/backend/base.py

+
+    def predict(self) -> None:
+        """
+        Deactivate a remote service.


Wrong description?

mrDzurb · 2023-04-30T15:41:59Z

ads/opctl/backend/ads_model_deployment.py

@@ -170,3 +172,11 @@ def watch(self) -> None:
            model_deployment.watch(
                log_type=log_type, interval=interval, log_filter=log_filter
            )
+
+    def predict(self) -> None:


Could you add a description for this method?

mrDzurb · 2023-04-30T15:42:32Z

ads/opctl/backend/local.py

+from ads.common.decorator.runtime_dependency import (OptionalDependency,
+                                                     runtime_dependency)
+from ads.common.oci_client import OCIClientFactory
+from ads.model.datascience_model import DataScienceModel


NIT: Unused?

mrDzurb · 2023-04-30T15:44:53Z

ads/opctl/backend/local.py

@@ -54,6 +58,17 @@ def __init__(self, config: Dict) -> None:
            dictionary of configurations
        """
        self.config = config
+        self.auth_type = config["execution"].get("auth")


We are doing the same and the same steps in every backend, maybe lines 61->71 can be moved to the base class?

actually, i realized I should not add it to localbackend since it will affect local pipeline backend and etc. So I moved it to only LocalModeDeploymentBackend.

mrDzurb · 2023-04-30T15:59:10Z

ads/opctl/backend/local.py

+        if not compartment_id or not project_id:
+            raise ValueError("`compartment_id` and `project_id` must be provided.")
+
+        extra_cmd = "/opt/ds/model/deployed_model/ " + data + " " + compartment_id + " " + project_id


Looks like the /opt/ds/model/deployed_model/ is used in many places. I would suggest to move it to the constants.

extra_cmd = f"/opt/ds/model/deployed_model/ {data} {compartment_id} {project_id}"

mrDzurb · 2023-04-30T16:02:13Z

ads/opctl/backend/local.py

+        custom_metadata = ModelCustomMetadata._from_oci_metadata(response.data.custom_metadata_list)
+        conda_slug, conda_path = None, None
+        if "CondaEnvironmentPath" in custom_metadata:
+            conda_path = custom_metadata['CondaEnvironmentPath'].value


NIT: MetadataCustomKeys.CONDA_ENVIRONMENT_PATH ?

fixed as "CondaEnvironmentPath" in custom_metadata.keys

mrDzurb · 2023-04-30T16:03:26Z

ads/opctl/cli.py

@@ -499,7 +502,26 @@ def deactivate(**kwargs):
    suppress_traceback(kwargs["debug"])(deactivate_cmd)(**kwargs)


+@commands.command()


Looks like this file needs to be formatted? Please check the other files as well. I have added a pre-commit config in this PR, but till it will be merged the manual formatting needs to be done.

run black manually

mrDzurb · 2023-04-30T16:06:14Z

ads/opctl/cli.py

+@click.option("--region", nargs=1, required=False, help="The destination Object Storage bucket region. By default the value will be extracted from the `OCI_REGION_METADATA` environment variables. This is only used when the model id is passed.")
+@click.option("--timeout", nargs=1, required=False, help="The connection timeout in seconds for the client. This is only used when the model id is passed.")
+@click.option("--artifact-directory", nargs=1, required=False, default=None, help="The artifact directory where stores your models, score.py and etc. This is used when you have a model artifact locally and have not saved it to the model catalog yet. In this case, you dont need to pass in model ")
+@click.option("--payload", nargs=1, help="The payload sent to the model for prediction.")


Should be added some details about the format of the payload?

mrDzurb · 2023-04-30T16:10:02Z

ads/opctl/cmds.py



 class DataScienceResource(str, metaclass=ExtendedEnumMeta):
    JOB = "datasciencejob"
    DATAFLOW = "dataflowapplication"
    PIPELINE = "datasciencepipeline"
    MODEL_DEPLOYMENT = "datasciencemodeldeployment"
+    MODEL = "datascience"


maybe it would be better to use datasciencemodel instead?

…into ODSC-29065/md_opctl

github-actions · 2023-04-30T23:16:56Z

📌 Cov diff with develop:

📌 Overall coverage:

No success to gather report. 😿

github-actions · 2023-05-01T04:45:50Z

No success to gather report. 😿

📌 Overall coverage:

No success to gather report. 😿

github-actions · 2023-05-01T04:48:09Z

No success to gather report. 😿

📌 Overall coverage:

No success to gather report. 😿

github-actions · 2023-05-01T05:24:19Z

📌 Cov diff with develop:

📌 Overall coverage:

No success to gather report. 😿

github-actions · 2023-05-01T06:56:28Z

📌 Cov diff with develop:

📌 Overall coverage:

github-actions · 2023-05-01T17:32:53Z

📌 Cov diff with develop:

📌 Overall coverage:

…ata-science into ODSC-29065/md_opctl

github-actions · 2023-05-02T01:17:58Z

📌 Cov diff with develop:

No success to gather report. 😿

📌 Overall coverage:

No success to gather report. 😿

github-actions · 2023-05-02T01:55:08Z

📌 Cov diff with develop:

📌 Overall coverage:

github-actions · 2023-05-02T17:36:52Z

📌 Cov diff with develop:

📌 Overall coverage:

ODSC-29065: adding md local development

c8ed754

oracle-contributor-agreement bot added the OCA Required At least one contributor does not have an approved Oracle Contributor Agreement. label Apr 5, 2023

z7ye changed the base branch from main to develop April 5, 2023 03:54

oracle-contributor-agreement bot added OCA Verified All contributors have signed the Oracle Contributor Agreement. and removed OCA Required At least one contributor does not have an approved Oracle Contributor Agreement. labels Apr 5, 2023

z7ye marked this pull request as draft April 5, 2023 03:54

z7ye added 10 commits April 4, 2023 22:53

make predict work

3fe5738

ODSC-29065: extra conda slug

8cc4e18

adding model download

d1e68e3

adding implementation for artifactory option

8c1f5b1

remove the comments out

1c3969f

adding model command

109b606

adding code for model

a22ff17

expose the error

a45bc10

adding raise e

5c6fa49

reorgnize code

bf4a836

mrDzurb reviewed Apr 29, 2023

View reviewed changes

add test

8df3ec0

mrDzurb reviewed Apr 30, 2023

View reviewed changes

z7ye added 2 commits April 30, 2023 15:28

add more unit test

a32693f

Merge branch 'develop' of github.com:oracle/accelerated-data-science …

56a7009

…into ODSC-29065/md_opctl

z7ye added 2 commits April 30, 2023 21:40

change based on the comments

ded5a4d

fix the file name

00dfd55

run black

5b2f44d

z7ye marked this pull request as ready for review May 1, 2023 04:47

z7ye requested a review from mrDzurb May 1, 2023 04:55

fix the tests

cc904ab

Merge branch 'develop' into ODSC-29065/md_opctl

9cd2f13

z7ye requested review from qiuosier, lu-ohai and mayoor May 1, 2023 17:54

mrDzurb previously approved these changes May 1, 2023

View reviewed changes

z7ye added 2 commits May 1, 2023 18:15

ODSC-29065: adding more unit test

a78f4c9

Merge branch 'ODSC-29065/md_opctl' of github.com:oracle/accelerated-d…

ed1a4ab

…ata-science into ODSC-29065/md_opctl

z7ye dismissed mrDzurb’s stale review via ed1a4ab May 2, 2023 01:16

format the file

4dd8ec9

z7ye requested a review from mrDzurb May 2, 2023 16:59

Merge branch 'develop' into ODSC-29065/md_opctl

14d6e3c

qiuosier approved these changes May 2, 2023

View reviewed changes

mrDzurb approved these changes May 2, 2023

View reviewed changes

z7ye merged commit 61cbba2 into develop May 2, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ODSC 29065/Model Deployment opctl for local dev #134

ODSC 29065/Model Deployment opctl for local dev #134

z7ye commented Apr 5, 2023 •

edited

Loading

oracle-contributor-agreement bot commented Apr 5, 2023

mrDzurb Apr 29, 2023

z7ye May 1, 2023

mrDzurb Apr 30, 2023

mrDzurb Apr 30, 2023

z7ye May 1, 2023

mrDzurb Apr 30, 2023

z7ye May 1, 2023

mrDzurb Apr 30, 2023

z7ye May 1, 2023

mrDzurb Apr 30, 2023

z7ye May 1, 2023 •

edited

Loading

mrDzurb Apr 30, 2023

z7ye May 1, 2023

mrDzurb Apr 30, 2023

z7ye May 1, 2023

mrDzurb Apr 30, 2023

z7ye May 1, 2023

mrDzurb Apr 30, 2023

z7ye May 1, 2023

mrDzurb Apr 30, 2023

z7ye May 1, 2023

github-actions bot commented Apr 30, 2023

github-actions bot commented May 1, 2023

github-actions bot commented May 1, 2023

github-actions bot commented May 1, 2023

github-actions bot commented May 1, 2023

github-actions bot commented May 1, 2023

github-actions bot commented May 2, 2023

github-actions bot commented May 2, 2023

github-actions bot commented May 2, 2023

		@@ -499,7 +502,26 @@ def deactivate(**kwargs):
		suppress_traceback(kwargs["debug"])(deactivate_cmd)(**kwargs)


		@commands.command()

ODSC 29065/Model Deployment opctl for local dev #134

ODSC 29065/Model Deployment opctl for local dev #134

Conversation

z7ye commented Apr 5, 2023 • edited Loading

Description

Download Model

Auto Detect and Install Conda

Small artifacts

Artifacts Dir

Large Artifacts

oracle-contributor-agreement bot commented Apr 5, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

z7ye May 1, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot commented Apr 30, 2023

github-actions bot commented May 1, 2023

github-actions bot commented May 1, 2023

github-actions bot commented May 1, 2023

github-actions bot commented May 1, 2023

github-actions bot commented May 1, 2023

github-actions bot commented May 2, 2023

github-actions bot commented May 2, 2023

github-actions bot commented May 2, 2023

z7ye commented Apr 5, 2023 •

edited

Loading

z7ye May 1, 2023 •

edited

Loading