Update iris-classifier path

Author: deliahu

docs/deployments/python-packages.md

@@ -7,7 +7,7 @@ Cortex allows you to install additional Python packages to be used in any worklo
 Cortex looks for a `requirements.txt` file in the top level cortex directory (in the same level as `cortex.yaml`).
 
 ```text
-./iris/
+./iris-classifier/
 ├── cortex.yaml
 ├── ...
 └── requirements.txt

examples/iris-classifier/README.md

@@ -12,7 +12,7 @@ Define a `deployment` and an `api` resource in `cortex.yaml`. A `deployment` spe
 
 - kind: api
   name: classifier
-  model: s3://cortex-examples/iris/tensorflow
+  model: s3://cortex-examples/iris-classifier/tensorflow
   request_handler: handlers/tensorflow.py
 ```
 

examples/iris-classifier/cortex.yaml

@@ -3,35 +3,35 @@
 
 - kind: api
   name: tensorflow
-  model: s3://cortex-examples/iris/tensorflow
+  model: s3://cortex-examples/iris-classifier/tensorflow
   request_handler: handlers/tensorflow.py
   tracker:
     model_type: classification
 
 - kind: api
   name: pytorch
-  model: s3://cortex-examples/iris/pytorch.onnx
+  model: s3://cortex-examples/iris-classifier/pytorch.onnx
   request_handler: handlers/pytorch.py
   tracker:
     model_type: classification
 
 - kind: api
   name: keras
-  model: s3://cortex-examples/iris/keras.onnx
+  model: s3://cortex-examples/iris-classifier/keras.onnx
   request_handler: handlers/keras.py
   tracker:
     model_type: classification
 
 - kind: api
   name: xgboost
-  model: s3://cortex-examples/iris/xgboost.onnx
+  model: s3://cortex-examples/iris-classifier/xgboost.onnx
   request_handler: handlers/xgboost.py
   tracker:
     model_type: classification
 
 - kind: api
   name: sklearn
-  model: s3://cortex-examples/iris/sklearn.onnx
+  model: s3://cortex-examples/iris-classifier/sklearn.onnx
   request_handler: handlers/sklearn.py
   tracker:
     model_type: classification

examples/iris-classifier/models/keras.ipynb

@@ -185,7 +185,7 @@
       "source": [
         "AWS_ACCESS_KEY_ID = \"\" #@param {type:\"string\"}\n",
         "AWS_SECRET_ACCESS_KEY = \"\" #@param {type:\"string\"}\n",
-        "S3_UPLOAD_PATH = \"s3://my-bucket/iris/keras.onnx\" #@param {type:\"string\"}\n",
+        "S3_UPLOAD_PATH = \"s3://my-bucket/iris-classifier/keras.onnx\" #@param {type:\"string\"}\n",
         "\n",
         "import sys\n",
         "import re\n",

examples/iris-classifier/models/pytorch.ipynb

@@ -217,7 +217,7 @@
       "source": [
         "AWS_ACCESS_KEY_ID = \"\" #@param {type:\"string\"}\n",
         "AWS_SECRET_ACCESS_KEY = \"\" #@param {type:\"string\"}\n",
-        "S3_UPLOAD_PATH = \"s3://my-bucket/iris/pytorch.onnx\" #@param {type:\"string\"}\n",
+        "S3_UPLOAD_PATH = \"s3://my-bucket/iris-classifier/pytorch.onnx\" #@param {type:\"string\"}\n",
         "\n",
         "import sys\n",
         "import re\n",

examples/iris-classifier/models/sklearn.ipynb

@@ -236,7 +236,7 @@
       "source": [
         "AWS_ACCESS_KEY_ID = \"\" #@param {type:\"string\"}\n",
         "AWS_SECRET_ACCESS_KEY = \"\" #@param {type:\"string\"}\n",
-        "S3_UPLOAD_PATH = \"s3://my-bucket/iris/sklearn.onnx\" #@param {type:\"string\"}\n",
+        "S3_UPLOAD_PATH = \"s3://my-bucket/iris-classifier/sklearn.onnx\" #@param {type:\"string\"}\n",
         "\n",
         "import sys\n",
         "import re\n",
@@ -305,7 +305,7 @@
         "colab": {}
       },
       "source": [
-        "METADATA_S3_UPLOAD_PATH = \"s3://my-bucket/iris/scalars.json\" #@param {type:\"string\"}\n",
+        "METADATA_S3_UPLOAD_PATH = \"s3://my-bucket/iris-classifier/scalars.json\" #@param {type:\"string\"}\n",
         "\n",
         "try:\n",
         "    metadata_bucket = re.search('s3://(.+?)/', METADATA_S3_UPLOAD_PATH).group(1)\n",

examples/iris-classifier/models/tensorflow.ipynb

@@ -222,7 +222,7 @@
       "source": [
         "AWS_ACCESS_KEY_ID = \"\" #@param {type:\"string\"}\n",
         "AWS_SECRET_ACCESS_KEY = \"\" #@param {type:\"string\"}\n",
-        "S3_UPLOAD_PATH = \"s3://my-bucket/iris/tensorflow\" #@param {type:\"string\"}\n",
+        "S3_UPLOAD_PATH = \"s3://my-bucket/iris-classifier/tensorflow\" #@param {type:\"string\"}\n",
         "\n",
         "import sys\n",
         "import re\n",

examples/iris-classifier/models/xgboost.ipynb

@@ -178,7 +178,7 @@
       "source": [
         "AWS_ACCESS_KEY_ID = \"\" #@param {type:\"string\"}\n",
         "AWS_SECRET_ACCESS_KEY = \"\" #@param {type:\"string\"}\n",
-        "S3_UPLOAD_PATH = \"s3://my-bucket/iris/xgboost.onnx\" #@param {type:\"string\"}\n",
+        "S3_UPLOAD_PATH = \"s3://my-bucket/iris-classifier/xgboost.onnx\" #@param {type:\"string\"}\n",
         "\n",
         "import sys\n",
         "import re\n",

pkg/lib/aws/errors.go

@@ -109,14 +109,14 @@ func (e Error) Error() string {
 func ErrorInvalidS3aPath(provided string) error {
 	return Error{
 		Kind:    ErrInvalidS3aPath,
-		message: fmt.Sprintf("%s is not a valid s3a path (e.g. s3a://cortex-examples/iris.csv is a valid s3a path)", s.UserStr(provided)),
+		message: fmt.Sprintf("%s is not a valid s3a path (e.g. s3a://cortex-examples/iris-classifier/tensorflow is a valid s3a path)", s.UserStr(provided)),
 	}
 }
 
 func ErrorInvalidS3Path(provided string) error {
 	return Error{
 		Kind:    ErrInvalidS3Path,
-		message: fmt.Sprintf("%s is not a valid s3 path (e.g. s3://cortex-examples/iris-tensorflow.zip is a valid s3 path)", s.UserStr(provided)),
+		message: fmt.Sprintf("%s is not a valid s3 path (e.g. s3://cortex-examples/iris-classifier/tensorflow is a valid s3 path)", s.UserStr(provided)),
 	}
 }