Move cortex verification from serve.py to run.sh (#1180)

(cherry picked from commit 5fb3d65)

Author: deliahu

Diff for: pkg/workloads/cortex/consts.py

@@ -12,6 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-CORTEX_VERSION = "0.18.1"
 SINGLE_MODEL_NAME = "_cortex_default"
 INFERENTIA_NEURON_SOCKET = "/sock/neuron.sock"

Diff for: pkg/workloads/cortex/serve/run.sh

@@ -66,6 +66,18 @@ if [ -f "/mnt/project/conda-packages.txt" ]; then
     fi
 fi
 
+# CORTEX_VERSION x1
+export EXPECTED_CORTEX_VERSION=0.18.1
+
+if [ "$CORTEX_VERSION" != "$EXPECTED_CORTEX_VERSION" ]; then
+    if [ "$CORTEX_PROVIDER" == "local" ]; then
+        echo "your Cortex CLI version ($CORTEX_VERSION) doesn't match your predictor image version ($EXPECTED_CORTEX_VERSION); please update your predictor image by modifying the \`image\` field in your API configuration file (e.g. cortex.yaml) and re-running \`cortex deploy\`, or update your CLI by following the instructions at https://docs.cortex.dev/cluster-management/update#upgrading-to-a-newer-version-of-cortex"
+    else
+        echo "your Cortex operator version ($CORTEX_VERSION) doesn't match your predictor image version ($EXPECTED_CORTEX_VERSION); please update your predictor image by modifying the \`image\` field in your API configuration file (e.g. cortex.yaml) and re-running \`cortex deploy\`, or update your cluster by following the instructions at https://docs.cortex.dev/cluster-management/update#upgrading-to-a-newer-version-of-cortex"
+    fi
+    exit 1
+fi
+
 # install pip packages
 if [ -f "/mnt/project/requirements.txt" ]; then
     pip --no-cache-dir install -r /mnt/project/requirements.txt

Diff for: pkg/workloads/cortex/serve/serve.py

@@ -32,18 +32,12 @@
 from starlette.background import BackgroundTasks
 from starlette.exceptions import HTTPException as StarletteHTTPException
 
-from cortex import consts
 from cortex.lib import util
 from cortex.lib.type import API, get_spec
 from cortex.lib.log import cx_logger
 from cortex.lib.storage import S3, LocalStorage, FileLock
 from cortex.lib.exceptions import UserRuntimeException
 
-if os.environ["CORTEX_VERSION"] != consts.CORTEX_VERSION:
-    errMsg = f"your Cortex operator version ({os.environ['CORTEX_VERSION']}) doesn't match your predictor image version ({consts.CORTEX_VERSION}); please update your predictor image by modifying the `image` field in your API configuration file (e.g. cortex.yaml) and re-running `cortex deploy`, or update your cluster by following the instructions at https://docs.cortex.dev/cluster-management/update"
-    raise ValueError(errMsg)
-
-
 API_SUMMARY_MESSAGE = (
     "make a prediction by sending a post request to this endpoint with a json payload"
 )
@@ -285,7 +279,7 @@ def start_fn():
             **raw_api_spec,
         )
         client = api.predictor.initialize_client(
-            tf_serving_host=tf_serving_host, tf_serving_port=tf_serving_port,
+            tf_serving_host=tf_serving_host, tf_serving_port=tf_serving_port
         )
         cx_logger().info("loading the predictor from {}".format(api.predictor.path))
         predictor_impl = api.predictor.initialize_impl(project_dir, client)