Move python code into it's own folder (#2143)

* Move python code out of the pkg/ directory

* Fix import order

Author: Miguel Varela Ramos

build/cli.sh

@@ -47,7 +47,7 @@ function build_and_upload() {
 }
 
 function build_python {
-  pushd $ROOT/pkg/cortex/client
+  pushd $ROOT/python/client
   python setup.py sdist
 
   if [ "$upload" == "true" ]; then

dev/generate_python_client_md.sh

@@ -27,7 +27,7 @@ docs_path="$ROOT/docs/clients/python.md"
 
 pip3 uninstall -y cortex
 
-cd $ROOT/pkg/cortex/client
+cd $ROOT/python/client
 
 pip3 install -e .
 
@@ -67,4 +67,4 @@ truncate -s -1 $docs_path
 sed -i "s/^## create\\\_api/## create\\\_api\n\n<!-- CORTEX_VERSION_MINOR -->/g" $docs_path
 
 pip3 uninstall -y cortex
-rm -rf $ROOT/pkg/cortex/client/cortex.egg-info
+rm -rf $ROOT/python/client/cortex.egg-info

dev/python_version_test.sh

@@ -35,7 +35,7 @@ pip install requests
 export CORTEX_CLI_PATH=$ROOT/bin/cortex
 
 # install cortex
-cd $ROOT/pkg/cortex/client
+cd $ROOT/python/client
 pip install -e .
 
 # run script.py
@@ -44,4 +44,4 @@ python $ROOT/dev/deploy_test.py $2
 # clean up conda
 conda deactivate
 conda env remove -n env
-rm -rf $ROOT/pkg/cortex/client/cortex.egg-info
+rm -rf $ROOT/python/client/cortex.egg-info

dev/versions.md

@@ -197,7 +197,7 @@ Note: it's ok if example training notebooks aren't upgraded, as long as the expo
 
 ## Python packages
 
-1. Update versions in `pkg/cortex/serve/*requirements.txt`
+1. Update versions in `python/serve/*requirements.txt`
 
 ## S6-overlay supervisor
 

docs/workloads/async/models.md

@@ -44,7 +44,7 @@ class Handler:
 <!-- CORTEX_VERSION_MINOR -->
 
 Cortex provides a `tensorflow_client` to your handler's constructor. `tensorflow_client` is an instance
-of [TensorFlowClient](https://github.com/cortexlabs/cortex/tree/master/pkg/cortex/serve/cortex_internal/lib/client/tensorflow.py)
+of [TensorFlowClient](https://github.com/cortexlabs/cortex/tree/master/python/serve/cortex_internal/lib/client/tensorflow.py)
 that manages a connection to a TensorFlow Serving container to make predictions using your model. It should be saved as
 an instance variable in your handler class, and your `handle_async()` function should call `tensorflow_client.predict()` to make
 an inference with your exported TensorFlow model. Preprocessing of the JSON payload and postprocessing of predictions

docs/workloads/batch/models.md

@@ -55,7 +55,7 @@ class Handler:
 ```
 
 <!-- CORTEX_VERSION_MINOR -->
-Cortex provides a `tensorflow_client` to your Handler class' constructor. `tensorflow_client` is an instance of [TensorFlowClient](https://github.com/cortexlabs/cortex/tree/master/pkg/cortex/serve/cortex_internal/lib/client/tensorflow.py) that manages a connection to a TensorFlow Serving container to make predictions using your model. It should be saved as an instance variable in your Handler class, and your `handle_batch()` function should call `tensorflow_client.predict()` to make an inference with your exported TensorFlow model. Preprocessing of the JSON payload and postprocessing of predictions can be implemented in your `handle_batch()` function as well.
+Cortex provides a `tensorflow_client` to your Handler class' constructor. `tensorflow_client` is an instance of [TensorFlowClient](https://github.com/cortexlabs/cortex/tree/master/python/serve/cortex_internal/lib/client/tensorflow.py) that manages a connection to a TensorFlow Serving container to make predictions using your model. It should be saved as an instance variable in your Handler class, and your `handle_batch()` function should call `tensorflow_client.predict()` to make an inference with your exported TensorFlow model. Preprocessing of the JSON payload and postprocessing of predictions can be implemented in your `handle_batch()` function as well.
 
 When multiple models are defined using the Handler's `models` field, the `tensorflow_client.predict()` method expects a second argument `model_name` which must hold the name of the model that you want to use for inference (for example: `self.client.predict(payload, "text-generator")`). There is also an optional third argument to specify the model version.
 

docs/workloads/realtime/models.md

@@ -95,7 +95,7 @@ class Handler:
 ```
 
 <!-- CORTEX_VERSION_MINOR -->
-When explicit model paths are specified in the Python handler's API configuration, Cortex provides a `model_client` to your Handler's constructor. `model_client` is an instance of [ModelClient](https://github.com/cortexlabs/cortex/tree/master/pkg/cortex/serve/cortex_internal/lib/client/python.py) that is used to load model(s) (it calls the `load_model()` method of your handler, which must be defined when using explicit model paths). It should be saved as an instance variable in your handler class, and your handler method should call `model_client.get_model()` to load your model for inference. Preprocessing of the JSON/gRPC payload and postprocessing of predictions can be implemented in your handler method as well.
+When explicit model paths are specified in the Python handler's API configuration, Cortex provides a `model_client` to your Handler's constructor. `model_client` is an instance of [ModelClient](https://github.com/cortexlabs/cortex/tree/master/python/serve/cortex_internal/lib/client/python.py) that is used to load model(s) (it calls the `load_model()` method of your handler, which must be defined when using explicit model paths). It should be saved as an instance variable in your handler class, and your handler method should call `model_client.get_model()` to load your model for inference. Preprocessing of the JSON/gRPC payload and postprocessing of predictions can be implemented in your handler method as well.
 
 When multiple models are defined using the Handler's `multi_model_reloading` field, the `model_client.get_model()` method expects an argument `model_name` which must hold the name of the model that you want to load (for example: `self.client.get_model("text-generator")`). There is also an optional second argument to specify the model version.
 
@@ -284,7 +284,7 @@ class Handler:
 ```
 
 <!-- CORTEX_VERSION_MINOR -->
-Cortex provides a `tensorflow_client` to your Handler's constructor. `tensorflow_client` is an instance of [TensorFlowClient](https://github.com/cortexlabs/cortex/tree/master/pkg/cortex/serve/cortex_internal/lib/client/tensorflow.py) that manages a connection to a TensorFlow Serving container to make predictions using your model. It should be saved as an instance variable in your Handler class, and your handler method should call `tensorflow_client.predict()` to make an inference with your exported TensorFlow model. Preprocessing of the JSON payload and postprocessing of predictions can be implemented in your handler method as well.
+Cortex provides a `tensorflow_client` to your Handler's constructor. `tensorflow_client` is an instance of [TensorFlowClient](https://github.com/cortexlabs/cortex/tree/master/python/serve/cortex_internal/lib/client/tensorflow.py) that manages a connection to a TensorFlow Serving container to make predictions using your model. It should be saved as an instance variable in your Handler class, and your handler method should call `tensorflow_client.predict()` to make an inference with your exported TensorFlow model. Preprocessing of the JSON payload and postprocessing of predictions can be implemented in your handler method as well.
 
 When multiple models are defined using the Handler's `models` field, the `tensorflow_client.predict()` method expects a second argument `model_name` which must hold the name of the model that you want to use for inference (for example: `self.client.predict(payload, "text-generator")`). There is also an optional third argument to specify the model version.
 

images/downloader/Dockerfile

@@ -10,14 +10,14 @@ RUN apt-get update -qq && apt-get install -y -q \
     pip install --upgrade pip && \
     rm -rf /root/.cache/pip*
 
-COPY pkg/cortex/serve/cortex_internal.requirements.txt /src/cortex/serve/cortex_internal.requirements.txt
+COPY python/serve/cortex_internal.requirements.txt /src/cortex/serve/cortex_internal.requirements.txt
 
 RUN pip install --no-cache-dir \
     -r /src/cortex/serve/cortex_internal.requirements.txt && \
     rm -rf /root/.cache/pip*
 
-COPY pkg/cortex/downloader /src/cortex/downloader
-COPY pkg/cortex/serve/ /src/cortex/serve
+COPY python/downloader /src/cortex/downloader
+COPY python/serve/ /src/cortex/serve
 ENV CORTEX_LOG_CONFIG_FILE /src/cortex/serve/log_config.yaml
 
 RUN pip install --no-deps /src/cortex/serve/ && \

images/python-handler-cpu/Dockerfile

@@ -43,17 +43,17 @@ RUN /opt/conda/bin/conda create -n env -c conda-forge python=$PYTHONVERSION pip=
 ENV BASH_ENV=~/.env
 SHELL ["/bin/bash", "-c"]
 
-COPY pkg/cortex/serve/serve.requirements.txt /src/cortex/serve/serve.requirements.txt
-COPY pkg/cortex/serve/cortex_internal.requirements.txt /src/cortex/serve/cortex_internal.requirements.txt
+COPY python/serve/serve.requirements.txt /src/cortex/serve/serve.requirements.txt
+COPY python/serve/cortex_internal.requirements.txt /src/cortex/serve/cortex_internal.requirements.txt
 RUN pip install --no-cache-dir \
     -r /src/cortex/serve/serve.requirements.txt \
     -r /src/cortex/serve/cortex_internal.requirements.txt
 
-COPY pkg/cortex/serve/init/install-core-dependencies.sh /usr/local/cortex/install-core-dependencies.sh
+COPY python/serve/init/install-core-dependencies.sh /usr/local/cortex/install-core-dependencies.sh
 RUN chmod +x /usr/local/cortex/install-core-dependencies.sh
 
-COPY pkg/cortex/serve/ /src/cortex/serve
-COPY pkg/cortex/client/ /src/cortex/client
+COPY python/serve/ /src/cortex/serve
+COPY python/client/ /src/cortex/client
 ENV CORTEX_LOG_CONFIG_FILE /src/cortex/serve/log_config.yaml
 
 RUN pip install --no-deps /src/cortex/serve/ && \

images/python-handler-gpu/Dockerfile

@@ -45,17 +45,17 @@ RUN /opt/conda/bin/conda create -n env -c conda-forge python=$PYTHONVERSION pip=
 ENV BASH_ENV=~/.env
 SHELL ["/bin/bash", "-c"]
 
-COPY pkg/cortex/serve/serve.requirements.txt /src/cortex/serve/serve.requirements.txt
-COPY pkg/cortex/serve/cortex_internal.requirements.txt /src/cortex/serve/cortex_internal.requirements.txt
+COPY python/serve/serve.requirements.txt /src/cortex/serve/serve.requirements.txt
+COPY python/serve/cortex_internal.requirements.txt /src/cortex/serve/cortex_internal.requirements.txt
 RUN pip install --no-cache-dir \
     -r /src/cortex/serve/serve.requirements.txt \
     -r /src/cortex/serve/cortex_internal.requirements.txt
 
-COPY pkg/cortex/serve/init/install-core-dependencies.sh /usr/local/cortex/install-core-dependencies.sh
+COPY python/serve/init/install-core-dependencies.sh /usr/local/cortex/install-core-dependencies.sh
 RUN chmod +x /usr/local/cortex/install-core-dependencies.sh
 
-COPY pkg/cortex/serve/ /src/cortex/serve
-COPY pkg/cortex/client/ /src/cortex/client
+COPY python/serve/ /src/cortex/serve
+COPY python/client/ /src/cortex/client
 ENV CORTEX_LOG_CONFIG_FILE /src/cortex/serve/log_config.yaml
 
 RUN pip install --no-deps /src/cortex/serve/ && \