Merge branch 'develop' into jobs_tags

Author: qiuosier

.github/workflows/run-unittests-default_setup.yml

@@ -4,12 +4,14 @@ on:
   pull_request:
     branches:
       - main
-      - 'release/**'
+      - "release/**"
       - develop
     paths:
-      - 'ads/**'
+      - "ads/**"
       - setup.py
-      - '**requirements.txt'
+      - "**requirements.txt"
+      - .github/workflows/run-unittests.yml
+      - .github/workflows/run-unittests-default_setup.yml
 
 # Cancel in progress workflows on pull_requests.
 # https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
@@ -74,7 +76,6 @@ jobs:
         timeout-minutes: 15
         shell: bash
         env:
-          NB_SESSION_COMPARTMENT_OCID: ocid1.compartment.oc1.<unique_ocid>
           NoDependency: True
         run: |
           set -x # print commands that are executed

.github/workflows/run-unittests.yml

@@ -4,12 +4,14 @@ on:
   pull_request:
     branches:
       - main
-      - 'release/**'
+      - "release/**"
       - develop
     paths:
-      - 'ads/**'
+      - "ads/**"
       - setup.py
-      - '**requirements.txt'
+      - "**requirements.txt"
+      - .github/workflows/run-unittests.yml
+      - .github/workflows/run-unittests-default_setup.yml
 
 # Cancel in progress workflows on pull_requests.
 # https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
@@ -85,22 +87,21 @@ jobs:
         shell: bash
         run: |
           set -x # print commands that are executed
-          
+
           sudo apt-get install libkrb5-dev graphviz
           $CONDA/bin/conda init
           source /home/runner/.bashrc
-          
+
           pip install -r dev-requirements.txt
 
       - name: "Run unitary tests folder with maximum ADS dependencies"
         timeout-minutes: 60
         shell: bash
         env:
-          NB_SESSION_COMPARTMENT_OCID: ocid1.compartment.oc1.<unique_ocid>
           CONDA_PREFIX: /usr/share/miniconda
         run: |
           set -x # print commands that are executed
-          
+
           # Setup project and tests folder for cov reports to not be overwritten by another parallel step
           if [[ ! -z "${{ matrix.cov-reports }}" ]]; then
             mkdir -p cov-${{ matrix.name }}
@@ -109,7 +110,7 @@ jobs:
             ln -s ../ads ads
             ln -s ../.coveragerc .coveragerc
           fi
-          
+
           # Run tests
           python -m pytest -v -p no:warnings --durations=5 \
           -n auto --dist loadfile ${{ matrix.cov-reports }} \
@@ -145,18 +146,18 @@ jobs:
       - name: "Calculate overall coverage"
         run: |
           set -x # print commands that are executed
-          
+
           # Prepare default cov body text 
           COV_BODY_INTRO="📌 Overall coverage:\n\n"
           echo COV_BODY="$COV_BODY_INTRO No success to gather report. 😿" >> $GITHUB_ENV
-          
+
           # Combine coverage files
           pip install coverage
           coverage combine cov-reports-unitary/.coverage cov-reports-model/.coverage
-          
+
           # Make html report
           coverage html
-          
+
           # Calculate overall coverage and update body message
           COV=$(grep -E 'pc_cov' htmlcov/index.html | cut -d'>' -f 2 | cut -d'%' -f 1)
           if [[ ! -z $COV ]]; then 
@@ -168,18 +169,18 @@ jobs:
         if: always()
         run: |
           set -x # print commands that are executed
-          
+
           # Prepare default diff body text 
           DIFF_BODY_INTRO="📌 Cov diff with **${{ env.COMPARE_BRANCH }}**:\n\n"
           echo DIFF_BODY="$DIFF_BODY_INTRO No success to gather report. 😿" >> $GITHUB_ENV
-          
+
           # Prepare file paths to coverage xml files
           # Filenames taken from job.test last step with name - "Save coverage files"
           FILE1="cov-reports-unitary/coverage.xml"; [[ ! -f $FILE1 ]] && FILE1="" 
           FILE2="cov-reports-model/coverage.xml"; [[ ! -f $FILE2 ]] && FILE2=""
           echo "FILE1=$FILE1" >> $GITHUB_ENV
           echo "FILE2=$FILE2" >> $GITHUB_ENV
-          
+
           # Calculate coverage diff and update body message
           pip install diff_cover
           diff-cover $FILE1 $FILE2 --compare-branch=origin/${{ env.COMPARE_BRANCH }} 

ads/model/deployment/model_deployment.py

@@ -863,9 +863,9 @@ def predict(
             and `json_input` required to be json serializable. If `auto_serialize_data` set
             to True, data will be serialized before sending to model deployment endpoint.
         model_name: str
-            Defaults to None. When the `Inference_server="triton"`, the name of the model to invoke.
+            Defaults to None. When the `inference_server="triton"`, the name of the model to invoke.
         model_version: str
-            Defaults to None. When the `Inference_server="triton"`, the version of the model to invoke.
+            Defaults to None. When the `inference_server="triton"`, the version of the model to invoke.
         kwargs:
             content_type: str
                 Used to indicate the media type of the resource.

ads/opctl/backend/ads_model_deployment.py

@@ -4,11 +4,16 @@
 # Copyright (c) 2022, 2023 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
+import json
 from typing import Dict
-from ads.common.auth import create_signer, AuthContext
+
+from oci.data_science.models import ModelDeployment as OCIModelDeployment
+
+import ads
+from ads.common.auth import AuthContext, create_signer
 from ads.common.oci_client import OCIClientFactory
-from ads.opctl.backend.base import Backend
 from ads.model.deployment import ModelDeployment
+from ads.opctl.backend.base import Backend
 
 
 class ModelDeploymentBackend(Backend):
@@ -117,3 +122,16 @@ def watch(self) -> None:
             model_deployment.watch(
                 log_type=log_type, interval=interval, log_filter=log_filter
             )
+
+    def predict(self) -> None:
+        ocid = self.config["execution"].get("ocid")
+        data = self.config["execution"].get("payload")
+        model_name = self.config["execution"].get("model_name")
+        model_version = self.config["execution"].get("model_version")
+        with AuthContext(auth=self.auth_type, profile=self.profile):
+            model_deployment = ModelDeployment.from_id(ocid)
+            try:
+                data = json.loads(data)
+            except:
+                pass
+            print(model_deployment.predict(data=data, model_name=model_name, model_version=model_version))

ads/opctl/backend/base.py

@@ -7,19 +7,19 @@
 from abc import abstractmethod
 from typing import Dict
 
-from ads.common.auth import get_signer
+from ads.common.auth import create_signer
+
 
 
 class Backend:
     """Interface for backend"""
 
     def __init__(self, config: Dict) -> None:
         self.config = config
-        self.oci_auth = get_signer(
-            config["execution"].get("oci_config", None),
-            config["execution"].get("oci_profile", None),
-        )
+        self.auth_type = config["execution"].get("auth")
         self.profile = config["execution"].get("oci_profile", None)
+        self.oci_config = config["execution"].get("oci_config", None)
+
 
     @abstractmethod
     def run(self) -> Dict:
@@ -91,3 +91,13 @@ def run_diagnostics(self):
         """
         Implement Diagnostics check appropriate for the backend
         """
+
+    def predict(self) -> None:
+        """
+        Run model predict.
+
+        Returns
+        -------
+        None
+        """
+        raise NotImplementedError("`predict` has not been implemented yet.")