mirror of
https://github.com/clearml/clearml-serving
synced 2025-06-26 18:16:00 +00:00
ClearML-Serving v2 initial working commit
This commit is contained in:
356
README.md
356
README.md
@@ -3,9 +3,9 @@
|
||||
|
||||
<a href="https://app.community.clear.ml"><img src="https://github.com/allegroai/clearml/blob/master/docs/clearml-logo.svg?raw=true" width="250px"></a>
|
||||
|
||||
**ClearML Serving - ML-Ops made easy**
|
||||
**ClearML Serving - Model deployment made easy**
|
||||
|
||||
## **`clearml-serving` </br> Model-Serving Orchestration and Repository Solution**
|
||||
## **`clearml-serving` </br> Model Serving (ML/DL), Orchestration and Repository Made Easy**
|
||||
|
||||
|
||||
[](https://img.shields.io/github/license/allegroai/clearml-serving.svg)
|
||||
@@ -17,128 +17,276 @@
|
||||
|
||||
</div>
|
||||
|
||||
<a href="https://app.community.clear.ml"><img src="https://github.com/allegroai/clearml-serving/blob/main/docs/webapp_screenshots.gif?raw=true" width="100%"></a>
|
||||
|
||||
|
||||
**`clearml-serving`** is a command line utility for the flexible orchestration of your model deployment.
|
||||
**`clearml-serving`** can make use of a variety of serving engines (**Nvidia Triton, OpenVino Model Serving, KFServing**)
|
||||
setting them up for serving wherever you designate a ClearML Agent or on your ClearML Kubernetes cluster
|
||||
**`clearml-serving`** is a command line utility for model deployment and orchestration.
|
||||
It enables model deployment including serving and preprocessing code to a Kubernetes cluster or custom container based solution.
|
||||
|
||||
Features:
|
||||
* Spin serving engines on your Kubernetes cluster or ClearML Agent machine from CLI
|
||||
* Full usage & performance metrics integrated with ClearML UI
|
||||
* Multi-model support in a single serving engine container
|
||||
* Automatically deploy new model versions
|
||||
* Support Canary model releases
|
||||
* Integrates to ClearML Model Repository
|
||||
* Deploy & upgrade endpoints directly from ClearML UI
|
||||
* Programmatic interface for endpoint/versions/metric control
|
||||
* Easy to deploy & configure
|
||||
* Support Machine Learning Models (Scikit Learn, XGBoost, LightGBM)
|
||||
* Support Deep Learning Models (Tensorflow, PyTorch, ONNX)
|
||||
* Customizable RestAPI for serving (i.e. allow per model pre/post-processing for easy integration)
|
||||
* Flexibility
|
||||
* On-line model deployment
|
||||
* On-line endpoint model/version deployment (i.e. no need to take the service down)
|
||||
* Per model standalone preprocessing and postprocessing python code
|
||||
* Scalability
|
||||
* Multi model per container
|
||||
* Multi models per serving service
|
||||
* Multi-service support (fully seperated multiple serving service running independently)
|
||||
* Multi cluster support
|
||||
* Out-of-the-box node auto-scaling based on load/usage
|
||||
* Efficiency
|
||||
* multi-container resource utilization
|
||||
* Support for CPU & GPU nodes
|
||||
* Auto-batching for DL models
|
||||
* Automatic deployment
|
||||
* Automatic model upgrades w/ canary support
|
||||
* Programmable API for model deployment
|
||||
* Canary A/B deployment
|
||||
* Online Canary updates
|
||||
* Model Monitoring
|
||||
* Usage Metric reporting
|
||||
* Metric Dashboard
|
||||
* Model performance metric
|
||||
* Model performance Dashboard
|
||||
|
||||
## ClearML Serving Design
|
||||
|
||||
### ClearML Serving Design Principles
|
||||
|
||||
* Modular
|
||||
* Scalable
|
||||
* Flexible
|
||||
* Customizable
|
||||
* Open Source
|
||||
|
||||
<a href="https://excalidraw.com/#json=v0ip945hun2SnO4HVLe0h,QKHfB04TFQLds3_4aqeBjQ"><img src="https://github.com/allegroai/clearml-serving/blob/main/docs/design_diagram.png?raw=true" width="100%"></a>
|
||||
|
||||
## Installation
|
||||
|
||||
### Concepts
|
||||
|
||||
CLI - Secure configuration interface for on-line model upgrade/deployment on running Serving Services
|
||||
Serving Service Task - Control plane object storing configuration on all the endpoints. Support multiple separated instance, deployed on multiple clusters.
|
||||
Inference Services - Inference containers, performing model serving pre/post processing. Also support CPU model inferencing.
|
||||
Serving Engine Services - Inference engine containers (e.g. Nvidia Triton, TorchServe etc.) used by the Inference Services for heavier model inference.
|
||||
Statistics Service - Single instance per Serving Service collecting and broadcasting model serving & performance statistics
|
||||
Time-series DB - Statistics collection service used by the Statistics Service, e.g. Prometheus
|
||||
Dashboard Service - Customizable dashboard-ing solution on top of the collected statistics, e.g. Grafana
|
||||
|
||||
### prerequisites
|
||||
|
||||
* ClearML-Server : Model repository, Service Health, Control plane
|
||||
* Kubernetes / Single-instance VM : Deploying containers
|
||||
* CLI : Configuration & model deployment interface
|
||||
|
||||
|
||||
## Installing ClearML Serving
|
||||
### Initial Setup
|
||||
|
||||
1. Setup your [**ClearML Server**](https://github.com/allegroai/clearml-server) or use the [Free tier Hosting](https://app.community.clear.ml)
|
||||
2. Connect your ClearML Worker(s) to your **ClearML Server** (see [**ClearML Agent**](https://github.com/allegroai/clearml-agent) / [Kubernetes integration](https://github.com/allegroai/clearml-agent#kubernetes-integration-optional))
|
||||
3. Install `clearml-serving` (Note: `clearml-serving` is merely a control utility, it does not require any resources for actual serving)
|
||||
2. Install the CLI on your laptop `clearml` and `clearml-serving`
|
||||
- `pip3 install https://github.com/allegroai/clearml-serving.git@dev`
|
||||
- Make sure to configure your machine to connect to your `clearml-server` see [clearml-init](https://clear.ml/docs/latest/docs/getting_started/ds/ds_first_steps#install-clearml) for details
|
||||
3. Create the Serving Service Controller
|
||||
- `clearml-serving create --name "serving example"`
|
||||
- The new serving service UID should be printed `"New Serving Service created: id=aa11bb22aa11bb22`
|
||||
4. Write down the Serving Service UID
|
||||
|
||||
### Toy model (scikit learn) deployment example
|
||||
|
||||
1. Train toy scikit-learn model
|
||||
- create new python virtual environment
|
||||
- `pip3 install -r examples/sklearn/requirements.txt`
|
||||
- `python3 examples/sklearn/train_model.py`
|
||||
- Model was automatically registered and uploaded into the model repository. For Manual model registration see [here](#registering--deploying-new-models-manually)
|
||||
2. Register the new Model on the Serving Service
|
||||
- `clearml-serving --id <service_id> model add --engine sklearn --endpoint "test_model_sklearn" --preprocess "examples/sklearn/preprocess.py" --name "train sklearn model" --project "serving examples"`
|
||||
- **Notice** the preprocessing python code is packaged and uploaded to the "Serving Service", to be used by any inference container, and downloaded in realtime when updated
|
||||
3. Spin the Inference Container
|
||||
- Customize container [Dockerfile](clearml_serving/serving/Dockerfile) if needed
|
||||
- Build container `docker build --tag clearml-serving-inference:latest -f clearml_serving/serving/Dockerfile .`
|
||||
- Spin the inference container: `docker run -v ~/clearml.conf:/root/clearml.conf -p 8080:8080 -e CLEARML_SERVING_TASK_ID=<service_id> -e CLEARML_SERVING_POLL_FREQ=5 clearml-serving-inference:latest`
|
||||
4. Test new model inference endpoint
|
||||
- `curl -X POST "http://127.0.0.1:8080/serve/test_model_sklearn" -H "accept: application/json" -H "Content-Type: application/json" -d '{"x0": 1, "x1": 2}'`
|
||||
|
||||
**Notice**, now that we have an inference container running, we can add new model inference endpoints directly with the CLI. The inference container will automatically sync once every 5 minutes.
|
||||
|
||||
**Notice** On the first few requests the inference container needs to download the model file and preprocessing python code, this means the request might take a little longer, once everything is cached, it will return almost immediately.
|
||||
|
||||
**Notes:**
|
||||
> To review the model repository in the ClearML web UI, under the "serving examples" Project on your ClearML account/server ([free hosted](https://app.clear.ml) or [self-deployed](https://github.com/allegroai/clearml-server)).
|
||||
|
||||
> Inference services status, console outputs and machine metrics are available in the ClearML UI in the Serving Service project (default: "DevOps" project)
|
||||
|
||||
> To learn more on training models and the ClearML model repository, see the [ClearML documentation](https://clear.ml/docs)
|
||||
|
||||
|
||||
### Nvidia Triton serving engine setup
|
||||
|
||||
Nvidia Triton Serving Engine is used by clearml-serving to do the heavy lifting of deep-learning models on both GPU & CPU nodes.
|
||||
Inside the Triton container a clearml controller is spinning and monitoring the Triton server.
|
||||
All the triton models are automatically downloaded into the triton container in real-time, configured, and served.
|
||||
A single Triton serving container is serving multiple models, based on the registered models on the Serving Service
|
||||
Communication from the Inference container to the Triton container is done transparently over compressed gRPC channel.
|
||||
|
||||
#### setup
|
||||
|
||||
Optional: build the Triton container
|
||||
- Customize container [Dockerfile](clearml_serving/engines/triton/Dockerfile)
|
||||
- Build container `docker build --tag clearml-serving-triton:latest -f clearml_serving/engines/triton/Dockerfile .`
|
||||
|
||||
Spin the triton engine container: `docker run -v ~/clearml.conf:/root/clearml.conf -p 8001:8001 -e CLEARML_SERVING_TASK_ID=<service_id> -e CLEARML_TRITON_POLL_FREQ=5 -e CLEARML_TRITON_METRIC_FREQ=1 clearml-serving-triton:latest`
|
||||
|
||||
Configure the "Serving Service" with the new Triton Engine gRPC IP:Port. Notice that when deploying on a Kubernetes cluster this should be a TCP ingest endpoint, to allow for transparent auto-scaling of the Triton Engine Containers
|
||||
|
||||
`clearml-serving --id <service_id> config --triton-grpc-server <local_ip_here>:8001`
|
||||
|
||||
Spin the inference service (this is the external RestAPI interface)
|
||||
`docker run -v ~/clearml.conf:/root/clearml.conf -p 8080:8080 -e CLEARML_SERVING_TASK_ID=<service_id> -e CLEARML_SERVING_POLL_FREQ=5 clearml-serving-inference:latest`
|
||||
|
||||
Now eny model that will register with "Triton" engine, will run the pre/post processing code on the Inference service container, and the model inference itself will be executed on the Triton Engine container.
|
||||
See Tensorflow [example](examples/keras/readme.md) and Pytorch [example](examples/pytorch/readme.md) for further details.
|
||||
|
||||
|
||||
### Container Configuration Variables
|
||||
|
||||
When spinning the Inference container or the Triton Engine container,
|
||||
we need to specify the `clearml-server` address and access credentials
|
||||
One way of achieving that is by mounting the `clearml.conf` file into the container's HOME folder (i.e. `-v ~/clearml.conf:/root/clearml.conf`)
|
||||
We can also pass environment variables instead (see [details](https://clear.ml/docs/latest/docs/configs/env_vars#server-connection):
|
||||
```bash
|
||||
pip install clearml-serving
|
||||
CLEARML_API_HOST="https://api.clear.ml"
|
||||
CLEARML_WEB_HOST="https://app.clear.ml"
|
||||
CLEARML_FILES_HOST="https://files.clear.ml"
|
||||
CLEARML_API_ACCESS_KEY="access_key_here"
|
||||
CLEARML_API_SECRET_KEY="secret_key_here"
|
||||
```
|
||||
|
||||
## Using ClearML Serving
|
||||
To access models stored on an S3 buckets, Google Storage or Azure blob storage (notice that with GS you also need to make sure the access json is available inside the containers). See further details on configuring the storage access [here](https://clear.ml/docs/latest/docs/integrations/storage#configuring-storage)
|
||||
|
||||
Clearml-Serving will automatically serve *published* models from your ClearML model repository, so the first step is getting a model into your ClearML model repository.
|
||||
Background: When using `clearml` in your training code, any model stored by your python code is automatically registered (and, optionally, uploaded) to the model repository. This auto-magic logging is key for continuous model deployment.
|
||||
To learn more on training models and the ClearML model repository, see the [ClearML documentation](https://clear.ml/docs/latest/docs/)
|
||||
|
||||
### Training a toy model with Keras (about 2 minutes on a laptop)
|
||||
|
||||
The main goal of `clearml-serving` is to seamlessly integrate with the development process and the model repository.
|
||||
This is achieved by combining ClearML's auto-magic logging which creates and uploads models directly from
|
||||
the python training code, with accessing these models as they are automatically added into the model repository using the ClearML Server's REST API and its pythonic interface.
|
||||
Let's demonstrate this seamless integration by training a toy Keras model to classify images based on the MNIST dataset.
|
||||
Once we have a trained model in the model repository we will serve it using `clearml-serving`.
|
||||
|
||||
We'll also see how we can retrain another version of the model, and have the model serving engine automatically upgrade to the new model version.
|
||||
|
||||
#### Keras mnist toy train example (single epoch mock training):
|
||||
|
||||
1. install `tensorflow` (and of course `cleamrl`)
|
||||
```bash
|
||||
pip install "tensorflow>2" clearml
|
||||
```
|
||||
|
||||
2. Execute the training code
|
||||
```bash
|
||||
cd examples/keras
|
||||
python keras_mnist.py
|
||||
```
|
||||
**Notice:** The only required integration code with `clearml` are the following two lines:
|
||||
```python
|
||||
from clearml import Task
|
||||
task = Task.init(project_name="examples", task_name="Keras MNIST serve example", output_uri=True)
|
||||
```
|
||||
This call will make sure all outputs are automatically logged to the ClearML Server, this includes: console, Tensorboard, cmdline arguments, git repo etc.
|
||||
It also means any model stored by the code will be automatically uploaded and logged in the ClearML model repository.
|
||||
|
||||
|
||||
3. Review the models in the ClearML web UI:
|
||||
Go to the "Projects" section of your ClearML server ([free hosted](https://app.community.clear.ml) or [self-deployed](https://github.com/allegroai/clearml-server)).
|
||||
in the "examples" project, go to the Models tab (model repository).
|
||||
We should have a model named "Keras MNIST serve example - serving_model".
|
||||
Once a model-serving service is available, Right-clicking on the model and selecting "Publish" will trigger upgrading the model on the serving engine container.
|
||||
|
||||
Next we will spin the Serving Service and the serving-engine
|
||||
|
||||
### Serving your models
|
||||
|
||||
In order to serve your models, `clearml-serving` will spawn a serving service which stores multiple endpoints and their configuration,
|
||||
collects metric reports, and updates models when new versions are published in the model repository.
|
||||
In addition, a serving engine is launched, which is the container actually running the inference engine.
|
||||
(Currently supported engines are Nvidia-Triton, coming soon are Intel OpenVIno serving-engine and KFServing)
|
||||
|
||||
Now that we have a published model in the ClearML model repository, we can spin a serving service and a serving engine.
|
||||
|
||||
Starting a Serving Service:
|
||||
|
||||
1. Create a new serving instance.
|
||||
This is the control plane Task, we will see all its configuration logs and metrics in the "serving" project. We can have multiple serving services running in the same system.
|
||||
In this example we will make use of Nvidia-Triton engines.
|
||||
```bash
|
||||
clearml-serving triton --project "serving" --name "serving example"
|
||||
```
|
||||
2. Add models to the serving engine with specific endpoints.
|
||||
Reminder: to view your model repository, login to your ClearML account,
|
||||
go to "examples" project and review the "Models" Tab
|
||||
```bash
|
||||
clearml-serving triton --endpoint "keras_mnist" --model-project "examples" --model-name "Keras MNIST serve example - serving_model"
|
||||
AWS_ACCESS_KEY_ID
|
||||
AWS_SECRET_ACCESS_KEY
|
||||
AWS_DEFAULT_REGION
|
||||
|
||||
GOOGLE_APPLICATION_CREDENTIALS
|
||||
|
||||
AZURE_STORAGE_ACCOUNT
|
||||
AZURE_STORAGE_KEY
|
||||
```
|
||||
|
||||
3. Launch the serving service.
|
||||
The service will be launched on your "services" queue, which by default runs services on the ClearML server machine.
|
||||
(Read more on services queue [here](https://clear.ml/docs/latest/docs/clearml_agent#services-mode))
|
||||
We set our serving-engine to launch on the "default" queue,
|
||||
### Registering & Deploying new models manually
|
||||
|
||||
Uploading an existing model file into the model repository can be done via the `clearml` RestAPI, the python interface, or with the `clearml-serving` CLI
|
||||
|
||||
> To learn more on training models and the ClearML model repository, see the [ClearML documentation](https://clear.ml/docs)
|
||||
|
||||
- local model file on our laptop: 'examples/sklearn/sklearn-model.pkl'
|
||||
- Upload the model file to the `clearml-server` file storage and register it
|
||||
`clearml-serving --id <service_id> model upload --name "manual sklearn model" --project "serving examples" --framework "scikit-learn" --path examples/sklearn/sklearn-model.pkl`
|
||||
- We now have a new Model in the "serving examples" project, by the name of "manual sklearn model". The CLI output prints the UID of the newly created model, we will use it to register a new endpoint
|
||||
- In the `clearml` web UI we can see the new model listed under the `Models` tab in the associated project. we can also download the model file itself directly from the web UI
|
||||
- Register a new endpoint with the new model
|
||||
`clearml-serving --id <service_id> model add --engine sklearn --endpoint "test_model_sklearn" --preprocess "examples/sklearn/preprocess.py" --model-id <newly_created_model_id_here>`
|
||||
|
||||
**Notice** we can also provide a differnt storage destination for the model, such as S3/GS/Azure, by passing
|
||||
`--destination="s3://bucket/folder"`, `gs://bucket/folder`, `azure://bucket/folder`. Yhere is no need to provide a unique path tp the destination argument, the location of the model will be a unique path based on the serving service ID and the model name
|
||||
|
||||
|
||||
### Automatic model deployment
|
||||
|
||||
The clearml Serving Service support automatic model deployment and upgrades, directly connected with the model repository and API. When the model auto-deploy is configured, a new model versions will be automatically deployed when you "publish" or "tag" a new model in the `clearml` model repository. This automation interface allows for simpler CI/CD model deployment process, as a single API automatically deploy (or remove) a model from the Serving Service.
|
||||
|
||||
#### automatic model deployment example
|
||||
|
||||
1. Configure the model auto-update on the Serving Service
|
||||
- `clearml-serving --id <service_id> model auto-update --engine sklearn --endpoint "test_model_sklearn_auto" --preprocess "preprocess.py" --name "train sklearn model" --project "serving examples" --max-versions 2`
|
||||
2. Deploy the Inference container (if not already deployed)
|
||||
3. Publish a new model the model repository
|
||||
- Go to the "serving examples" project in the ClearML web UI, click on the Models Tab, search for "train sklearn model" right click and select "Publish"
|
||||
- Use the RestAPI [details](https://clear.ml/docs/latest/docs/references/api/models#post-modelspublish_many)
|
||||
- Use Python interface:
|
||||
```python
|
||||
from clearml import Model
|
||||
Model(model_id="unique_model_id_here").publish()
|
||||
```
|
||||
4. The new model is available on a new endpoint version (1), test with:
|
||||
`curl -X POST "http://127.0.0.1:8080/serve/test_model_sklearn_auto/1" -H "accept: application/json" -H "Content-Type: application/json" -d '{"x0": 1, "x1": 2}'
|
||||
|
||||
### Canary endpoint setup
|
||||
|
||||
Canary endpoint deployment add a new endpoint where the actual request is sent to a preconfigured set of endpoints with pre-provided distribution. For example, let's create a new endpoint "test_model_sklearn_canary", we can provide a list of endpoints and probabilities (weights).
|
||||
|
||||
```bash
|
||||
clearml-serving launch --queue default
|
||||
clearml-serving --id <service_id> model canary --endpoint "test_model_sklearn_canary" --weights 0.1 0.9 --input-endpoints test_model_sklearn/2 test_model_sklearn/1
|
||||
```
|
||||
This means that any request coming to `/test_model_sklearn_canary/` will be routed with probability of 90% to
|
||||
`/test_model_sklearn/1/` and with probability of 10% to `/test_model_sklearn/2/`
|
||||
|
||||
**Note:**
|
||||
> As with any other Serving Service configuration, we can configure the Canary endpoint while the Inference containers are already running and deployed, they will get updated in their next update cycle (default: once every 5 minutes)
|
||||
|
||||
We Can also prepare a "fixed" canary endpoint, always splitting the load between the last two deployed models:
|
||||
```bash
|
||||
clearml-serving --id <service_id> model canary --endpoint "test_model_sklearn_canary" --weights 0.1 0.9 --input-endpoints-prefix test_model_sklearn/
|
||||
```
|
||||
|
||||
4. Optional: If you do not have a machine connected to your ClearML cluster, either read more on our Kubernetes integration, or spin a bare-metal worker and connect it with your ClearML Server.
|
||||
`clearml-serving` is leveraging the orchestration capabilities of `ClearML` to launch the serving engine on the cluster.
|
||||
Read more on the [ClearML Agent](https://github.com/allegroai/clearml-agent) orchestration module [here](https://clear.ml/docs/latest/docs/clearml_agent)
|
||||
If you have not yet setup a ClearML worker connected to your `clearml` account, you can do this now using:
|
||||
```bash
|
||||
pip install clearml-agent
|
||||
clearml-agent daemon --docker --queue default --detached
|
||||
```
|
||||
This means that is we have two model inference endpoints: `/test_model_sklearn/1/`, `/test_model_sklearn/2/`
|
||||
the 10% probability (weight 0.1) will match the last (order by version number) endpoint, i.e. `/test_model_sklearn/2/` and the 90% will match `/test_model_sklearn/2/`
|
||||
When we add a new model endpoint version, e.g. `/test_model_sklearn/3/`, the canary distribution will automatically match the 90% probability to `/test_model_sklearn/2/` and the 10% to the new endpoint `/test_model_sklearn/3/`
|
||||
|
||||
Example:
|
||||
1. Add two endpoints:
|
||||
- `clearml-serving --id <service_id> model add --engine sklearn --endpoint "test_model_sklearn" --preprocess "examples/sklearn/preprocess.py" --name "train sklearn model" --version 1 --project "serving examples"`
|
||||
- `clearml-serving --id <service_id> model add --engine sklearn --endpoint "test_model_sklearn" --preprocess "examples/sklearn/preprocess.py" --name "train sklearn model" --version 2 --project "serving examples"`
|
||||
2. Add Canary endpoint:
|
||||
- `clearml-serving --id <service_id> model canary --endpoint "test_model_sklearn_canary" --weights 0.1 0.9 --input-endpoints test_model_sklearn/2 test_model_sklearn/1`
|
||||
3. Test Canary endpoint:
|
||||
- `curl -X POST "http://127.0.0.1:8080/serve/test_model" -H "accept: application/json" -H "Content-Type: application/json" -d '{"x0": 1, "x1": 2}'`
|
||||
|
||||
|
||||
**We are done!**
|
||||
To test the new served model, you can `curl` to the new endpoint:
|
||||
```bash
|
||||
curl <serving-engine-ip>:8000/v2/models/keras_mnist/versions/1
|
||||
```
|
||||
### Model inference Examples
|
||||
|
||||
**Notice**: If we re-run our keras training example and publish a new model in the repository, the engine will automatically update to the new model.
|
||||
- Scikit-Learn [example](examples/sklearn/readme.md) - random data
|
||||
- XGBoost [example](examples/xgboost/readme.md) - iris dataset
|
||||
- LightGBM [example](examples/lightgbm/readme.md) - iris dataset
|
||||
- PyTorch [example](examples/pytorch/readme.md) - mnist dataset
|
||||
- TensorFlow/Keras [example](examples/keras/readme.md) - mnist dataset
|
||||
|
||||
Further reading on advanced topics [here](coming-soon)
|
||||
### Status
|
||||
|
||||
- [x] FastAPI integration for inference service
|
||||
- [x] multi-process Gunicorn for inference service
|
||||
- [x] Dynamic preprocess python code loading (no need for container/process restart)
|
||||
- [x] Model files download/caching (http/s3/gs/azure)
|
||||
- [x] Scikit-learn. XGBoost, LightGBM integration
|
||||
- [x] Custom inference, including dynamic code loading
|
||||
- [x] Manual model upload/registration to model repository (http/s3/gs/azure)
|
||||
- [x] Canary load balancing
|
||||
- [x] Auto model endpoint deployment based on model repository state
|
||||
- [x] Machine/Node health metrics
|
||||
- [x] Dynamic online configuration
|
||||
- [x] CLI configuration tool
|
||||
- [x] Nvidia Triton integration
|
||||
- [x] GZip request compression
|
||||
- [ ] TorchServe engine integration
|
||||
- [ ] Prebuilt Docker containers (dockerhub)
|
||||
- [x] Scikit-Learn example
|
||||
- [x] XGBoost example
|
||||
- [x] LightGBM example
|
||||
- [x] PyTorch example
|
||||
- [x] TensorFlow/Keras example
|
||||
- [ ] Model ensemble example
|
||||
- [ ] Model pipeline example
|
||||
- [ ] Statistics Service
|
||||
- [ ] Kafka install instructions
|
||||
- [ ] Prometheus install instructions
|
||||
- [ ] Grafana install instructions
|
||||
- [ ] Kubernetes Helm Chart
|
||||
|
||||
## Contributing
|
||||
|
||||
**PRs are always welcomed** :heart: See more details in the ClearML [Guidelines for Contributing](https://github.com/allegroai/clearml/blob/master/docs/contributing.md).
|
||||
|
||||
|
||||
|
||||
@@ -1,179 +1,441 @@
|
||||
import json
|
||||
import os
|
||||
from argparse import ArgumentParser, FileType
|
||||
import os.path
|
||||
from argparse import ArgumentParser
|
||||
from pathlib import Path
|
||||
|
||||
from .serving_service import ServingService
|
||||
from clearml_serving.serving.model_request_processor import ModelRequestProcessor, CanaryEP
|
||||
from clearml_serving.serving.preprocess_service import ModelMonitoring, ModelEndpoint
|
||||
|
||||
verbosity = False
|
||||
|
||||
|
||||
def restore_state(args):
|
||||
session_state_file = os.path.expanduser('~/.clearml_serving.json')
|
||||
# noinspection PyBroadException
|
||||
try:
|
||||
with open(session_state_file, 'rt') as f:
|
||||
state = json.load(f)
|
||||
except Exception:
|
||||
state = {}
|
||||
# store command line passed ID
|
||||
args.cmd_id = getattr(args, 'id', None)
|
||||
# restore ID from state
|
||||
args.id = getattr(args, 'id', None) or state.get('id')
|
||||
return args
|
||||
|
||||
|
||||
def store_state(args, clear=False):
|
||||
session_state_file = os.path.expanduser('~/.clearml_serving.json')
|
||||
if clear:
|
||||
state = {}
|
||||
else:
|
||||
state = {str(k): str(v) if v is not None else None
|
||||
for k, v in args.__dict__.items() if not str(k).startswith('_') and k not in ('command', )}
|
||||
# noinspection PyBroadException
|
||||
try:
|
||||
with open(session_state_file, 'wt') as f:
|
||||
json.dump(state, f, sort_keys=True)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
def cmd_triton(args):
|
||||
if not args.id and not args.name:
|
||||
raise ValueError("Serving service must have a name, use --name <service_name>")
|
||||
|
||||
if args.cmd_id or (args.id and not args.name):
|
||||
a_serving = ServingService(task_id=args.cmd_id or args.id)
|
||||
else:
|
||||
a_serving = ServingService(task_project=args.project, task_name=args.name, engine_type='triton')
|
||||
args.id = a_serving.get_id()
|
||||
|
||||
if args.endpoint:
|
||||
print("Nvidia Triton Engine ID: {} - Adding serving endpoint: \n".format(args.id) +
|
||||
("model-project: '{}', model-name: '{}', model-tags: '{}', config-file: '{}'".format(
|
||||
args.model_project or '',
|
||||
args.model_name or '',
|
||||
args.model_tags or '',
|
||||
args.config or '') if not args.model_id else
|
||||
"model-id: '{}', config-file: '{}'".format(args.model_id or '', args.config or '')))
|
||||
|
||||
if not args.endpoint and (args.model_project or args.model_tags or args.model_id or args.model_name):
|
||||
raise ValueError("Serving endpoint must be provided, add --endpoint <endpoint_name>")
|
||||
|
||||
if args.endpoint:
|
||||
a_serving.add_model_serving(
|
||||
serving_url=args.endpoint,
|
||||
model_project=args.model_project,
|
||||
model_name=args.model_name,
|
||||
model_tags=args.model_tags,
|
||||
model_ids=[args.model_id] if args.model_id else None,
|
||||
config_file=args.config,
|
||||
max_versions=args.versions,
|
||||
)
|
||||
|
||||
a_serving.serialize(force=True)
|
||||
store_state(args)
|
||||
|
||||
|
||||
def cmd_launch(args):
|
||||
print('Launching Serving Engine: service: {}, queue: {}'.format(args.id, args.queue))
|
||||
|
||||
def func_model_upload(args):
|
||||
if not args.path and not args.url:
|
||||
raise ValueError("Either --path or --url must be specified")
|
||||
if args.path and args.url:
|
||||
raise ValueError("Either --path or --url but not both")
|
||||
if args.path and not os.path.exists(args.path):
|
||||
raise ValueError("--path='{}' could not be found".format(args.path))
|
||||
if not args.id:
|
||||
raise ValueError("Serving service must specify serving service ID, use --id <service_id>")
|
||||
|
||||
a_serving = ServingService(task_id=args.id)
|
||||
|
||||
if a_serving.get_engine_type() not in ('triton',):
|
||||
raise ValueError("Error, serving engine type \'{}\' is not supported".format(a_serving.get_engine_type()))
|
||||
|
||||
# launch services queue
|
||||
a_serving.launch(queue_name=args.service_queue)
|
||||
# launch engine
|
||||
a_serving.launch_engine(
|
||||
queue_name=args.queue,
|
||||
container=args.engine_container or None,
|
||||
container_args=args.engine_container_args or None,
|
||||
)
|
||||
raise ValueError("Serving Service ID must be provided, use --id <serving_id>")
|
||||
from clearml import Task, OutputModel
|
||||
from clearml.backend_interface.util import get_or_create_project
|
||||
# todo: make it look nice
|
||||
t = Task.get_task(task_id=args.id)
|
||||
print("Creating new Model name='{}' project='{}' tags={}".format(args.name, args.project, args.tags or ""))
|
||||
model = OutputModel(task=t, name=args.name, tags=args.tags or None, framework=args.framework)
|
||||
destination = args.destination or t.get_output_destination() or t.get_logger().get_default_upload_destination()
|
||||
model.set_upload_destination(uri=destination)
|
||||
if args.path:
|
||||
print("Uploading model file \'{}\' to {}".format(args.path, destination))
|
||||
else:
|
||||
print("Registering model file \'{}\'".format(args.url))
|
||||
model.update_weights(weights_filename=args.path, register_uri=args.url, auto_delete_file=False)
|
||||
if args.project:
|
||||
# noinspection PyProtectedMember
|
||||
model._base_model.update(
|
||||
project_id=get_or_create_project(session=t.session, project_name=args.project)
|
||||
)
|
||||
print("Model created and registered, new Model ID={}".format(model.id))
|
||||
if args.publish:
|
||||
model.publish()
|
||||
print("Published Model ID={}".format(model.id))
|
||||
|
||||
|
||||
def cli(verbosity):
|
||||
def func_model_ls(args):
|
||||
request_processor = ModelRequestProcessor(task_id=args.id)
|
||||
print("List model serving and endpoints, control task id={}".format(request_processor.get_id()))
|
||||
request_processor.deserialize(skip_sync=True)
|
||||
print("Endpoints:\n{}".format(json.dumps(request_processor.get_endpoints(), indent=2)))
|
||||
print("Model Monitoring:\n{}".format(json.dumps(request_processor.get_model_monitoring(), indent=2)))
|
||||
print("Canary:\n{}".format(json.dumps(request_processor.get_canary_endpoints(), indent=2)))
|
||||
|
||||
|
||||
def func_create_service(args):
|
||||
request_processor = ModelRequestProcessor(
|
||||
force_create=True, name=args.name, project=args.project, tags=args.tags or None)
|
||||
print("New Serving Service created: id={}".format(request_processor.get_id()))
|
||||
|
||||
|
||||
def func_config_service(args):
|
||||
request_processor = ModelRequestProcessor(task_id=args.id)
|
||||
print("Configure serving service id={}".format(request_processor.get_id()))
|
||||
request_processor.deserialize(skip_sync=True)
|
||||
if args.base_serving_url:
|
||||
print("Configuring serving service [id={}] base_serving_url={}".format(
|
||||
request_processor.get_id(), args.base_serving_url))
|
||||
request_processor.configure(external_serving_base_url=args.base_serving_url)
|
||||
if args.triton_grpc_server:
|
||||
print("Configuring serving service [id={}] triton_grpc_server={}".format(
|
||||
request_processor.get_id(), args.triton_grpc_server))
|
||||
request_processor.configure(external_triton_grpc_server=args.triton_grpc_server)
|
||||
|
||||
|
||||
def func_list_services(_):
|
||||
running_services = ModelRequestProcessor.list_control_plane_tasks()
|
||||
print("Currently running Serving Services:\n")
|
||||
if not running_services:
|
||||
print("No running services found")
|
||||
else:
|
||||
for s in running_services:
|
||||
print(s)
|
||||
|
||||
|
||||
def func_model_remove(args):
|
||||
request_processor = ModelRequestProcessor(task_id=args.id)
|
||||
print("Serving service Task {}, Removing Model endpoint={}".format(request_processor.get_id(), args.endpoint))
|
||||
request_processor.deserialize(skip_sync=True)
|
||||
if request_processor.remove_endpoint(endpoint_url=args.endpoint):
|
||||
print("Removing static endpoint: {}".format(args.endpoint))
|
||||
elif request_processor.remove_model_monitoring(model_base_url=args.endpoint):
|
||||
print("Removing model monitoring endpoint: {}".format(args.endpoint))
|
||||
elif request_processor.remove_canary_endpoint(endpoint_url=args.endpoint):
|
||||
print("Removing model canary endpoint: {}".format(args.endpoint))
|
||||
else:
|
||||
print("Error: Could not find base endpoint URL: {}".format(args.endpoint))
|
||||
return
|
||||
print("Updating serving service")
|
||||
request_processor.serialize()
|
||||
|
||||
|
||||
def func_canary_add(args):
|
||||
request_processor = ModelRequestProcessor(task_id=args.id)
|
||||
print("Serving service Task {}, Adding canary endpoint \'/{}/\'".format(
|
||||
request_processor.get_id(), args.endpoint))
|
||||
request_processor.deserialize(skip_sync=True)
|
||||
if not request_processor.add_canary_endpoint(
|
||||
canary=CanaryEP(
|
||||
endpoint=args.endpoint,
|
||||
weights=args.weights,
|
||||
load_endpoints=args.input_endpoints,
|
||||
load_endpoint_prefix=args.input_endpoint_prefix,
|
||||
)
|
||||
):
|
||||
print("Error: Could not add canary endpoint URL: {}".format(args.endpoint))
|
||||
return
|
||||
|
||||
print("Updating serving service")
|
||||
request_processor.serialize()
|
||||
|
||||
|
||||
def func_model_auto_update_add(args):
|
||||
request_processor = ModelRequestProcessor(task_id=args.id)
|
||||
print("Serving service Task {}, Adding Model monitoring endpoint: \'/{}/\'".format(
|
||||
request_processor.get_id(), args.endpoint))
|
||||
|
||||
if args.aux_config:
|
||||
if len(args.aux_config) == 1 and Path(args.aux_config[0]).exists():
|
||||
aux_config = Path(args.aux_config[0]).read_text()
|
||||
else:
|
||||
from clearml.utilities.pyhocon import ConfigFactory
|
||||
aux_config = ConfigFactory.parse_string('\n'.join(args.aux_config)).as_plain_ordered_dict()
|
||||
else:
|
||||
aux_config = None
|
||||
|
||||
request_processor.deserialize(skip_sync=True)
|
||||
if not request_processor.add_model_monitoring(
|
||||
ModelMonitoring(
|
||||
base_serving_url=args.endpoint,
|
||||
engine_type=args.engine,
|
||||
monitor_project=args.project,
|
||||
monitor_name=args.name,
|
||||
monitor_tags=args.tags or None,
|
||||
only_published=args.published,
|
||||
max_versions=args.max_versions,
|
||||
input_size=args.input_size,
|
||||
input_type=args.input_type,
|
||||
input_name=args.input_name,
|
||||
output_size=args.output_size,
|
||||
output_type=args.output_type,
|
||||
output_name=args.output_name,
|
||||
auxiliary_cfg=aux_config,
|
||||
),
|
||||
preprocess_code=args.preprocess
|
||||
):
|
||||
print("Error: Could not find base endpoint URL: {}".format(args.endpoint))
|
||||
print("Updating serving service")
|
||||
request_processor.serialize()
|
||||
|
||||
|
||||
def func_model_endpoint_add(args):
|
||||
request_processor = ModelRequestProcessor(task_id=args.id)
|
||||
print("Serving service Task {}, Adding Model endpoint \'/{}/\'".format(
|
||||
request_processor.get_id(), args.endpoint))
|
||||
request_processor.deserialize(skip_sync=True)
|
||||
|
||||
if args.aux_config:
|
||||
if len(args.aux_config) == 1 and Path(args.aux_config[0]).exists():
|
||||
aux_config = Path(args.aux_config[0]).read_text()
|
||||
else:
|
||||
from clearml.utilities.pyhocon import ConfigFactory
|
||||
aux_config = ConfigFactory.parse_string('\n'.join(args.aux_config)).as_plain_ordered_dict()
|
||||
else:
|
||||
aux_config = None
|
||||
|
||||
if not request_processor.add_endpoint(
|
||||
ModelEndpoint(
|
||||
engine_type=args.engine,
|
||||
serving_url=args.endpoint,
|
||||
version=args.version,
|
||||
model_id=args.model_id,
|
||||
input_size=args.input_size,
|
||||
input_type=args.input_type,
|
||||
input_name=args.input_name,
|
||||
output_size=args.output_size,
|
||||
output_type=args.output_type,
|
||||
output_name=args.output_name,
|
||||
auxiliary_cfg=aux_config,
|
||||
),
|
||||
preprocess_code=args.preprocess,
|
||||
model_name=args.name,
|
||||
model_project=args.project,
|
||||
model_tags=args.tags or None,
|
||||
model_published=args.published,
|
||||
):
|
||||
print("Error: Could not find base endpoint URL: {}".format(args.endpoint))
|
||||
print("Updating serving service")
|
||||
request_processor.serialize()
|
||||
|
||||
|
||||
def cli():
|
||||
title = 'clearml-serving - CLI for launching ClearML serving engine'
|
||||
print(title)
|
||||
parser = ArgumentParser(prog='clearml-serving', description=title)
|
||||
parser.add_argument('--debug', action='store_true', help='Print debug messages')
|
||||
parser.add_argument(
|
||||
'--id', type=str,
|
||||
help='Control plane Task ID to configure '
|
||||
'(if not provided automatically detect the running control plane Task)')
|
||||
subparsers = parser.add_subparsers(help='Serving engine commands', dest='command')
|
||||
|
||||
# create the launch command
|
||||
parser_launch = subparsers.add_parser('launch', help='Launch a previously configured serving service')
|
||||
parser_launch.add_argument(
|
||||
'--id', default=None, type=str,
|
||||
help='Specify a previously configured service ID, if not provided use the last created service')
|
||||
parser_launch.add_argument(
|
||||
'--queue', default=None, type=str, required=True,
|
||||
help='Specify the clearml queue to be used for the serving engine server')
|
||||
parser_launch.add_argument(
|
||||
'--engine-container', default=None, type=str, required=False,
|
||||
help='Specify the serving engine container to use.')
|
||||
parser_launch.add_argument(
|
||||
'--engine-container-args', default=None, type=str, required=False,
|
||||
help='Specify the serving engine container execution arguments (single string). '
|
||||
'Notice: this will override any default container arguments')
|
||||
parser_launch.add_argument(
|
||||
'--service-queue', default='services', type=str,
|
||||
help='Specify the service queue to be used for the serving service, default: services queue')
|
||||
parser_launch.set_defaults(func=cmd_launch)
|
||||
parser_list = subparsers.add_parser('list', help='List running Serving Service')
|
||||
parser_list.set_defaults(func=func_list_services)
|
||||
|
||||
# create the parser for the "triton" command
|
||||
parser_trt = subparsers.add_parser('triton', help='Nvidia Triton Serving Engine')
|
||||
parser_trt.add_argument(
|
||||
'--id', default=None, type=str,
|
||||
help='Add configuration to running serving session, pass serving Task ID, '
|
||||
'if passed ignore --name / --project')
|
||||
parser_trt.add_argument(
|
||||
'--name', default=None, type=str,
|
||||
help='Give serving service a name, should be a unique name')
|
||||
parser_trt.add_argument(
|
||||
'--project', default='DevOps', type=str,
|
||||
help='Serving service project name, default: DevOps')
|
||||
parser_trt.add_argument(
|
||||
'--endpoint', required=False, type=str,
|
||||
help='Serving endpoint, one per model, unique ')
|
||||
parser_trt.add_argument(
|
||||
'--versions', type=int,
|
||||
help='Serving endpoint, support multiple versions, '
|
||||
'max versions to deploy (version number always increase). Default (no versioning).')
|
||||
parser_trt.add_argument(
|
||||
'--config', required=False, type=FileType('r'),
|
||||
help='Model `config.pbtxt` file, one per model, order matching with models')
|
||||
parser_trt.add_argument(
|
||||
parser_create = subparsers.add_parser('create', help='Create a new Serving Service')
|
||||
parser_create.add_argument(
|
||||
'--name', type=str,
|
||||
help='[Optional] name the new serving service. Default: Serving-Service')
|
||||
parser_create.add_argument(
|
||||
'--tags', type=str, nargs='+',
|
||||
help='[Optional] Specify tags for the new serving service')
|
||||
parser_create.add_argument(
|
||||
'--project', type=str,
|
||||
help='[Optional] Specify project for the serving service. Default: DevOps')
|
||||
parser_create.set_defaults(func=func_create_service)
|
||||
|
||||
parser_config = subparsers.add_parser('config', help='Configure a new Serving Service')
|
||||
parser_config.add_argument(
|
||||
'--base-serving-url', type=str,
|
||||
help='External base serving service url. example: http://127.0.0.1:8080/serve')
|
||||
parser_config.add_argument(
|
||||
'--triton-grpc-server', type=str,
|
||||
help='External ClearML-Triton serving container gRPC address. example: 127.0.0.1:9001')
|
||||
parser_config.set_defaults(func=func_config_service)
|
||||
|
||||
parser_model = subparsers.add_parser('model', help='Configure Model endpoints for an already running Service')
|
||||
parser_model.set_defaults(func=parser_model.print_help)
|
||||
|
||||
model_cmd = parser_model.add_subparsers(help='model command help')
|
||||
|
||||
parser_model_ls = model_cmd.add_parser('list', help='List current models')
|
||||
parser_model_ls.set_defaults(func=func_model_ls)
|
||||
|
||||
parser_model_rm = model_cmd.add_parser('remove', help='Remove model by it`s endpoint name')
|
||||
parser_model_rm.add_argument(
|
||||
'--endpoint', type=str, help='model endpoint name')
|
||||
parser_model_rm.set_defaults(func=func_model_remove)
|
||||
|
||||
parser_model_upload = model_cmd.add_parser('upload', help='Upload and register model files/folder')
|
||||
parser_model_upload.add_argument(
|
||||
'--name', type=str, required=True,
|
||||
help='Specifying the model name to be registered in')
|
||||
parser_model_upload.add_argument(
|
||||
'--tags', type=str, nargs='+',
|
||||
help='Optional: Add tags to the newly created model')
|
||||
parser_model_upload.add_argument(
|
||||
'--project', type=str, required=True,
|
||||
help='Specifying the project for the model tp be registered in')
|
||||
parser_model_upload.add_argument(
|
||||
'--framework', type=str, choices=("scikit-learn", "xgboost", "lightgbm", "tensorflow", "pytorch"),
|
||||
help='[Optional] Specify the model framework: "scikit-learn", "xgboost", "lightgbm", "tensorflow", "pytorch"')
|
||||
parser_model_upload.add_argument(
|
||||
'--publish', action='store_true',
|
||||
help='[Optional] Publish the newly created model '
|
||||
'(change model state to "published" i.e. locked and ready to deploy')
|
||||
parser_model_upload.add_argument(
|
||||
'--path', type=str,
|
||||
help='Specifying a model file/folder to be uploaded and registered/')
|
||||
parser_model_upload.add_argument(
|
||||
'--url', type=str,
|
||||
help='Optional, Specifying an already uploaded model url '
|
||||
'(e.g. s3://bucket/model.bin, gs://bucket/model.bin, azure://bucket/model.bin, '
|
||||
'https://domain/model.bin)')
|
||||
parser_model_upload.add_argument(
|
||||
'--destination', type=str,
|
||||
help='Optional, Specifying the target destination for the model to be uploaded'
|
||||
'(e.g. s3://bucket/folder/, gs://bucket/folder/, azure://bucket/folder/)')
|
||||
parser_model_upload.set_defaults(func=func_model_upload)
|
||||
|
||||
parser_model_lb = model_cmd.add_parser('canary', help='Add model Canary/A/B endpoint')
|
||||
parser_model_lb.add_argument(
|
||||
'--endpoint', type=str, help='model canary serving endpoint name (e.g. my_model/latest)')
|
||||
parser_model_lb.add_argument(
|
||||
'--weights', type=float, nargs='+', help='model canary weights (order matching model ep), (e.g. 0.2 0.8)')
|
||||
parser_model_lb.add_argument(
|
||||
'--input-endpoints', type=str, nargs='+',
|
||||
help='Model endpoint prefixes, can also include version (e.g. my_model, my_model/v1)')
|
||||
parser_model_lb.add_argument(
|
||||
'--input-endpoint-prefix', type=str,
|
||||
help='Model endpoint prefix, lexicographic order or by version <int> (e.g. my_model/1, my_model/v1) '
|
||||
'where the first weight matches the last version.')
|
||||
parser_model_lb.set_defaults(func=func_canary_add)
|
||||
|
||||
parser_model_monitor = model_cmd.add_parser('auto-update', help='Add/Modify model auto update service')
|
||||
parser_model_monitor.add_argument(
|
||||
'--endpoint', type=str,
|
||||
help='Base Model endpoint (must be unique)')
|
||||
parser_model_monitor.add_argument(
|
||||
'--engine', type=str, required=True,
|
||||
help='Model endpoint serving engine (triton, sklearn, xgboost, lightgbm)')
|
||||
parser_model_monitor.add_argument(
|
||||
'--max-versions', type=int, default=1,
|
||||
help='max versions to store (and create endpoints) for the model. highest number is the latest version')
|
||||
parser_model_monitor.add_argument(
|
||||
'--name', type=str,
|
||||
help='Specify Model Name to be selected and auto updated '
|
||||
'(notice regexp selection use \"$name^\" for exact match)')
|
||||
parser_model_monitor.add_argument(
|
||||
'--tags', type=str, nargs='+',
|
||||
help='Specify Tags to be selected and auto updated')
|
||||
parser_model_monitor.add_argument(
|
||||
'--project', type=str,
|
||||
help='Specify Model Project to be selected and auto updated')
|
||||
parser_model_monitor.add_argument(
|
||||
'--published', action='store_true',
|
||||
help='Only select published Model for the auto updated')
|
||||
parser_model_monitor.add_argument(
|
||||
'--preprocess', type=str,
|
||||
help='Specify Pre/Post processing code to be used with the model (point to local file / folder) '
|
||||
'- this should hold for all the models'
|
||||
)
|
||||
parser_model_monitor.add_argument(
|
||||
'--input-size', type=int, nargs='+',
|
||||
help='Optional: Specify the model matrix input size [Rows x Columns X Channels etc ...]'
|
||||
)
|
||||
parser_model_monitor.add_argument(
|
||||
'--input-type', type=str,
|
||||
help='Optional: Specify the model matrix input type, examples: uint8, float32, int16, float16 etc.'
|
||||
)
|
||||
parser_model_monitor.add_argument(
|
||||
'--input-name', type=str,
|
||||
help='Optional: Specify the model layer pushing input into, examples: layer_0'
|
||||
)
|
||||
parser_model_monitor.add_argument(
|
||||
'--output-size', type=int, nargs='+',
|
||||
help='Optional: Specify the model matrix output size [Rows x Columns X Channels etc ...]'
|
||||
)
|
||||
parser_model_monitor.add_argument(
|
||||
'--output_type', type=str,
|
||||
help='Optional: Specify the model matrix output type, examples: uint8, float32, int16, float16 etc.'
|
||||
)
|
||||
parser_model_monitor.add_argument(
|
||||
'--output-name', type=str,
|
||||
help='Optional: Specify the model layer pulling results from, examples: layer_99'
|
||||
)
|
||||
parser_model_monitor.add_argument(
|
||||
'--aux-config', type=int, nargs='+',
|
||||
help='Specify additional engine specific auxiliary configuration in the form of key=value. '
|
||||
'Example: platform=onnxruntime_onnx response_cache.enable=true max_batch_size=8 '
|
||||
'Notice: you can also pass full configuration file (e.g. Triton "config.pbtxt")'
|
||||
)
|
||||
parser_model_monitor.set_defaults(func=func_model_auto_update_add)
|
||||
|
||||
parser_model_add = model_cmd.add_parser('add', help='Add/Update model')
|
||||
parser_model_add.add_argument(
|
||||
'--engine', type=str, required=True,
|
||||
help='Model endpoint serving engine (triton, sklearn, xgboost, lightgbm)')
|
||||
parser_model_add.add_argument(
|
||||
'--endpoint', type=str, required=True,
|
||||
help='Model endpoint (must be unique)')
|
||||
parser_model_add.add_argument(
|
||||
'--version', type=str, default=None,
|
||||
help='Model endpoint version (default: None)')
|
||||
parser_model_add.add_argument(
|
||||
'--model-id', type=str,
|
||||
help='(Optional) Model ID to deploy, if passed model-project/model-name/model-tags are ignored')
|
||||
parser_trt.add_argument(
|
||||
'--model-project', type=str, help='Automatic model deployment and upgrade, select model project (exact match)')
|
||||
parser_trt.add_argument(
|
||||
'--model-name', type=str, help='Automatic model deployment and upgrade, select model name (exact match)')
|
||||
parser_trt.add_argument(
|
||||
'--model-tags', nargs='*', type=str,
|
||||
help='Automatic model deployment and upgrade, select model name tags to include, '
|
||||
'model has to have all tags to be deployed/upgraded')
|
||||
parser_trt.set_defaults(func=cmd_triton)
|
||||
help='Specify a Model ID to be served')
|
||||
parser_model_add.add_argument(
|
||||
'--preprocess', type=str,
|
||||
help='Specify Pre/Post processing code to be used with the model (point to local file / folder)'
|
||||
)
|
||||
parser_model_add.add_argument(
|
||||
'--input-size', type=int, nargs='+',
|
||||
help='Optional: Specify the model matrix input size [Rows x Columns X Channels etc ...]'
|
||||
)
|
||||
parser_model_add.add_argument(
|
||||
'--input-type', type=str,
|
||||
help='Optional: Specify the model matrix input type, examples: uint8, float32, int16, float16 etc.'
|
||||
)
|
||||
parser_model_add.add_argument(
|
||||
'--input-name', type=str,
|
||||
help='Optional: Specify the model layer pushing input into, examples: layer_0'
|
||||
)
|
||||
parser_model_add.add_argument(
|
||||
'--output-size', type=int, nargs='+',
|
||||
help='Optional: Specify the model matrix output size [Rows x Columns X Channels etc ...]'
|
||||
)
|
||||
parser_model_add.add_argument(
|
||||
'--output-type', type=str,
|
||||
help='Specify the model matrix output type, examples: uint8, float32, int16, float16 etc.'
|
||||
)
|
||||
parser_model_add.add_argument(
|
||||
'--output-name', type=str,
|
||||
help='Optional: Specify the model layer pulling results from, examples: layer_99'
|
||||
)
|
||||
parser_model_add.add_argument(
|
||||
'--aux-config', type=int, nargs='+',
|
||||
help='Specify additional engine specific auxiliary configuration in the form of key=value. '
|
||||
'Example: platform=onnxruntime_onnx response_cache.enable=true max_batch_size=8 '
|
||||
'Notice: you can also pass full configuration file (e.g. Triton "config.pbtxt")'
|
||||
)
|
||||
parser_model_add.add_argument(
|
||||
'--name', type=str,
|
||||
help='[Optional] Instead of specifying model-id select based on Model Name')
|
||||
parser_model_add.add_argument(
|
||||
'--tags', type=str, nargs='+',
|
||||
help='[Optional] Instead of specifying model-id select based on Model Tags')
|
||||
parser_model_add.add_argument(
|
||||
'--project', type=str,
|
||||
help='[Optional] Instead of specifying model-id select based on Model project')
|
||||
parser_model_add.add_argument(
|
||||
'--published', action='store_true',
|
||||
help='[Optional] Instead of specifying model-id select based on Model published')
|
||||
parser_model_add.set_defaults(func=func_model_endpoint_add)
|
||||
|
||||
args = parser.parse_args()
|
||||
verbosity['debug'] = args.debug
|
||||
args = restore_state(args)
|
||||
global verbosity
|
||||
verbosity = args.debug
|
||||
|
||||
if args.command:
|
||||
args.func(args)
|
||||
if args.command not in ("create", "list") and not args.id:
|
||||
print("Notice! serving service ID not provided, selecting the first active service")
|
||||
|
||||
try:
|
||||
args.func(args)
|
||||
except AttributeError:
|
||||
args.func()
|
||||
else:
|
||||
parser.print_help()
|
||||
|
||||
|
||||
def main():
|
||||
verbosity = dict(debug=False)
|
||||
global verbosity
|
||||
try:
|
||||
cli(verbosity)
|
||||
cli()
|
||||
except KeyboardInterrupt:
|
||||
print('\nUser aborted')
|
||||
except Exception as ex:
|
||||
print('\nError: {}'.format(ex))
|
||||
if verbosity.get('debug'):
|
||||
if verbosity:
|
||||
raise ex
|
||||
exit(1)
|
||||
|
||||
|
||||
0
clearml_serving/engines/__init__.py
Normal file
0
clearml_serving/engines/__init__.py
Normal file
22
clearml_serving/engines/triton/Dockerfile
Normal file
22
clearml_serving/engines/triton/Dockerfile
Normal file
@@ -0,0 +1,22 @@
|
||||
|
||||
FROM nvcr.io/nvidia/tritonserver:22.02-py3
|
||||
|
||||
|
||||
ENV LC_ALL=C.UTF-8
|
||||
|
||||
# install base package
|
||||
RUN pip3 install clearml-serving
|
||||
|
||||
# get latest execution code from the git repository
|
||||
# RUN cd $HOME && git clone https://github.com/allegroai/clearml-serving.git
|
||||
COPY clearml_serving /root/clearml/clearml_serving
|
||||
|
||||
RUN pip3 install -r /root/clearml/clearml_serving/engines/triton/requirements.txt
|
||||
|
||||
# default serving port
|
||||
EXPOSE 8001
|
||||
|
||||
# environement variable to load Task from CLEARML_SERVING_TASK_ID, CLEARML_SERVING_PORT
|
||||
|
||||
WORKDIR /root/clearml/
|
||||
ENTRYPOINT ["clearml_serving/engines/triton/entrypoint.sh"]
|
||||
0
clearml_serving/engines/triton/__init__.py
Normal file
0
clearml_serving/engines/triton/__init__.py
Normal file
18
clearml_serving/engines/triton/entrypoint.sh
Executable file
18
clearml_serving/engines/triton/entrypoint.sh
Executable file
@@ -0,0 +1,18 @@
|
||||
#!/bin/bash
|
||||
|
||||
# print configuration
|
||||
echo CLEARML_SERVING_TASK_ID="$CLEARML_SERVING_TASK_ID"
|
||||
echo CLEARML_TRITON_POLL_FREQ="$CLEARML_TRITON_POLL_FREQ"
|
||||
echo CLEARML_TRITON_METRIC_FREQ="$CLEARML_TRITON_METRIC_FREQ"
|
||||
echo CLEARML_TRITON_HELPER_ARGS="$CLEARML_TRITON_HELPER_ARGS"
|
||||
echo EXTRA_PYTHON_PACKAGES="$EXTRA_PYTHON_PACKAGES"
|
||||
|
||||
# we should also have clearml-server configurations
|
||||
|
||||
if [ ! -z "$EXTRA_PYTHON_PACKAGES" ]
|
||||
then
|
||||
python3 -m pip install $EXTRA_PYTHON_PACKAGES
|
||||
fi
|
||||
|
||||
# start service
|
||||
PYTHONPATH=$(pwd) python3 clearml_serving/engines/triton/triton_helper.py $CLEARML_TRITON_HELPER_ARGS $@
|
||||
6
clearml_serving/engines/triton/requirements.txt
Normal file
6
clearml_serving/engines/triton/requirements.txt
Normal file
@@ -0,0 +1,6 @@
|
||||
clearml >= 1.1.6
|
||||
clearml-serving
|
||||
tritonclient
|
||||
grpcio
|
||||
Pillow
|
||||
pathlib2
|
||||
508
clearml_serving/engines/triton/triton_helper.py
Normal file
508
clearml_serving/engines/triton/triton_helper.py
Normal file
@@ -0,0 +1,508 @@
|
||||
import os
|
||||
import re
|
||||
import shutil
|
||||
import subprocess
|
||||
import numpy as np
|
||||
from argparse import ArgumentParser
|
||||
from time import time
|
||||
from typing import Optional
|
||||
|
||||
from pathlib2 import Path
|
||||
|
||||
from clearml import Task, Logger, InputModel
|
||||
from clearml.backend_api.utils import get_http_session_with_retry
|
||||
from clearml_serving.serving.model_request_processor import ModelRequestProcessor, ModelEndpoint
|
||||
from clearml.utilities.pyhocon import ConfigFactory, ConfigTree, HOCONConverter
|
||||
|
||||
|
||||
class TritonHelper(object):
|
||||
_metric_line_parsing = r"(\w+){(gpu_uuid=\"[\w\W]*\",)?model=\"(\w+)\",\s*version=\"(\d+)\"}\s*([0-9.]*)"
|
||||
_default_metrics_port = 8002
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
args, # Any
|
||||
task, # type: Task
|
||||
serving_id, # type: str
|
||||
metric_host=None, # type: Optional[str]
|
||||
metric_port=None, # type: int
|
||||
):
|
||||
# type: (...) -> None
|
||||
self._http_session = get_http_session_with_retry()
|
||||
self.args = dict(**args.__dict__) if args else {}
|
||||
self.task = task
|
||||
self._serving_service_task_id = serving_id
|
||||
self._serving_service_task = None # type: Optional[ModelRequestProcessor]
|
||||
self._current_endpoints = {}
|
||||
self.metric_host = metric_host or '0.0.0.0'
|
||||
self.metric_port = metric_port or self._default_metrics_port
|
||||
self._parse_metric = re.compile(self._metric_line_parsing)
|
||||
self._timestamp = time()
|
||||
self._last_update_step = None
|
||||
print('String Triton Helper service\n{}\n'.format(self.args))
|
||||
|
||||
def report_metrics(self, remote_logger):
|
||||
# type: (Optional[Logger]) -> bool
|
||||
# iterations are seconds from start
|
||||
iteration = int(time() - self._timestamp)
|
||||
|
||||
report_msg = "reporting metrics: relative time {} sec".format(iteration)
|
||||
self.task.get_logger().report_text(report_msg)
|
||||
if remote_logger:
|
||||
remote_logger.report_text(report_msg, print_console=False)
|
||||
|
||||
# noinspection PyBroadException
|
||||
try:
|
||||
# this is inside the container
|
||||
request = self._http_session.get('http://{}:{}/metrics'.format(self.metric_host, self.metric_port)) # noqa
|
||||
if not request.ok:
|
||||
return False
|
||||
content = request.content.decode().split('\n')
|
||||
except Exception:
|
||||
return False
|
||||
|
||||
for line in content:
|
||||
line = line.strip()
|
||||
if not line or line.startswith('#'):
|
||||
continue
|
||||
# noinspection PyBroadException
|
||||
try:
|
||||
metric, gpu_uuid, variant, version, value = self._parse_metric.match(line).groups()
|
||||
value = float(value)
|
||||
except Exception:
|
||||
continue
|
||||
self.task.get_logger().report_scalar(
|
||||
title=metric,
|
||||
series='{}.v{}'.format(variant, version),
|
||||
iteration=iteration,
|
||||
value=value
|
||||
)
|
||||
# on the remote logger we add our own Task ID (unique ID),
|
||||
# to support multiple servers reporting to the same service controller
|
||||
if remote_logger:
|
||||
remote_logger.report_scalar(
|
||||
title=metric,
|
||||
series='{}.v{}.{}'.format(variant, version, self.task.id),
|
||||
iteration=iteration,
|
||||
value=value
|
||||
)
|
||||
|
||||
def model_service_update_step(self, model_repository_folder=None, verbose=True):
|
||||
# type: (Optional[str], bool) -> bool
|
||||
|
||||
if not self._serving_service_task:
|
||||
return False
|
||||
|
||||
active_endpoints = self._serving_service_task.get_synced_endpoints()
|
||||
|
||||
self._last_update_step = time()
|
||||
|
||||
# nothing to do
|
||||
if self._current_endpoints == active_endpoints:
|
||||
return False
|
||||
|
||||
if not model_repository_folder:
|
||||
model_repository_folder = '/models/'
|
||||
|
||||
if verbose:
|
||||
print('Updating local model folder: {}'.format(model_repository_folder))
|
||||
|
||||
for url, endpoint in active_endpoints.items():
|
||||
|
||||
# skip if there is no change
|
||||
if url in self._current_endpoints and self._current_endpoints.get(url) == endpoint:
|
||||
continue
|
||||
|
||||
# skip if this is not a triton engine endpoint:
|
||||
if endpoint.engine_type != "triton":
|
||||
continue
|
||||
|
||||
url = url.replace("/", "_")
|
||||
|
||||
folder = Path(model_repository_folder) / url
|
||||
folder.mkdir(parents=True, exist_ok=True)
|
||||
|
||||
config_pbtxt = folder / 'config.pbtxt'
|
||||
# download model versions
|
||||
version = 1
|
||||
model_id = endpoint.model_id
|
||||
|
||||
model_folder = folder / str(version)
|
||||
|
||||
model_folder.mkdir(parents=True, exist_ok=True)
|
||||
model = None
|
||||
# noinspection PyBroadException
|
||||
try:
|
||||
model = InputModel(model_id)
|
||||
local_path = model.get_local_copy()
|
||||
except Exception:
|
||||
local_path = None
|
||||
if not local_path:
|
||||
print("Error retrieving model ID {} []".format(model_id, model.url if model else ''))
|
||||
continue
|
||||
|
||||
local_path = Path(local_path)
|
||||
|
||||
# prepare config.pbtxt
|
||||
self.create_config_pbtxt(
|
||||
endpoint, target_pbtxt_file=config_pbtxt.as_posix(), platform=model.framework
|
||||
)
|
||||
|
||||
if verbose:
|
||||
print('Update model v{} in {}'.format(version, model_folder))
|
||||
|
||||
# if this is a folder copy every and delete the temp folder
|
||||
if local_path.is_dir() and model and (
|
||||
str(model.framework).lower().startswith("tensorflow") or
|
||||
str(model.framework).lower().startswith("keras")
|
||||
):
|
||||
# we assume we have a `tensorflow.savedmodel` folder
|
||||
model_folder /= 'model.savedmodel'
|
||||
model_folder.mkdir(parents=True, exist_ok=True)
|
||||
# rename to old
|
||||
old_folder = None
|
||||
if model_folder.exists():
|
||||
old_folder = model_folder.parent / '.old.{}'.format(model_folder.name)
|
||||
model_folder.replace(old_folder)
|
||||
if verbose:
|
||||
print('copy model into {}'.format(model_folder))
|
||||
shutil.copytree(
|
||||
local_path.as_posix(), model_folder.as_posix(), symlinks=False,
|
||||
)
|
||||
if old_folder:
|
||||
shutil.rmtree(path=old_folder.as_posix())
|
||||
# delete temp folder
|
||||
shutil.rmtree(local_path.as_posix())
|
||||
else:
|
||||
# single file should be moved
|
||||
if model and str(model.framework).lower().startswith("pytorch"):
|
||||
target_path = model_folder / "model.pt"
|
||||
else:
|
||||
target_path = model_folder / local_path.name
|
||||
|
||||
old_file = None
|
||||
if target_path.exists():
|
||||
old_file = target_path.parent / '.old.{}'.format(target_path.name)
|
||||
target_path.replace(old_file)
|
||||
shutil.move(local_path.as_posix(), target_path.as_posix())
|
||||
if old_file:
|
||||
old_file.unlink()
|
||||
|
||||
# todo: trigger triton model reloading (instead of relaying on current poll mechanism)
|
||||
# based on the model endpoint changes
|
||||
|
||||
# update current state
|
||||
self._current_endpoints = active_endpoints
|
||||
|
||||
return True
|
||||
|
||||
def maintenance_daemon(
|
||||
self,
|
||||
local_model_repo='/models', # type: str
|
||||
update_frequency_sec=60.0, # type: float
|
||||
metric_frequency_sec=60.0 # type: float
|
||||
):
|
||||
# type: (...) -> None
|
||||
|
||||
Path(local_model_repo).mkdir(parents=True, exist_ok=True)
|
||||
|
||||
self._serving_service_task = ModelRequestProcessor(task_id=self._serving_service_task_id)
|
||||
self.model_service_update_step(model_repository_folder=local_model_repo, verbose=True)
|
||||
|
||||
# noinspection PyProtectedMember
|
||||
remote_logger = self._serving_service_task._task.get_logger()
|
||||
|
||||
# todo: log triton server outputs when running locally
|
||||
|
||||
# we assume we can run the triton server
|
||||
cmd = [
|
||||
'tritonserver',
|
||||
'--model-control-mode=poll',
|
||||
'--model-repository={}'.format(local_model_repo),
|
||||
'--repository-poll-secs={}'.format(update_frequency_sec),
|
||||
'--metrics-port={}'.format(self._default_metrics_port),
|
||||
'--allow-metrics=true',
|
||||
'--allow-gpu-metrics=true',
|
||||
]
|
||||
for k, v in self.args.items():
|
||||
if not v or not str(k).startswith('t_'):
|
||||
continue
|
||||
cmd.append('--{}={}'.format(k, v))
|
||||
|
||||
print('Starting server: {}'.format(cmd))
|
||||
try:
|
||||
proc = subprocess.Popen(cmd)
|
||||
except FileNotFoundError:
|
||||
raise ValueError(
|
||||
"Triton Server Engine (tritonserver) could not be found!\n"
|
||||
"Verify you running inside the `nvcr.io/nvidia/tritonserver` docker container")
|
||||
base_freq = min(update_frequency_sec, metric_frequency_sec)
|
||||
metric_tic = update_tic = time()
|
||||
while True:
|
||||
try:
|
||||
error_code = proc.wait(timeout=base_freq)
|
||||
if error_code == 0:
|
||||
print("triton-server process ended with error code {}".format(error_code))
|
||||
return
|
||||
raise ValueError("triton-server process ended with error code {}".format(error_code))
|
||||
except subprocess.TimeoutExpired:
|
||||
pass
|
||||
pass
|
||||
|
||||
# update models
|
||||
if time() - update_tic > update_frequency_sec:
|
||||
print("Info: syncing models from main serving service")
|
||||
if self.model_service_update_step(model_repository_folder=local_model_repo, verbose=True):
|
||||
print("Info: Models updated from main serving service")
|
||||
update_tic = time()
|
||||
|
||||
# update stats
|
||||
if time() - metric_tic > metric_frequency_sec:
|
||||
metric_tic = time()
|
||||
self.report_metrics(remote_logger)
|
||||
|
||||
@classmethod
|
||||
def create_config_pbtxt(cls, endpoint, target_pbtxt_file, platform=None):
|
||||
# type: (ModelEndpoint, str, Optional[str]) -> bool
|
||||
"""
|
||||
Full spec available here:
|
||||
https://github.com/triton-inference-server/server/blob/main/docs/model_configuration.md
|
||||
"""
|
||||
def _convert_lists(config):
|
||||
if isinstance(config, list):
|
||||
return [_convert_lists(i) for i in config]
|
||||
|
||||
if not isinstance(config, ConfigTree):
|
||||
return config
|
||||
|
||||
for k in list(config.keys()):
|
||||
v = config[k]
|
||||
# try to convert to list
|
||||
if isinstance(v, (ConfigTree, list)):
|
||||
# noinspection PyBroadException
|
||||
try:
|
||||
a_list = config.get_list(k, [])
|
||||
if a_list:
|
||||
config[k] = _convert_lists(a_list)
|
||||
continue
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
config[k] = _convert_lists(v)
|
||||
|
||||
return config
|
||||
|
||||
final_config_pbtxt = ""
|
||||
config_dict = dict()
|
||||
|
||||
if endpoint.auxiliary_cfg and isinstance(endpoint.auxiliary_cfg, str):
|
||||
final_config_pbtxt = endpoint.auxiliary_cfg + "\n"
|
||||
elif endpoint.auxiliary_cfg and isinstance(endpoint.auxiliary_cfg, dict):
|
||||
config_dict = dict(**endpoint.auxiliary_cfg)
|
||||
|
||||
config_dict = ConfigFactory.from_dict(config_dict)
|
||||
|
||||
# The framework for the model. Possible values are:
|
||||
# "tensorrt_plan", "tensorflow_graphdef",
|
||||
# "tensorflow_savedmodel", "onnxruntime_onnx",
|
||||
# "pytorch_libtorch".
|
||||
# Default for TF: "tensorflow_savedmodel"
|
||||
|
||||
# replace ": [{" with ": [{" (currently not needed)
|
||||
# pattern = re.compile(r"(?P<key>\w+)(?P<space>\s+)(?P<bracket>(\[)|({))")
|
||||
|
||||
if endpoint.input_size:
|
||||
config_dict.put("input.0.dims", endpoint.input_size)
|
||||
|
||||
if endpoint.output_size:
|
||||
config_dict.put("output.0.dims", endpoint.output_size)
|
||||
|
||||
input_type = None
|
||||
if endpoint.input_type:
|
||||
input_type = "TYPE_" + cls.np_to_triton_dtype(np.dtype(endpoint.input_type))
|
||||
config_dict.put("input.0.data_type", input_type)
|
||||
|
||||
output_type = None
|
||||
if endpoint.output_type:
|
||||
output_type = "TYPE_" + cls.np_to_triton_dtype(np.dtype(endpoint.output_type))
|
||||
config_dict.put("output.0.data_type", output_type)
|
||||
|
||||
if endpoint.input_name:
|
||||
config_dict.put("input.0.name", endpoint.input_name)
|
||||
|
||||
if endpoint.output_name:
|
||||
config_dict.put("output.0.name", endpoint.output_name)
|
||||
|
||||
if platform and not config_dict.get("platform", None) and not config_dict.get("backend", None):
|
||||
platform = str(platform).lower()
|
||||
if platform.startswith("tensorflow") or platform.startswith("keras"):
|
||||
config_dict["platform"] = "tensorflow_savedmodel"
|
||||
elif platform.startswith("pytorch") or platform.startswith("caffe"):
|
||||
config_dict["backend"] = "pytorch"
|
||||
elif platform.startswith("onnx"):
|
||||
config_dict["platform"] = "onnxruntime_onnx"
|
||||
|
||||
# convert to lists anything that we can:
|
||||
if config_dict:
|
||||
config_dict = _convert_lists(config_dict)
|
||||
# Convert HOCON standard to predefined message format
|
||||
config_pbtxt = "\n" + HOCONConverter.to_hocon(config_dict).\
|
||||
replace("=", ":").replace(" : ", ": ")
|
||||
# conform types (remove string quotes)
|
||||
if input_type:
|
||||
config_pbtxt = config_pbtxt.replace(f"\"{input_type}\"", f"{input_type}")
|
||||
if output_type:
|
||||
config_pbtxt = config_pbtxt.replace(f"\"{output_type}\"", f"{output_type}")
|
||||
# conform types (remove string quotes)
|
||||
config_pbtxt = config_pbtxt.replace("\"KIND_CPU\"", "KIND_CPU").replace("\"KIND_GPU\"", "KIND_GPU")
|
||||
else:
|
||||
config_pbtxt = ""
|
||||
|
||||
# merge the two
|
||||
final_config_pbtxt += config_pbtxt
|
||||
print("INFO: target config.pbtxt file for endpoint '{}':\n{}\n".format(
|
||||
endpoint.serving_url, final_config_pbtxt))
|
||||
|
||||
with open(target_pbtxt_file, "w") as config_file:
|
||||
config_file.write(final_config_pbtxt)
|
||||
|
||||
return True
|
||||
|
||||
@staticmethod
|
||||
def np_to_triton_dtype(np_dtype):
|
||||
# type (np.dtype) -> str
|
||||
"""
|
||||
copied from tritonclientutils import np_to_triton_dtype
|
||||
"""
|
||||
if np_dtype == bool:
|
||||
return "BOOL"
|
||||
elif np_dtype == np.int8:
|
||||
return "INT8"
|
||||
elif np_dtype == np.int16:
|
||||
return "INT16"
|
||||
elif np_dtype == np.int32:
|
||||
return "INT32"
|
||||
elif np_dtype == np.int64:
|
||||
return "INT64"
|
||||
elif np_dtype == np.uint8:
|
||||
return "UINT8"
|
||||
elif np_dtype == np.uint16:
|
||||
return "UINT16"
|
||||
elif np_dtype == np.uint32:
|
||||
return "UINT32"
|
||||
elif np_dtype == np.uint64:
|
||||
return "UINT64"
|
||||
elif np_dtype == np.float16:
|
||||
return "FP16"
|
||||
elif np_dtype == np.float32:
|
||||
return "FP32"
|
||||
elif np_dtype == np.float64:
|
||||
return "FP64"
|
||||
elif np_dtype == np.object_ or np_dtype.type == np.bytes_:
|
||||
return "BYTES"
|
||||
return None
|
||||
|
||||
|
||||
def main():
|
||||
title = 'clearml-serving - Nvidia Triton Engine Controller'
|
||||
print(title)
|
||||
parser = ArgumentParser(prog='clearml-serving', description=title)
|
||||
parser.add_argument(
|
||||
'--serving-id', default=os.environ.get('CLEARML_SERVING_TASK_ID'), type=str,
|
||||
help='Specify main serving service Task ID')
|
||||
parser.add_argument(
|
||||
'--project', default='serving', type=str,
|
||||
help='Optional specify project for the serving engine Task')
|
||||
parser.add_argument(
|
||||
'--name', default='nvidia-triton', type=str,
|
||||
help='Optional specify task name for the serving engine Task')
|
||||
parser.add_argument(
|
||||
'--update-frequency', default=os.environ.get('CLEARML_TRITON_POLL_FREQ') or 10., type=float,
|
||||
help='Model update frequency in minutes')
|
||||
parser.add_argument(
|
||||
'--metric-frequency', default=os.environ.get('CLEARML_TRITON_METRIC_FREQ') or 1., type=float,
|
||||
help='Metric reporting update frequency in minutes')
|
||||
parser.add_argument(
|
||||
'--inference-task-id', default=None, type=str,
|
||||
help='Optional: Specify the inference Task ID to report to. default: create a new one')
|
||||
parser.add_argument(
|
||||
'--t-http-port', type=str, help='<integer> The port for the server to listen on for HTTP requests')
|
||||
parser.add_argument(
|
||||
'--t-http-thread-count', type=str, help='<integer> Number of threads handling HTTP requests')
|
||||
parser.add_argument(
|
||||
'--t-allow-grpc', type=str, help='<integer> Allow the server to listen for GRPC requests')
|
||||
parser.add_argument(
|
||||
'--t-grpc-port', type=str, help='<integer> The port for the server to listen on for GRPC requests')
|
||||
parser.add_argument(
|
||||
'--t-grpc-infer-allocation-pool-size', type=str,
|
||||
help='<integer> The maximum number of inference request/response objects that remain '
|
||||
'allocated for reuse. As long as the number of in-flight requests doesn\'t exceed '
|
||||
'this value there will be no allocation/deallocation of request/response objects')
|
||||
parser.add_argument(
|
||||
'--t-pinned-memory-pool-byte-size', type=str,
|
||||
help='<integer> The total byte size that can be allocated as pinned system '
|
||||
'memory. If GPU support is enabled, the server will allocate pinned '
|
||||
'system memory to accelerate data transfer between host and devices '
|
||||
'until it exceeds the specified byte size. This option will not affect '
|
||||
'the allocation conducted by the backend frameworks. Default is 256 MB')
|
||||
parser.add_argument(
|
||||
'--t-cuda-memory-pool-byte-size', type=str,
|
||||
help='<<integer>:<integer>> The total byte size that can be allocated as CUDA memory for '
|
||||
'the GPU device. If GPU support is enabled, the server will allocate '
|
||||
'CUDA memory to minimize data transfer between host and devices '
|
||||
'until it exceeds the specified byte size. This option will not affect '
|
||||
'the allocation conducted by the backend frameworks. The argument '
|
||||
'should be 2 integers separated by colons in the format <GPU device'
|
||||
'ID>:<pool byte size>. This option can be used multiple times, but only '
|
||||
'once per GPU device. Subsequent uses will overwrite previous uses for '
|
||||
'the same GPU device. Default is 64 MB')
|
||||
parser.add_argument(
|
||||
'--t-min-supported-compute-capability', type=str,
|
||||
help='<float> The minimum supported CUDA compute capability. GPUs that '
|
||||
'don\'t support this compute capability will not be used by the server')
|
||||
parser.add_argument(
|
||||
'--t-buffer-manager-thread-count', type=str,
|
||||
help='<integer> The number of threads used to accelerate copies and other'
|
||||
'operations required to manage input and output tensor contents.'
|
||||
'Default is 0')
|
||||
|
||||
args = parser.parse_args()
|
||||
|
||||
# check Args OS overrides
|
||||
prefix = "CLEARML_TRITON_"
|
||||
for k, v in os.environ.items():
|
||||
if not k.startswith(prefix):
|
||||
continue
|
||||
args_var = k.replace(prefix, "", 1).replace("-", "_").lower()
|
||||
if args_var in args.__dict__:
|
||||
# casting
|
||||
t = type(getattr(args, args_var, None))
|
||||
setattr(args, args_var, type(t)(v) if t is not None else v)
|
||||
|
||||
task = Task.init(
|
||||
project_name=args.project, task_name=args.name, task_type=Task.TaskTypes.inference,
|
||||
continue_last_task=args.inference_task_id or None
|
||||
)
|
||||
print("configuration args: {}".format(args))
|
||||
helper = TritonHelper(args, task, serving_id=args.serving_id)
|
||||
|
||||
# safe casting
|
||||
try:
|
||||
update_frequency_sec = float(args.update_frequency) * 60.0
|
||||
except (ValueError, TypeError):
|
||||
update_frequency_sec = 600
|
||||
try:
|
||||
metric_frequency_sec = float(args.metric_frequency) * 60.0
|
||||
except (ValueError, TypeError):
|
||||
metric_frequency_sec = 60
|
||||
|
||||
# this function will never return
|
||||
helper.maintenance_daemon(
|
||||
local_model_repo='/models',
|
||||
update_frequency_sec=update_frequency_sec,
|
||||
metric_frequency_sec=metric_frequency_sec,
|
||||
)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
40
clearml_serving/preprocess/example.py
Normal file
40
clearml_serving/preprocess/example.py
Normal file
@@ -0,0 +1,40 @@
|
||||
from typing import Any, Optional
|
||||
|
||||
import numpy as np
|
||||
|
||||
|
||||
# Notice Preprocess class Must be named "Preprocess"
|
||||
class Preprocess(object):
|
||||
serving_config = None
|
||||
# example: {
|
||||
# 'base_serving_url': 'http://127.0.0.1:8080/serve/',
|
||||
# 'triton_grpc_server': '127.0.0.1:9001',
|
||||
# }"
|
||||
|
||||
def __init__(self):
|
||||
# set internal state, this will be called only once. (i.e. not per request)
|
||||
pass
|
||||
|
||||
def load(self, local_file_name: str) -> Optional[Any]:
|
||||
"""
|
||||
Optional, provide loading method for the model
|
||||
useful if we need to load a model in a specific way for the prediction engine to work
|
||||
:param local_file_name: file name / path to read load the model from
|
||||
:return: Object that will be called with .predict() method for inference
|
||||
"""
|
||||
pass
|
||||
|
||||
def preprocess(self, body: dict) -> Any:
|
||||
# do something with the request data, return any type of object.
|
||||
# The returned object will be passed as is to the inference engine
|
||||
return body
|
||||
|
||||
def postprocess(self, data: Any) -> dict:
|
||||
# post process the data returned from the model inference engine
|
||||
# returned dict will be passed back as the request result as is.
|
||||
return data
|
||||
|
||||
def process(self, data: Any) -> Any:
|
||||
# do something with the actual data, return any type of object.
|
||||
# The returned object will be passed as is to the postprocess function engine
|
||||
return data
|
||||
@@ -1,17 +0,0 @@
|
||||
from time import sleep
|
||||
from clearml import Task
|
||||
from clearml_serving.serving_service import ServingService
|
||||
|
||||
|
||||
def main():
|
||||
# we should only be running in remotely by an agent
|
||||
task = Task.init()
|
||||
serving = ServingService(task=task)
|
||||
while True:
|
||||
serving.update()
|
||||
serving.stats()
|
||||
sleep(60.)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
21
clearml_serving/serving/Dockerfile
Normal file
21
clearml_serving/serving/Dockerfile
Normal file
@@ -0,0 +1,21 @@
|
||||
FROM python:3.9-bullseye
|
||||
|
||||
|
||||
ENV LC_ALL=C.UTF-8
|
||||
|
||||
# install base package
|
||||
RUN pip3 install clearml-serving
|
||||
|
||||
# get latest execution code from the git repository
|
||||
# RUN cd $HOME && git clone https://github.com/allegroai/clearml-serving.git
|
||||
COPY clearml_serving /root/clearml/clearml_serving
|
||||
|
||||
RUN pip3 install -r /root/clearml/clearml_serving/serving/requirements.txt
|
||||
|
||||
# default serving port
|
||||
EXPOSE 8080
|
||||
|
||||
# environement variable to load Task from CLEARML_SERVING_TASK_ID, CLEARML_SERVING_PORT
|
||||
|
||||
WORKDIR /root/clearml/
|
||||
ENTRYPOINT ["clearml_serving/serving/entrypoint.sh"]
|
||||
0
clearml_serving/serving/__init__.py
Normal file
0
clearml_serving/serving/__init__.py
Normal file
28
clearml_serving/serving/entrypoint.sh
Executable file
28
clearml_serving/serving/entrypoint.sh
Executable file
@@ -0,0 +1,28 @@
|
||||
#!/bin/bash
|
||||
|
||||
# print configuration
|
||||
echo CLEARML_SERVING_TASK_ID="$CLEARML_SERVING_TASK_ID"
|
||||
echo CLEARML_SERVING_PORT="$CLEARML_SERVING_PORT"
|
||||
echo EXTRA_PYTHON_PACKAGES="$EXTRA_PYTHON_PACKAGES"
|
||||
echo CLEARML_SERVING_NUM_PROCESS="$CLEARML_SERVING_NUM_PROCESS"
|
||||
echo CLEARML_SERVING_POLL_FREQ="$CLEARML_SERVING_POLL_FREQ"
|
||||
|
||||
GUNICORN_NUM_PROCESS="${CLEARML_SERVING_NUM_PROCESS:-4}"
|
||||
GUNICORN_SERVING_PORT="${CLEARML_SERVING_PORT:-8080}"
|
||||
|
||||
echo GUNICORN_NUM_PROCESS="$GUNICORN_NUM_PROCESS"
|
||||
echo GUNICORN_SERVING_PORT="$GUNICORN_SERVING_PORT"
|
||||
|
||||
# we should also have clearml-server configurations
|
||||
|
||||
if [ ! -z "$EXTRA_PYTHON_PACKAGES" ]
|
||||
then
|
||||
python3 -m pip install $EXTRA_PYTHON_PACKAGES
|
||||
fi
|
||||
|
||||
# start service
|
||||
PYTHONPATH=$(pwd) python3 -m gunicorn \
|
||||
--preload clearml_serving.serving.main:app \
|
||||
--workers $GUNICORN_NUM_PROCESS \
|
||||
--worker-class uvicorn.workers.UvicornWorker \
|
||||
--bind 0.0.0.0:$GUNICORN_SERVING_PORT
|
||||
95
clearml_serving/serving/main.py
Normal file
95
clearml_serving/serving/main.py
Normal file
@@ -0,0 +1,95 @@
|
||||
import os
|
||||
from multiprocessing import Lock
|
||||
import gzip
|
||||
|
||||
from fastapi import FastAPI, Request, Response, APIRouter, HTTPException
|
||||
from fastapi.routing import APIRoute
|
||||
|
||||
from typing import Optional, Dict, Any, Callable
|
||||
|
||||
from clearml import Task
|
||||
from clearml_serving.version import __version__
|
||||
from clearml_serving.serving.model_request_processor import ModelRequestProcessor
|
||||
from clearml_serving.serving.preprocess_service import BasePreprocessRequest
|
||||
|
||||
|
||||
class GzipRequest(Request):
|
||||
async def body(self) -> bytes:
|
||||
if not hasattr(self, "_body"):
|
||||
body = await super().body()
|
||||
if "gzip" in self.headers.getlist("Content-Encoding"):
|
||||
body = gzip.decompress(body)
|
||||
self._body = body
|
||||
return self._body
|
||||
|
||||
|
||||
class GzipRoute(APIRoute):
|
||||
def get_route_handler(self) -> Callable:
|
||||
original_route_handler = super().get_route_handler()
|
||||
|
||||
async def custom_route_handler(request: Request) -> Response:
|
||||
request = GzipRequest(request.scope, request.receive)
|
||||
return await original_route_handler(request)
|
||||
|
||||
return custom_route_handler
|
||||
|
||||
|
||||
# process Lock, so that we can have only a single process doing the model reloading at a time
|
||||
singleton_sync_lock = Lock()
|
||||
|
||||
serving_service_task_id = os.environ.get("CLEARML_SERVING_TASK_ID", None)
|
||||
model_sync_frequency_secs = 5
|
||||
try:
|
||||
model_sync_frequency_secs = float(os.environ.get("CLEARML_SERVING_POLL_FREQ", model_sync_frequency_secs))
|
||||
except (ValueError, TypeError):
|
||||
pass
|
||||
|
||||
# get the serving controller task
|
||||
# noinspection PyProtectedMember
|
||||
serving_task = ModelRequestProcessor._get_control_plane_task(task_id=serving_service_task_id)
|
||||
# create a new serving instance (for visibility and monitoring)
|
||||
instance_task = Task.init(
|
||||
project_name=serving_task.get_project_name(),
|
||||
task_name="{} - serve instance".format(serving_task.name),
|
||||
task_type="inference",
|
||||
)
|
||||
processor = None # type: Optional[ModelRequestProcessor]
|
||||
# preload modules into memory before forking
|
||||
BasePreprocessRequest.load_modules()
|
||||
# start FastAPI app
|
||||
app = FastAPI(title="ClearML Serving Service", version=__version__, description="ClearML Service Service router")
|
||||
|
||||
|
||||
@app.on_event("startup")
|
||||
async def startup_event():
|
||||
global processor
|
||||
print("Starting up ModelRequestProcessor [pid={}] [service_id={}]".format(os.getpid(), serving_service_task_id))
|
||||
processor = ModelRequestProcessor(
|
||||
task_id=serving_service_task_id, update_lock_guard=singleton_sync_lock,
|
||||
)
|
||||
print("ModelRequestProcessor [id={}] loaded".format(processor.get_id()))
|
||||
processor.launch(poll_frequency_sec=model_sync_frequency_secs*60)
|
||||
|
||||
|
||||
router = APIRouter(
|
||||
prefix="/serve",
|
||||
tags=["models"],
|
||||
responses={404: {"description": "Model Serving Endpoint Not found"}},
|
||||
route_class=GzipRoute, # mark-out to remove support for GZip content encoding
|
||||
)
|
||||
|
||||
|
||||
@router.post("/{model_id}")
|
||||
async def serve_model(model_id: str, version: Optional[str] = None, request: Dict[Any, Any] = None):
|
||||
try:
|
||||
return_value = processor.process_request(
|
||||
base_url=model_id,
|
||||
version=version,
|
||||
request_body=request
|
||||
)
|
||||
except Exception as ex:
|
||||
raise HTTPException(status_code=404, detail="Error processing request: {}".format(ex))
|
||||
return return_value
|
||||
|
||||
|
||||
app.include_router(router)
|
||||
901
clearml_serving/serving/model_request_processor.py
Normal file
901
clearml_serving/serving/model_request_processor.py
Normal file
@@ -0,0 +1,901 @@
|
||||
import json
|
||||
import os
|
||||
from pathlib import Path
|
||||
from time import sleep
|
||||
from typing import Optional, Union, Dict, List
|
||||
import itertools
|
||||
import threading
|
||||
from multiprocessing import Lock
|
||||
from numpy.random import choice
|
||||
|
||||
from attr import attrib, attrs, asdict
|
||||
from clearml import Task, Model
|
||||
from clearml.storage.util import hash_dict
|
||||
from .preprocess_service import ModelEndpoint, ModelMonitoring, BasePreprocessRequest
|
||||
|
||||
|
||||
@attrs
|
||||
class CanaryEP(object):
|
||||
endpoint = attrib(type=str) # load balancer endpoint
|
||||
weights = attrib(type=list) # list of weights (order should be matching fixed_endpoints or prefix)
|
||||
load_endpoints = attrib(type=list, default=[]) # list of endpoints to balance and route
|
||||
load_endpoint_prefix = attrib(
|
||||
type=str, default=None) # endpoint prefix to list
|
||||
# (any endpoint starting with this prefix will be listed, sorted lexicographically, or broken into /<int>)
|
||||
|
||||
def as_dict(self, remove_null_entries=False):
|
||||
if not remove_null_entries:
|
||||
return asdict(self)
|
||||
return {k: v for k, v in asdict(self).items() if v is not None}
|
||||
|
||||
|
||||
class FastWriteCounter(object):
|
||||
def __init__(self):
|
||||
self._counter_inc = itertools.count()
|
||||
self._counter_dec = itertools.count()
|
||||
|
||||
def inc(self):
|
||||
next(self._counter_inc)
|
||||
|
||||
def dec(self):
|
||||
next(self._counter_dec)
|
||||
|
||||
def value(self):
|
||||
return next(self._counter_inc) - next(self._counter_dec)
|
||||
|
||||
|
||||
class ModelRequestProcessor(object):
|
||||
_system_tag = 'serving-control-plane'
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
task_id: Optional[str] = None,
|
||||
update_lock_guard: Optional[Lock] = None,
|
||||
name: Optional[str] = None,
|
||||
project: Optional[str] = None,
|
||||
tags: Optional[List[str]] = None,
|
||||
force_create: bool = False,
|
||||
) -> None:
|
||||
"""
|
||||
:param task_id: Optional specify existing Task ID of the ServingService
|
||||
:param update_lock_guard: If provided use external (usually multi-process) lock guard for updates
|
||||
:param name: Optional name current serving service
|
||||
:param project: Optional select project for the current serving service
|
||||
:param tags: Optional add tags to the serving service
|
||||
:param force_create: force_create if provided, ignore task_id and create a new serving Task
|
||||
"""
|
||||
self._task = self._create_task(name=name, project=project, tags=tags) \
|
||||
if force_create else self._get_control_plane_task(task_id=task_id, name=name, project=project, tags=tags)
|
||||
self._endpoints = dict() # type: Dict[str, ModelEndpoint]
|
||||
self._model_monitoring = dict() # type: Dict[str, ModelMonitoring]
|
||||
self._model_monitoring_versions = dict() # type: Dict[str, Dict[int, str]]
|
||||
self._model_monitoring_endpoints = dict() # type: Dict[str, ModelEndpoint]
|
||||
self._model_monitoring_update_request = True
|
||||
# Dict[base_serve_url, Dict[version, model_id]]
|
||||
self._canary_endpoints = dict() # type: Dict[str, CanaryEP]
|
||||
self._canary_route = dict() # type: Dict[str, dict]
|
||||
self._engine_processor_lookup = dict() # type: Dict[str, BasePreprocessRequest]
|
||||
self._last_update_hash = None
|
||||
self._sync_daemon_thread = None
|
||||
# this is used for Fast locking mechanisms (so we do not actually need to use Locks)
|
||||
self._update_lock_flag = False
|
||||
self._request_processing_state = FastWriteCounter()
|
||||
self._update_lock_guard = update_lock_guard or threading.Lock()
|
||||
# serving server config
|
||||
self._configuration = {}
|
||||
self._instance_task = None
|
||||
|
||||
def process_request(self, base_url: str, version: str, request_body: dict) -> dict:
|
||||
"""
|
||||
Process request coming in,
|
||||
Raise Value error if url does not match existing endpoints
|
||||
"""
|
||||
self._request_processing_state.inc()
|
||||
# check if we need to stall
|
||||
if self._update_lock_flag:
|
||||
self._request_processing_state.dec()
|
||||
while self._update_lock_flag:
|
||||
sleep(1)
|
||||
# retry to process
|
||||
return self.process_request(base_url=base_url, version=version, request_body=request_body)
|
||||
try:
|
||||
# normalize url and version
|
||||
url = self._normalize_endpoint_url(base_url, version)
|
||||
|
||||
# check canary
|
||||
canary_url = self._process_canary(base_url=url)
|
||||
if canary_url:
|
||||
url = canary_url
|
||||
|
||||
ep = self._endpoints.get(url, None) or self._model_monitoring_endpoints.get(url, None)
|
||||
if not ep:
|
||||
raise ValueError("Model inference endpoint '{}' not found".format(url))
|
||||
|
||||
processor = self._engine_processor_lookup.get(url)
|
||||
if not processor:
|
||||
processor_cls = BasePreprocessRequest.get_engine_cls(ep.engine_type)
|
||||
processor = processor_cls(
|
||||
model_endpoint=ep, task=self._task, server_config=dict(**self._configuration)
|
||||
)
|
||||
self._engine_processor_lookup[url] = processor
|
||||
|
||||
return_value = self._process_request(processor=processor, url=url, body=request_body)
|
||||
except Exception:
|
||||
self._request_processing_state.dec()
|
||||
raise
|
||||
|
||||
return return_value
|
||||
|
||||
def _process_canary(self, base_url: str) -> Optional[dict]:
|
||||
canary = self._canary_route.get(base_url)
|
||||
if not canary:
|
||||
return None
|
||||
# random choice
|
||||
draw = choice(canary['endpoints'], 1, p=canary['weights'])
|
||||
# the new endpoint to use
|
||||
return draw[0]
|
||||
|
||||
def configure(
|
||||
self,
|
||||
external_serving_base_url: Optional[str] = None,
|
||||
external_triton_grpc_server: Optional[str] = None,
|
||||
):
|
||||
"""
|
||||
Set ModelRequestProcessor configuration arguments.
|
||||
|
||||
:param external_serving_base_url: Set the external base http endpoint for the serving service
|
||||
This URL will be passed to user custom preprocess class,
|
||||
allowing it to concatenate and combine multiple model requests into one
|
||||
:param external_triton_grpc_server: set the external grpc tcp port of the Nvidia Triton clearml container.
|
||||
Used by the clearml triton engine class to send inference requests
|
||||
"""
|
||||
if external_serving_base_url is not None:
|
||||
self._task.set_parameter(
|
||||
name="General/serving_base_url",
|
||||
value=str(external_serving_base_url),
|
||||
value_type="str",
|
||||
description="external base http endpoint for the serving service"
|
||||
)
|
||||
if external_triton_grpc_server is not None:
|
||||
self._task.set_parameter(
|
||||
name="General/triton_grpc_server",
|
||||
value=str(external_triton_grpc_server),
|
||||
value_type="str",
|
||||
description="external grpc tcp port of the Nvidia Triton ClearML container running"
|
||||
)
|
||||
|
||||
def add_endpoint(
|
||||
self,
|
||||
endpoint: Union[ModelEndpoint, dict],
|
||||
preprocess_code: Optional[str] = None,
|
||||
model_name: Optional[str] = None,
|
||||
model_project: Optional[str] = None,
|
||||
model_tags: Optional[List[str]] = None,
|
||||
model_published: Optional[bool] = None,
|
||||
) -> str:
|
||||
"""
|
||||
Return the unique name of the endpoint (endpoint + version)
|
||||
Overwrite existing endpoint if already exists (outputs a warning)
|
||||
|
||||
:param endpoint: New endpoint to register (overwrite existing endpoint if exists)
|
||||
:param preprocess_code: If provided upload local code as artifact
|
||||
:param model_name: If model-id not provided on, search based on model name
|
||||
:param model_project: If model-id not provided on, search based on model project
|
||||
:param model_tags: If model-id not provided on, search based on model tags
|
||||
:param model_published: If model-id not provided on, search based on model published state
|
||||
"""
|
||||
if not isinstance(endpoint, ModelEndpoint):
|
||||
endpoint = ModelEndpoint(**endpoint)
|
||||
|
||||
# make sure we have everything configured
|
||||
self._validate_model(endpoint)
|
||||
|
||||
url = self._normalize_endpoint_url(endpoint.serving_url, endpoint.version)
|
||||
if url in self._endpoints:
|
||||
print("Warning: Model endpoint \'{}\' overwritten".format(url))
|
||||
|
||||
if not endpoint.model_id:
|
||||
model_query = dict(
|
||||
project_name=model_project,
|
||||
model_name=model_name,
|
||||
tags=model_tags,
|
||||
only_published=bool(model_published),
|
||||
include_archived=False,
|
||||
)
|
||||
models = Model.query_models(max_results=2, **model_query)
|
||||
if not models:
|
||||
raise ValueError("Could not fine any Model to serve {}".format(model_query))
|
||||
if len(models) > 1:
|
||||
print("Warning: Found multiple Models for \'{}\', selecting id={}".format(model_query, models[0].id))
|
||||
endpoint.model_id = models[0].id
|
||||
|
||||
# upload as new artifact
|
||||
if preprocess_code:
|
||||
if not Path(preprocess_code).exists():
|
||||
raise ValueError("Preprocessing code \'{}\' could not be found".format(preprocess_code))
|
||||
preprocess_artifact_name = "py_code_{}".format(url.replace("/", "_"))
|
||||
self._task.upload_artifact(
|
||||
name=preprocess_artifact_name, artifact_object=Path(preprocess_code), wait_on_upload=True)
|
||||
endpoint.preprocess_artifact = preprocess_artifact_name
|
||||
|
||||
self._endpoints[url] = endpoint
|
||||
return url
|
||||
|
||||
def add_model_monitoring(
|
||||
self,
|
||||
monitoring: Union[ModelMonitoring, dict],
|
||||
preprocess_code: Optional[str] = None,
|
||||
) -> str:
|
||||
"""
|
||||
Return the unique name of the endpoint (endpoint + version)
|
||||
Overwrite existing endpoint if already exists (outputs a warning)
|
||||
|
||||
:param monitoring: Model endpoint monitor (overwrite existing endpoint if exists)
|
||||
:param preprocess_code: If provided upload local code as artifact
|
||||
:return: Unique model monitoring ID (base_model_url)
|
||||
"""
|
||||
if not isinstance(monitoring, ModelMonitoring):
|
||||
monitoring = ModelMonitoring(**monitoring)
|
||||
|
||||
# make sure we have everything configured
|
||||
self._validate_model(monitoring)
|
||||
|
||||
name = monitoring.base_serving_url
|
||||
if name in self._model_monitoring:
|
||||
print("Warning: Model monitoring \'{}\' overwritten".format(name))
|
||||
|
||||
# upload as new artifact
|
||||
if preprocess_code:
|
||||
if not Path(preprocess_code).exists():
|
||||
raise ValueError("Preprocessing code \'{}\' could not be found".format(preprocess_code))
|
||||
preprocess_artifact_name = "py_code_{}".format(name.replace("/", "_"))
|
||||
self._task.upload_artifact(
|
||||
name=preprocess_artifact_name, artifact_object=Path(preprocess_code), wait_on_upload=True)
|
||||
monitoring.preprocess_artifact = preprocess_artifact_name
|
||||
|
||||
self._model_monitoring[name] = monitoring
|
||||
return name
|
||||
|
||||
def remove_model_monitoring(self, model_base_url: str) -> bool:
|
||||
"""
|
||||
Remove model monitoring, use base_model_url as unique identifier
|
||||
"""
|
||||
if model_base_url not in self._model_monitoring:
|
||||
return False
|
||||
self._model_monitoring.pop(model_base_url, None)
|
||||
return True
|
||||
|
||||
def remove_endpoint(self, endpoint_url: str, version: Optional[str] = None) -> bool:
|
||||
"""
|
||||
Remove specific model endpoint, use base_model_url as unique identifier
|
||||
"""
|
||||
endpoint_url = self._normalize_endpoint_url(endpoint_url, version)
|
||||
if endpoint_url not in self._endpoints:
|
||||
return False
|
||||
self._endpoints.pop(endpoint_url, None)
|
||||
return True
|
||||
|
||||
def add_canary_endpoint(
|
||||
self,
|
||||
canary: Union[CanaryEP, dict],
|
||||
) -> str:
|
||||
"""
|
||||
Return the unique name of the endpoint (endpoint + version)
|
||||
Overwrite existing endpoint if already exists (outputs a warning)
|
||||
|
||||
:param canary: Canary endpoint router (overwrite existing endpoint if exists)
|
||||
:return: Unique canary ID (base_model_url)
|
||||
"""
|
||||
if not isinstance(canary, CanaryEP):
|
||||
canary = CanaryEP(**canary)
|
||||
if canary.load_endpoints and canary.load_endpoint_prefix:
|
||||
raise ValueError(
|
||||
"Could not add canary endpoint with both "
|
||||
"prefix ({}) and fixed set of endpoints ({})".format(
|
||||
canary.load_endpoints, canary.load_endpoint_prefix))
|
||||
name = canary.endpoint
|
||||
if name in self._canary_endpoints:
|
||||
print("Warning: Model monitoring \'{}\' overwritten".format(name))
|
||||
|
||||
self._canary_endpoints[name] = canary
|
||||
return name
|
||||
|
||||
def remove_canary_endpoint(self, endpoint_url: str) -> bool:
|
||||
"""
|
||||
Remove specific canary model endpoint, use base_model_url as unique identifier
|
||||
"""
|
||||
if endpoint_url not in self._canary_endpoints:
|
||||
return False
|
||||
self._canary_endpoints.pop(endpoint_url, None)
|
||||
return True
|
||||
|
||||
def deserialize(self, task: Task = None, prefetch_artifacts=False, skip_sync=False) -> bool:
|
||||
"""
|
||||
Restore ModelRequestProcessor state from Task
|
||||
return True if actually needed serialization, False nothing changed
|
||||
:param task: Load data from Task
|
||||
:param prefetch_artifacts: If True prefetch artifacts requested by the endpoints
|
||||
:param skip_sync: If True do not update the canary/monitoring state
|
||||
"""
|
||||
if not task:
|
||||
task = self._task
|
||||
configuration = task.get_parameters_as_dict().get("General") or {}
|
||||
endpoints = task.get_configuration_object_as_dict(name='endpoints') or {}
|
||||
canary_ep = task.get_configuration_object_as_dict(name='canary') or {}
|
||||
model_monitoring = task.get_configuration_object_as_dict(name='model_monitoring') or {}
|
||||
hashed_conf = hash_dict(dict(endpoints=endpoints, canary_ep=canary_ep, model_monitoring=model_monitoring))
|
||||
if self._last_update_hash == hashed_conf and not self._model_monitoring_update_request:
|
||||
return False
|
||||
print("Info: syncing model endpoint configuration, state hash={}".format(hashed_conf))
|
||||
self._last_update_hash = hashed_conf
|
||||
|
||||
endpoints = {
|
||||
k: ModelEndpoint(**{i: j for i, j in v.items() if hasattr(ModelEndpoint.__attrs_attrs__, i)})
|
||||
for k, v in endpoints.items()
|
||||
}
|
||||
model_monitoring = {
|
||||
k: ModelMonitoring(**{i: j for i, j in v.items() if hasattr(ModelMonitoring.__attrs_attrs__, i)})
|
||||
for k, v in model_monitoring.items()
|
||||
}
|
||||
canary_endpoints = {
|
||||
k: CanaryEP(**{i: j for i, j in v.items() if hasattr(CanaryEP.__attrs_attrs__, i)})
|
||||
for k, v in canary_ep.items()
|
||||
}
|
||||
|
||||
# if there is no need to sync Canary and Models we can just leave
|
||||
if skip_sync:
|
||||
self._endpoints = endpoints
|
||||
self._model_monitoring = model_monitoring
|
||||
self._canary_endpoints = canary_endpoints
|
||||
self._configuration = configuration
|
||||
return True
|
||||
|
||||
# make sure we only have one stall request at any given moment
|
||||
with self._update_lock_guard:
|
||||
# download artifacts
|
||||
# todo: separate into two, download before lock, and overwrite inside lock
|
||||
if prefetch_artifacts:
|
||||
for item in list(endpoints.values()) + list(model_monitoring.values()):
|
||||
if item.preprocess_artifact:
|
||||
# noinspection PyBroadException
|
||||
try:
|
||||
self._task.artifacts[item.preprocess_artifact].get_local_copy(
|
||||
extract_archive=True,
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
# stall all requests
|
||||
self._update_lock_flag = True
|
||||
# wait until we have no request processed
|
||||
while self._request_processing_state.value() != 0:
|
||||
sleep(1)
|
||||
|
||||
self._endpoints = endpoints
|
||||
self._model_monitoring = model_monitoring
|
||||
self._canary_endpoints = canary_endpoints
|
||||
self._configuration = configuration
|
||||
|
||||
# if we have models we need to sync, now is the time
|
||||
self._sync_monitored_models()
|
||||
|
||||
self._update_canary_lookup()
|
||||
|
||||
# release stall lock
|
||||
self._update_lock_flag = False
|
||||
|
||||
return True
|
||||
|
||||
def serialize(self, task: Optional[Task] = None) -> None:
|
||||
"""
|
||||
Store ModelRequestProcessor state into Task
|
||||
"""
|
||||
if not task:
|
||||
task = self._task
|
||||
config_dict = {k: v.as_dict(remove_null_entries=True) for k, v in self._endpoints.items()}
|
||||
task.set_configuration_object(name='endpoints', config_dict=config_dict)
|
||||
config_dict = {k: v.as_dict(remove_null_entries=True) for k, v in self._canary_endpoints.items()}
|
||||
task.set_configuration_object(name='canary', config_dict=config_dict)
|
||||
config_dict = {k: v.as_dict(remove_null_entries=True) for k, v in self._model_monitoring.items()}
|
||||
task.set_configuration_object(name='model_monitoring', config_dict=config_dict)
|
||||
|
||||
def _update_canary_lookup(self):
|
||||
canary_route = {}
|
||||
for k, v in self._canary_endpoints.items():
|
||||
if v.load_endpoint_prefix and v.load_endpoints:
|
||||
print("Warning: Canary has both prefix and fixed endpoints, ignoring canary endpoint")
|
||||
continue
|
||||
if v.load_endpoints:
|
||||
if len(v.load_endpoints) != len(v.weights):
|
||||
print("Warning: Canary \'{}\' weights [{}] do not match number of endpoints [{}], skipping!".format(
|
||||
k, v.weights, v.load_endpoints))
|
||||
continue
|
||||
endpoints = []
|
||||
weights = []
|
||||
for w, ep in zip(v.weights, v.load_endpoints):
|
||||
if ep not in self._endpoints and ep not in self._model_monitoring_endpoints:
|
||||
print("Warning: Canary \'{}\' endpoint \'{}\' could not be found, skipping".format(k, ep))
|
||||
continue
|
||||
endpoints.append(ep)
|
||||
weights.append(float(w))
|
||||
# normalize weights
|
||||
sum_weights = sum(weights)
|
||||
weights = [w/sum_weights for w in weights]
|
||||
canary_route[k] = dict(endpoints=endpoints, weights=weights)
|
||||
elif v.load_endpoint_prefix:
|
||||
endpoints = [ep for ep in list(self._endpoints.keys()) + list(self._model_monitoring_endpoints.keys())
|
||||
if str(ep).startswith(v.load_endpoint_prefix)]
|
||||
endpoints = sorted(
|
||||
endpoints,
|
||||
reverse=True,
|
||||
key=lambda x: '{}/{:0>9}'.format('/'.join(x.split('/')[:-1]), x.split('/')[-1]) if '/' in x else x
|
||||
)
|
||||
endpoints = endpoints[:len(v.weights)]
|
||||
weights = v.weights[:len(endpoints)]
|
||||
# normalize weights
|
||||
sum_weights = sum(weights)
|
||||
weights = [w/sum_weights for w in weights]
|
||||
canary_route[k] = dict(endpoints=endpoints, weights=weights)
|
||||
self._report_text(
|
||||
"Info: Canary endpoint \'{}\' selected [{}]".format(k, canary_route[k])
|
||||
)
|
||||
|
||||
# update back
|
||||
self._canary_route = canary_route
|
||||
|
||||
def _sync_monitored_models(self, force: bool = False) -> bool:
|
||||
if not force and not self._model_monitoring_update_request:
|
||||
return False
|
||||
dirty = False
|
||||
|
||||
for serving_base_url, versions_model_id_dict in self._model_monitoring_versions.items():
|
||||
# find existing endpoint versions
|
||||
for ep_base_url in list(self._model_monitoring_endpoints.keys()):
|
||||
# skip over endpoints that are not our own
|
||||
if not ep_base_url.startswith(serving_base_url+"/"):
|
||||
continue
|
||||
# find endpoint version
|
||||
_, version = ep_base_url.split("/", 1)
|
||||
if int(version) not in versions_model_id_dict:
|
||||
# remove old endpoint
|
||||
self._model_monitoring_endpoints.pop(ep_base_url, None)
|
||||
dirty = True
|
||||
continue
|
||||
|
||||
# add new endpoint
|
||||
for version, model_id in versions_model_id_dict.items():
|
||||
url = "{}/{}".format(serving_base_url, version)
|
||||
if url in self._model_monitoring_endpoints:
|
||||
continue
|
||||
model = self._model_monitoring.get(serving_base_url)
|
||||
if not model:
|
||||
# this should never happen
|
||||
continue
|
||||
ep = ModelEndpoint(
|
||||
engine_type=model.engine_type,
|
||||
serving_url=serving_base_url,
|
||||
model_id=model_id,
|
||||
version=str(version),
|
||||
preprocess_artifact=model.preprocess_artifact,
|
||||
input_size=model.input_size,
|
||||
input_type=model.input_type,
|
||||
output_size=model.output_size,
|
||||
output_type=model.output_type
|
||||
)
|
||||
self._model_monitoring_endpoints[url] = ep
|
||||
dirty = True
|
||||
|
||||
# filter out old model monitoring endpoints
|
||||
for ep_url in list(self._model_monitoring_endpoints.keys()):
|
||||
if not any(True for url in self._model_monitoring_versions if ep_url.startswith(url+"/")):
|
||||
self._model_monitoring_endpoints.pop(ep_url, None)
|
||||
dirty = True
|
||||
|
||||
# reset flag
|
||||
self._model_monitoring_update_request = False
|
||||
|
||||
if dirty:
|
||||
config_dict = {k: v.as_dict(remove_null_entries=True) for k, v in self._model_monitoring_endpoints.items()}
|
||||
self._task.set_configuration_object(name='model_monitoring_eps', config_dict=config_dict)
|
||||
|
||||
return dirty
|
||||
|
||||
def _update_monitored_models(self):
|
||||
for model in self._model_monitoring.values():
|
||||
current_served_models = self._model_monitoring_versions.get(model.base_serving_url, {})
|
||||
# To Do: sort by updated time ?
|
||||
models = Model.query_models(
|
||||
project_name=model.monitor_project or None,
|
||||
model_name=model.monitor_name or None,
|
||||
tags=model.monitor_tags or None,
|
||||
only_published=model.only_published,
|
||||
max_results=model.max_versions,
|
||||
include_archived=False,
|
||||
)
|
||||
|
||||
# check what we already have:
|
||||
current_model_id_version_lookup = dict(
|
||||
zip(list(current_served_models.values()), list(current_served_models.keys()))
|
||||
)
|
||||
versions = sorted(current_served_models.keys(), reverse=True)
|
||||
|
||||
# notice, most updated model first
|
||||
# first select only the new models
|
||||
model_ids = [m.id for m in models]
|
||||
|
||||
# we want last updated model to be last (so it gets the highest version number)
|
||||
max_v = 1 + (versions[0] if versions else 0)
|
||||
versions_model_ids = []
|
||||
for m_id in reversed(model_ids):
|
||||
v = current_model_id_version_lookup.get(m_id)
|
||||
if v is None:
|
||||
v = max_v
|
||||
max_v += 1
|
||||
versions_model_ids.append((v, m_id))
|
||||
|
||||
# remove extra entries (old models)
|
||||
versions_model_ids_dict = dict(versions_model_ids[:model.max_versions])
|
||||
|
||||
# mark dirty if something changed:
|
||||
if versions_model_ids_dict != current_served_models:
|
||||
self._model_monitoring_update_request = True
|
||||
|
||||
# update model serving state
|
||||
self._model_monitoring_versions[model.base_serving_url] = versions_model_ids_dict
|
||||
|
||||
if not self._model_monitoring_update_request:
|
||||
return False
|
||||
|
||||
self._report_text("INFO: Monitored Models updated: {}".format(
|
||||
json.dumps(self._model_monitoring_versions, indent=2))
|
||||
)
|
||||
return True
|
||||
|
||||
def launch(self, poll_frequency_sec=300):
|
||||
"""
|
||||
Launch the background synchronization thread and monitoring thread
|
||||
(updating runtime process based on changes on the Task, and monitoring model changes in the system)
|
||||
:param poll_frequency_sec: Sync every X seconds (default 300 seconds)
|
||||
"""
|
||||
if self._sync_daemon_thread:
|
||||
return
|
||||
|
||||
# read state
|
||||
self.deserialize(self._task, prefetch_artifacts=True)
|
||||
# model monitoring sync
|
||||
if self._update_monitored_models():
|
||||
# update endpoints
|
||||
self.deserialize(self._task, prefetch_artifacts=True)
|
||||
|
||||
# get the serving instance (for visibility and monitoring)
|
||||
self._instance_task = Task.current_task()
|
||||
|
||||
# start the background thread
|
||||
with self._update_lock_guard:
|
||||
if self._sync_daemon_thread:
|
||||
return
|
||||
self._sync_daemon_thread = threading.Thread(
|
||||
target=self._sync_daemon, args=(poll_frequency_sec, ), daemon=True)
|
||||
self._sync_daemon_thread.start()
|
||||
# we return immediately
|
||||
|
||||
def _sync_daemon(self, poll_frequency_sec=300):
|
||||
"""
|
||||
Background thread, syncing model changes into request service.
|
||||
"""
|
||||
poll_frequency_sec = float(poll_frequency_sec)
|
||||
# force mark started on the main serving service task
|
||||
self._task.mark_started(force=True)
|
||||
self._report_text("Launching - configuration sync every {} sec".format(poll_frequency_sec))
|
||||
cleanup = False
|
||||
self._update_serving_plot()
|
||||
while True:
|
||||
try:
|
||||
# this should be the only place where we call deserialize
|
||||
self._task.reload()
|
||||
if self.deserialize(self._task):
|
||||
self._report_text("New configuration updated")
|
||||
# mark clean up for next round
|
||||
cleanup = True
|
||||
# model monitoring sync
|
||||
if self._update_monitored_models():
|
||||
self._report_text("Model monitoring synced")
|
||||
# update endpoints
|
||||
self.deserialize(self._task)
|
||||
# mark clean up for next round
|
||||
cleanup = True
|
||||
# update serving layout plot
|
||||
if cleanup:
|
||||
self._update_serving_plot()
|
||||
except Exception as ex:
|
||||
print("Exception occurred in monitoring thread: {}".format(ex))
|
||||
sleep(poll_frequency_sec)
|
||||
try:
|
||||
# we assume that by now all old deleted endpoints requests already returned
|
||||
if cleanup:
|
||||
cleanup = False
|
||||
for k in list(self._engine_processor_lookup.keys()):
|
||||
if k not in self._endpoints:
|
||||
# atomic
|
||||
self._engine_processor_lookup.pop(k, None)
|
||||
except Exception as ex:
|
||||
print("Exception occurred in monitoring thread: {}".format(ex))
|
||||
|
||||
def get_id(self) -> str:
|
||||
return self._task.id
|
||||
|
||||
def get_endpoints(self) -> Dict[str, ModelEndpoint]:
|
||||
endpoints = dict(**self._endpoints)
|
||||
endpoints.update(**self._model_monitoring_endpoints)
|
||||
return endpoints
|
||||
|
||||
def get_synced_endpoints(self) -> Dict[str, ModelEndpoint]:
|
||||
self._task.reload()
|
||||
_endpoints = self._task.get_configuration_object_as_dict(name='endpoints') or {}
|
||||
_monitor_endpoints = self._task.get_configuration_object_as_dict(name='model_monitoring_eps') or {}
|
||||
endpoints = {
|
||||
k: ModelEndpoint(**{i: j for i, j in v.items() if hasattr(ModelEndpoint.__attrs_attrs__, i)})
|
||||
for k, v in _endpoints.items()}
|
||||
endpoints.update({
|
||||
k: ModelEndpoint(**{i: j for i, j in v.items() if hasattr(ModelEndpoint.__attrs_attrs__, i)})
|
||||
for k, v in _monitor_endpoints.items()
|
||||
})
|
||||
return endpoints
|
||||
|
||||
def get_canary_endpoints(self) -> dict:
|
||||
return self._canary_endpoints
|
||||
|
||||
def get_model_monitoring(self) -> dict:
|
||||
return self._model_monitoring
|
||||
|
||||
def _get_instance_id(self) -> Optional[str]:
|
||||
return self._instance_task.id if self._instance_task else None
|
||||
|
||||
def _report_text(self, text) -> Optional[str]:
|
||||
return self._task.get_logger().report_text("Instance [{}, pid={}]: {}".format(
|
||||
self._get_instance_id(), os.getpid(), text))
|
||||
|
||||
def _update_serving_plot(self) -> None:
|
||||
"""
|
||||
Update the endpoint serving graph on the serving instance Task
|
||||
"""
|
||||
if not self._instance_task:
|
||||
return
|
||||
|
||||
# Generate configuration table and details
|
||||
endpoints = list(self._endpoints.values()) + list(self._model_monitoring_endpoints.values())
|
||||
if not endpoints:
|
||||
# clear plot if we had any
|
||||
return
|
||||
|
||||
endpoints = [e.as_dict() for e in endpoints]
|
||||
table_values = [list(endpoints[0].keys())]
|
||||
table_values += [[e[c] or "" for c in table_values[0]] for e in endpoints]
|
||||
self._instance_task.get_logger().report_table(
|
||||
title='Serving Endpoint Configuration', series='Details', iteration=0, table_plot=table_values,
|
||||
extra_layout={"title": "Model Endpoints Details"})
|
||||
|
||||
# generate current endpoint view
|
||||
sankey_node = dict(
|
||||
label=[],
|
||||
color=[],
|
||||
customdata=[],
|
||||
hovertemplate='%{customdata}<extra></extra>',
|
||||
hoverlabel={"align": "left"},
|
||||
)
|
||||
sankey_link = dict(
|
||||
source=[],
|
||||
target=[],
|
||||
value=[],
|
||||
hovertemplate='<extra></extra>',
|
||||
)
|
||||
# root
|
||||
sankey_node['color'].append("mediumpurple")
|
||||
sankey_node['label'].append('{}'.format('external'))
|
||||
sankey_node['customdata'].append("")
|
||||
|
||||
sankey_node_idx = {}
|
||||
|
||||
# base_url = self._task._get_app_server() + '/projects/*/models/{model_id}/general'
|
||||
|
||||
# draw all static endpoints
|
||||
# noinspection PyProtectedMember
|
||||
for i, ep in enumerate(endpoints):
|
||||
serve_url = ep['serving_url']
|
||||
full_url = '{}/{}'.format(serve_url, ep['version'] or "")
|
||||
sankey_node['color'].append("blue")
|
||||
sankey_node['label'].append("/{}/".format(full_url.strip("/")))
|
||||
sankey_node['customdata'].append(
|
||||
"model id: {}".format(ep['model_id'])
|
||||
)
|
||||
sankey_link['source'].append(0)
|
||||
sankey_link['target'].append(i + 1)
|
||||
sankey_link['value'].append(1. / len(self._endpoints))
|
||||
sankey_node_idx[full_url] = i + 1
|
||||
|
||||
# draw all model monitoring
|
||||
sankey_node['color'].append("mediumpurple")
|
||||
sankey_node['label'].append('{}'.format('monitoring models'))
|
||||
sankey_node['customdata'].append("")
|
||||
monitoring_root_idx = len(sankey_node['customdata']) - 1
|
||||
|
||||
for i, m in enumerate(self._model_monitoring.values()):
|
||||
serve_url = m.base_serving_url
|
||||
sankey_node['color'].append("purple")
|
||||
sankey_node['label'].append('{}'.format(serve_url))
|
||||
sankey_node['customdata'].append(
|
||||
"project: {}<br />name: {}<br />tags: {}".format(
|
||||
m.monitor_project or '', m.monitor_name or '', m.monitor_tags or '')
|
||||
)
|
||||
sankey_link['source'].append(monitoring_root_idx)
|
||||
sankey_link['target'].append(monitoring_root_idx + i + 1)
|
||||
sankey_link['value'].append(1. / len(self._model_monitoring))
|
||||
|
||||
# add links to the current models
|
||||
serve_url = serve_url.rstrip("/") + "/"
|
||||
for k in sankey_node_idx:
|
||||
if k.startswith(serve_url):
|
||||
sankey_link['source'].append(monitoring_root_idx + i + 1)
|
||||
sankey_link['target'].append(sankey_node_idx[k])
|
||||
sankey_link['value'].append(1.0 / m.max_versions)
|
||||
|
||||
# add canary endpoints
|
||||
# sankey_node['color'].append("mediumpurple")
|
||||
# sankey_node['label'].append('{}'.format('Canary endpoints'))
|
||||
# sankey_node['customdata'].append("")
|
||||
canary_root_idx = len(sankey_node['customdata']) - 1
|
||||
|
||||
# sankey_link['source'].append(0)
|
||||
# sankey_link['target'].append(canary_root_idx)
|
||||
# sankey_link['value'].append(1.)
|
||||
|
||||
for i, c in enumerate(self._canary_endpoints.values()):
|
||||
serve_url = c.endpoint
|
||||
sankey_node['color'].append("green")
|
||||
sankey_node['label'].append('CANARY: /{}/'.format(serve_url.strip("/")))
|
||||
sankey_node['customdata'].append(
|
||||
"outputs: {}".format(
|
||||
c.load_endpoints or c.load_endpoint_prefix)
|
||||
)
|
||||
sankey_link['source'].append(0)
|
||||
sankey_link['target'].append(canary_root_idx + i + 1)
|
||||
sankey_link['value'].append(1. / len(self._canary_endpoints))
|
||||
|
||||
# add links to the current models
|
||||
if serve_url not in self._canary_route:
|
||||
continue
|
||||
for ep, w in zip(self._canary_route[serve_url]['endpoints'], self._canary_route[serve_url]['weights']):
|
||||
idx = sankey_node_idx.get(ep)
|
||||
if idx is None:
|
||||
continue
|
||||
sankey_link['source'].append(canary_root_idx + i + 1)
|
||||
sankey_link['target'].append(idx)
|
||||
sankey_link['value'].append(w)
|
||||
|
||||
# create the sankey graph
|
||||
dag_flow = dict(
|
||||
link=sankey_link,
|
||||
node=sankey_node,
|
||||
textfont=dict(color='rgba(0,0,0,255)', size=10),
|
||||
type='sankey',
|
||||
orientation='h'
|
||||
)
|
||||
fig = dict(data=[dag_flow], layout={'xaxis': {'visible': False}, 'yaxis': {'visible': False}})
|
||||
|
||||
self._instance_task.get_logger().report_plotly(
|
||||
title='Serving Endpoints Layout', series='', iteration=0, figure=fig)
|
||||
|
||||
@staticmethod
|
||||
def _process_request(processor: BasePreprocessRequest, url: str, body: dict) -> dict:
|
||||
# todo: add some statistics
|
||||
preprocessed = processor.preprocess(body)
|
||||
processed = processor.process(data=preprocessed)
|
||||
return processor.postprocess(data=processed)
|
||||
|
||||
@classmethod
|
||||
def list_control_plane_tasks(
|
||||
cls,
|
||||
task_id: Optional[str] = None,
|
||||
name: Optional[str] = None,
|
||||
project: Optional[str] = None,
|
||||
tags: Optional[List[str]] = None
|
||||
) -> List[dict]:
|
||||
|
||||
# noinspection PyProtectedMember
|
||||
tasks = Task.query_tasks(
|
||||
task_name=name or None,
|
||||
project_name=project or None,
|
||||
tags=tags or None,
|
||||
additional_return_fields=["id", "name", "project", "tags"],
|
||||
task_filter={'type': ['service'],
|
||||
'status': ["created", "in_progress"],
|
||||
'system_tags': [cls._system_tag]}
|
||||
) # type: List[dict]
|
||||
if not tasks:
|
||||
return []
|
||||
|
||||
for t in tasks:
|
||||
# noinspection PyProtectedMember
|
||||
t['project'] = Task._get_project_name(t['project'])
|
||||
|
||||
return tasks
|
||||
|
||||
@classmethod
|
||||
def _get_control_plane_task(
|
||||
cls,
|
||||
task_id: Optional[str] = None,
|
||||
name: Optional[str] = None,
|
||||
project: Optional[str] = None,
|
||||
tags: Optional[List[str]] = None,
|
||||
disable_change_state: bool = False,
|
||||
) -> Task:
|
||||
if task_id:
|
||||
task = Task.get_task(task_id=task_id)
|
||||
if not task:
|
||||
raise ValueError("Could not find Control Task ID={}".format(task_id))
|
||||
task_status = task.status
|
||||
if task_status not in ("created", "in_progress",):
|
||||
if disable_change_state:
|
||||
raise ValueError(
|
||||
"Could Control Task ID={} status [{}] "
|
||||
"is not valid (only 'draft', 'running' are supported)".format(task_id, task_status))
|
||||
else:
|
||||
task.mark_started(force=True)
|
||||
return task
|
||||
|
||||
# noinspection PyProtectedMember
|
||||
tasks = Task.query_tasks(
|
||||
task_name=name or None,
|
||||
project_name=project or None,
|
||||
tags=tags or None,
|
||||
task_filter={'type': ['service'],
|
||||
'status': ["created", "in_progress"],
|
||||
'system_tags': [cls._system_tag]}
|
||||
)
|
||||
if not tasks:
|
||||
raise ValueError("Could not find any valid Control Tasks")
|
||||
|
||||
if len(tasks) > 1:
|
||||
print("Warning: more than one valid Controller Tasks found, using Task ID={}".format(tasks[0]))
|
||||
|
||||
return Task.get_task(task_id=tasks[0])
|
||||
|
||||
@classmethod
|
||||
def _create_task(
|
||||
cls,
|
||||
name: Optional[str] = None,
|
||||
project: Optional[str] = None,
|
||||
tags: Optional[List[str]] = None
|
||||
) -> Task:
|
||||
task = Task.create(
|
||||
project_name=project or "DevOps",
|
||||
task_name=name or "Serving Service",
|
||||
task_type="service",
|
||||
)
|
||||
task.set_system_tags([cls._system_tag])
|
||||
if tags:
|
||||
task.set_tags(tags)
|
||||
return task
|
||||
|
||||
@classmethod
|
||||
def _normalize_endpoint_url(cls, endpoint: str, version : Optional[str] = None) -> str:
|
||||
return "{}/{}".format(endpoint.rstrip("/"), version or "").rstrip("/")
|
||||
|
||||
@classmethod
|
||||
def _validate_model(cls, endpoint: Union[ModelEndpoint, ModelMonitoring]) -> bool:
|
||||
"""
|
||||
Raise exception if validation fails, otherwise return True
|
||||
"""
|
||||
if endpoint.engine_type in ("triton", ):
|
||||
# verify we have all the info we need
|
||||
d = endpoint.as_dict()
|
||||
missing = [
|
||||
k for k in [
|
||||
'input_type', 'input_size', 'input_name',
|
||||
'output_type', 'output_size', 'output_name',
|
||||
] if not d.get(k)
|
||||
]
|
||||
if not endpoint.auxiliary_cfg and missing:
|
||||
raise ValueError("Triton engine requires input description - missing values in {}".format(missing))
|
||||
return True
|
||||
|
||||
356
clearml_serving/serving/preprocess_service.py
Normal file
356
clearml_serving/serving/preprocess_service.py
Normal file
@@ -0,0 +1,356 @@
|
||||
import numpy as np
|
||||
from typing import Optional, Any, Callable, List
|
||||
|
||||
from attr import attrib, attrs, asdict
|
||||
|
||||
from clearml import Task, Model
|
||||
from clearml.binding.artifacts import Artifacts
|
||||
from clearml.storage.util import sha256sum
|
||||
|
||||
|
||||
def _engine_validator(inst, attr, value): # noqa
|
||||
if not BasePreprocessRequest.validate_engine_type(value):
|
||||
raise TypeError("{} not supported engine type".format(value))
|
||||
|
||||
|
||||
def _matrix_type_validator(inst, attr, value): # noqa
|
||||
if value and not np.dtype(value):
|
||||
raise TypeError("{} not supported matrix type".format(value))
|
||||
|
||||
|
||||
@attrs
|
||||
class ModelMonitoring(object):
|
||||
base_serving_url = attrib(type=str) # serving point url prefix (example: "detect_cat")
|
||||
monitor_project = attrib(type=str) # monitor model project (for model auto update)
|
||||
monitor_name = attrib(type=str) # monitor model name (for model auto update, regexp selection)
|
||||
monitor_tags = attrib(type=list) # monitor model tag (for model auto update)
|
||||
engine_type = attrib(type=str, validator=_engine_validator) # engine type
|
||||
only_published = attrib(type=bool, default=False) # only select published models
|
||||
max_versions = attrib(type=int, default=None) # Maximum number of models to keep serving (latest X models)
|
||||
input_size = attrib(type=list, default=None) # optional, model matrix size
|
||||
input_type = attrib(type=str, default=None, validator=_matrix_type_validator) # optional, model matrix type
|
||||
input_name = attrib(type=str, default=None) # optional, layer name to push the input to
|
||||
output_size = attrib(type=list, default=None) # optional, model matrix size
|
||||
output_type = attrib(type=str, default=None, validator=_matrix_type_validator) # optional, model matrix type
|
||||
output_name = attrib(type=str, default=None) # optional, layer name to pull the results from
|
||||
preprocess_artifact = attrib(
|
||||
type=str, default=None) # optional artifact name storing the model preprocessing code
|
||||
auxiliary_cfg = attrib(type=dict, default=None) # Auxiliary configuration (e.g. triton conf), Union[str, dict]
|
||||
|
||||
def as_dict(self, remove_null_entries=False):
|
||||
if not remove_null_entries:
|
||||
return asdict(self)
|
||||
return {k: v for k, v in asdict(self).items() if v is not None}
|
||||
|
||||
|
||||
@attrs
|
||||
class ModelEndpoint(object):
|
||||
engine_type = attrib(type=str, validator=_engine_validator) # engine type
|
||||
serving_url = attrib(type=str) # full serving point url (including version) example: "detect_cat/v1"
|
||||
model_id = attrib(type=str) # list of model IDs to serve (order implies versions first is v1)
|
||||
version = attrib(type=str, default="") # key (version string), default no version
|
||||
preprocess_artifact = attrib(
|
||||
type=str, default=None) # optional artifact name storing the model preprocessing code
|
||||
input_size = attrib(type=list, default=None) # optional, model matrix size
|
||||
input_type = attrib(type=str, default=None, validator=_matrix_type_validator) # optional, model matrix type
|
||||
input_name = attrib(type=str, default=None) # optional, layer name to push the input to
|
||||
output_size = attrib(type=list, default=None) # optional, model matrix size
|
||||
output_type = attrib(type=str, default=None, validator=_matrix_type_validator) # optional, model matrix type
|
||||
output_name = attrib(type=str, default=None) # optional, layer name to pull the results from
|
||||
auxiliary_cfg = attrib(type=dict, default=None) # Optional: Auxiliary configuration (e.g. triton conf), [str, dict]
|
||||
|
||||
def as_dict(self, remove_null_entries=False):
|
||||
if not remove_null_entries:
|
||||
return asdict(self)
|
||||
return {k: v for k, v in asdict(self).items() if v is not None}
|
||||
|
||||
|
||||
class BasePreprocessRequest(object):
|
||||
__preprocessing_lookup = {}
|
||||
__preprocessing_modules = set()
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
model_endpoint: ModelEndpoint,
|
||||
task: Task = None,
|
||||
server_config: dict = None,
|
||||
):
|
||||
"""
|
||||
Notice this object is not be created per request, but once per Process
|
||||
Make sure it is always thread-safe
|
||||
"""
|
||||
self.model_endpoint = model_endpoint
|
||||
self._preprocess = None
|
||||
self._model = None
|
||||
self._server_config = server_config or {}
|
||||
# load preprocessing code here
|
||||
if self.model_endpoint.preprocess_artifact:
|
||||
if not task or self.model_endpoint.preprocess_artifact not in task.artifacts:
|
||||
print("Warning: could not find preprocessing artifact \'{}\' on Task id={}".format(
|
||||
self.model_endpoint.preprocess_artifact, task.id))
|
||||
else:
|
||||
try:
|
||||
path = task.artifacts[self.model_endpoint.preprocess_artifact].get_local_copy()
|
||||
# check file content hash, should only happens once?!
|
||||
# noinspection PyProtectedMember
|
||||
file_hash, _ = sha256sum(path, block_size=Artifacts._hash_block_size)
|
||||
if file_hash != task.artifacts[self.model_endpoint.preprocess_artifact].hash:
|
||||
print("INFO: re-downloading artifact '{}' hash changed".format(
|
||||
self.model_endpoint.preprocess_artifact))
|
||||
path = task.artifacts[self.model_endpoint.preprocess_artifact].get_local_copy(
|
||||
extract_archive=True,
|
||||
force_download=True,
|
||||
)
|
||||
else:
|
||||
# extract zip if we need to, otherwise it will be the same
|
||||
path = task.artifacts[self.model_endpoint.preprocess_artifact].get_local_copy(
|
||||
extract_archive=True,
|
||||
)
|
||||
|
||||
import importlib.util
|
||||
spec = importlib.util.spec_from_file_location("Preprocess", path)
|
||||
_preprocess = importlib.util.module_from_spec(spec)
|
||||
spec.loader.exec_module(_preprocess)
|
||||
self._preprocess = _preprocess.Preprocess() # noqa
|
||||
self._preprocess.serving_config = server_config or {}
|
||||
if callable(getattr(self._preprocess, 'load', None)):
|
||||
self._model = self._preprocess.load(self._get_local_model_file())
|
||||
except Exception as ex:
|
||||
print("Warning: Failed loading preprocess code for \'{}\': {}".format(
|
||||
self.model_endpoint.preprocess_artifact, ex))
|
||||
|
||||
def preprocess(self, request):
|
||||
# type: (dict) -> Optional[Any]
|
||||
"""
|
||||
Raise exception to report an error
|
||||
Return value will be passed to serving engine
|
||||
"""
|
||||
if self._preprocess is not None:
|
||||
return self._preprocess.preprocess(request)
|
||||
return request
|
||||
|
||||
def postprocess(self, data):
|
||||
# type: (Any) -> Optional[dict]
|
||||
"""
|
||||
Raise exception to report an error
|
||||
Return value will be passed to serving engine
|
||||
"""
|
||||
if self._preprocess is not None:
|
||||
return self._preprocess.postprocess(data)
|
||||
return data
|
||||
|
||||
def process(self, data: Any) -> Any:
|
||||
"""
|
||||
The actual processing function. Can be send to external service
|
||||
"""
|
||||
pass
|
||||
|
||||
def _get_local_model_file(self):
|
||||
model_repo_object = Model(model_id=self.model_endpoint.model_id)
|
||||
return model_repo_object.get_local_copy()
|
||||
|
||||
@classmethod
|
||||
def validate_engine_type(cls, engine: str) -> bool:
|
||||
return engine in cls.__preprocessing_lookup
|
||||
|
||||
@classmethod
|
||||
def get_engine_cls(cls, engine: str) -> Callable:
|
||||
return cls.__preprocessing_lookup.get(engine)
|
||||
|
||||
@staticmethod
|
||||
def register_engine(engine_name: str, modules: Optional[List[str]] = None) -> Callable:
|
||||
"""
|
||||
A decorator to register an annotation type name for classes deriving from Annotation
|
||||
"""
|
||||
def wrapper(cls):
|
||||
cls.__preprocessing_lookup[engine_name] = cls
|
||||
return cls
|
||||
|
||||
if modules:
|
||||
BasePreprocessRequest.__preprocessing_modules |= set(modules)
|
||||
|
||||
return wrapper
|
||||
|
||||
@staticmethod
|
||||
def load_modules() -> None:
|
||||
for m in BasePreprocessRequest.__preprocessing_modules:
|
||||
try:
|
||||
# silently fail
|
||||
import importlib
|
||||
importlib.import_module(m)
|
||||
except (ImportError, TypeError):
|
||||
pass
|
||||
|
||||
|
||||
@BasePreprocessRequest.register_engine("triton", modules=["grpc", "tritonclient"])
|
||||
class TritonPreprocessRequest(BasePreprocessRequest):
|
||||
_content_lookup = {
|
||||
np.uint8: 'uint_contents',
|
||||
np.int8: 'int_contents',
|
||||
np.int64: 'int64_contents',
|
||||
np.uint64: 'uint64_contents',
|
||||
np.int: 'int_contents',
|
||||
np.uint: 'uint_contents',
|
||||
np.bool: 'bool_contents',
|
||||
np.float32: 'fp32_contents',
|
||||
np.float64: 'fp64_contents',
|
||||
}
|
||||
_ext_grpc = None
|
||||
_ext_np_to_triton_dtype = None
|
||||
_ext_service_pb2 = None
|
||||
_ext_service_pb2_grpc = None
|
||||
|
||||
def __init__(self, model_endpoint: ModelEndpoint, task: Task = None, server_config: dict = None):
|
||||
super(TritonPreprocessRequest, self).__init__(
|
||||
model_endpoint=model_endpoint, task=task, server_config=server_config)
|
||||
|
||||
# load Triton Module
|
||||
if self._ext_grpc is None:
|
||||
import grpc
|
||||
self._ext_grpc = grpc
|
||||
|
||||
if self._ext_np_to_triton_dtype is None:
|
||||
from tritonclient.utils import np_to_triton_dtype
|
||||
self._ext_np_to_triton_dtype = np_to_triton_dtype
|
||||
|
||||
if self._ext_service_pb2 is None:
|
||||
from tritonclient.grpc import service_pb2, service_pb2_grpc
|
||||
self._ext_service_pb2 = service_pb2
|
||||
self._ext_service_pb2_grpc = service_pb2_grpc
|
||||
|
||||
def process(self, data: Any) -> Any:
|
||||
"""
|
||||
The actual processing function.
|
||||
Detect gRPC server and send the request to it
|
||||
"""
|
||||
# allow to override bt preprocessing class
|
||||
if self._preprocess is not None and getattr(self._preprocess, "process", None):
|
||||
return self._preprocess.process(data)
|
||||
|
||||
# Create gRPC stub for communicating with the server
|
||||
triton_server_address = self._server_config.get("triton_grpc_server")
|
||||
if not triton_server_address:
|
||||
raise ValueError("External Triton gRPC server is not configured!")
|
||||
try:
|
||||
channel = self._ext_grpc.insecure_channel(triton_server_address)
|
||||
grpc_stub = self._ext_service_pb2_grpc.GRPCInferenceServiceStub(channel)
|
||||
except Exception as ex:
|
||||
raise ValueError("External Triton gRPC server misconfigured [{}]: {}".format(triton_server_address, ex))
|
||||
|
||||
# Generate the request
|
||||
request = self._ext_service_pb2.ModelInferRequest()
|
||||
request.model_name = "{}/{}".format(self.model_endpoint.serving_url, self.model_endpoint.version).strip("/")
|
||||
# we do not use the Triton model versions, we just assume a single version per endpoint
|
||||
request.model_version = "1"
|
||||
|
||||
# take the input data
|
||||
input_data = np.array(data, dtype=self.model_endpoint.input_type)
|
||||
|
||||
# Populate the inputs in inference request
|
||||
input0 = request.InferInputTensor()
|
||||
input0.name = self.model_endpoint.input_name
|
||||
input_dtype = np.dtype(self.model_endpoint.input_type).type
|
||||
input0.datatype = self._ext_np_to_triton_dtype(input_dtype)
|
||||
input0.shape.extend(self.model_endpoint.input_size)
|
||||
|
||||
# to be inferred
|
||||
input_func = self._content_lookup.get(input_dtype)
|
||||
if not input_func:
|
||||
raise ValueError("Input type nt supported {}".format(input_dtype))
|
||||
input_func = getattr(input0.contents, input_func)
|
||||
input_func[:] = input_data.flatten()
|
||||
|
||||
# push into request
|
||||
request.inputs.extend([input0])
|
||||
|
||||
# Populate the outputs in the inference request
|
||||
output0 = request.InferRequestedOutputTensor()
|
||||
output0.name = self.model_endpoint.output_name
|
||||
|
||||
request.outputs.extend([output0])
|
||||
response = grpc_stub.ModelInfer(request, compression=self._ext_grpc.Compression.Gzip)
|
||||
|
||||
output_results = []
|
||||
index = 0
|
||||
for output in response.outputs:
|
||||
shape = []
|
||||
for value in output.shape:
|
||||
shape.append(value)
|
||||
output_results.append(
|
||||
np.frombuffer(response.raw_output_contents[index], dtype=self.model_endpoint.output_type))
|
||||
output_results[-1] = np.resize(output_results[-1], shape)
|
||||
index += 1
|
||||
|
||||
# if we have a single matrix, return it as is
|
||||
return output_results[0] if index == 1 else output_results
|
||||
|
||||
|
||||
@BasePreprocessRequest.register_engine("sklearn", modules=["joblib", "sklearn"])
|
||||
class SKLearnPreprocessRequest(BasePreprocessRequest):
|
||||
def __init__(self, model_endpoint: ModelEndpoint, task: Task = None, server_config: dict = None):
|
||||
super(SKLearnPreprocessRequest, self).__init__(
|
||||
model_endpoint=model_endpoint, task=task, server_config=server_config)
|
||||
if self._model is None:
|
||||
# get model
|
||||
import joblib
|
||||
self._model = joblib.load(filename=self._get_local_model_file())
|
||||
|
||||
def process(self, data: Any) -> Any:
|
||||
"""
|
||||
The actual processing function.
|
||||
We run the model in this context
|
||||
"""
|
||||
return self._model.predict(data)
|
||||
|
||||
|
||||
@BasePreprocessRequest.register_engine("xgboost", modules=["xgboost"])
|
||||
class XGBoostPreprocessRequest(BasePreprocessRequest):
|
||||
def __init__(self, model_endpoint: ModelEndpoint, task: Task = None, server_config: dict = None):
|
||||
super(XGBoostPreprocessRequest, self).__init__(
|
||||
model_endpoint=model_endpoint, task=task, server_config=server_config)
|
||||
if self._model is None:
|
||||
# get model
|
||||
import xgboost
|
||||
self._model = xgboost.Booster()
|
||||
self._model.load_model(self._get_local_model_file())
|
||||
|
||||
def process(self, data: Any) -> Any:
|
||||
"""
|
||||
The actual processing function.
|
||||
We run the model in this context
|
||||
"""
|
||||
return self._model.predict(data)
|
||||
|
||||
|
||||
@BasePreprocessRequest.register_engine("lightgbm", modules=["lightgbm"])
|
||||
class LightGBMPreprocessRequest(BasePreprocessRequest):
|
||||
def __init__(self, model_endpoint: ModelEndpoint, task: Task = None, server_config: dict = None):
|
||||
super(LightGBMPreprocessRequest, self).__init__(
|
||||
model_endpoint=model_endpoint, task=task, server_config=server_config)
|
||||
if self._model is None:
|
||||
# get model
|
||||
import lightgbm
|
||||
self._model = lightgbm.Booster(model_file=self._get_local_model_file())
|
||||
|
||||
def process(self, data: Any) -> Any:
|
||||
"""
|
||||
The actual processing function.
|
||||
We run the model in this context
|
||||
"""
|
||||
return self._model.predict(data)
|
||||
|
||||
|
||||
@BasePreprocessRequest.register_engine("custom")
|
||||
class CustomPreprocessRequest(BasePreprocessRequest):
|
||||
def __init__(self, model_endpoint: ModelEndpoint, task: Task = None, server_config: dict = None):
|
||||
super(CustomPreprocessRequest, self).__init__(
|
||||
model_endpoint=model_endpoint, task=task, server_config=server_config)
|
||||
|
||||
def process(self, data: Any) -> Any:
|
||||
"""
|
||||
The actual processing function.
|
||||
We run the process in this context
|
||||
"""
|
||||
if self._preprocess is not None:
|
||||
return self._preprocess.process(data)
|
||||
return None
|
||||
14
clearml_serving/serving/requirements.txt
Normal file
14
clearml_serving/serving/requirements.txt
Normal file
@@ -0,0 +1,14 @@
|
||||
clearml >= 1.1.6
|
||||
attrs
|
||||
fastapi[all]
|
||||
uvicorn[standard]
|
||||
gunicorn
|
||||
pyzmq
|
||||
asyncio
|
||||
aiocache
|
||||
tritonclient[grpc]
|
||||
numpy
|
||||
pandas
|
||||
scikit-learn
|
||||
grpcio
|
||||
Pillow
|
||||
@@ -1,589 +0,0 @@
|
||||
import json
|
||||
import shutil
|
||||
from logging import getLogger
|
||||
from pathlib import Path as Path3
|
||||
from time import time
|
||||
from typing import Optional, Union, Dict, Sequence
|
||||
|
||||
from attr import attrib, attrs, asdict
|
||||
from pathlib2 import Path
|
||||
|
||||
from clearml import Task, Model, InputModel
|
||||
|
||||
|
||||
class ServingService(object):
|
||||
_config_pbtxt_section = 'config.pbtxt'
|
||||
_supported_serving_engines = ('triton', 'ovms', 'kfserving')
|
||||
|
||||
@attrs
|
||||
class EndPoint(object):
|
||||
serving_url = attrib(type=str)
|
||||
model_ids = attrib(type=list)
|
||||
model_project = attrib(type=str)
|
||||
model_name = attrib(type=str)
|
||||
model_tags = attrib(type=list)
|
||||
model_config_blob = attrib(type=str, default=None)
|
||||
max_num_revisions = attrib(type=int, default=None)
|
||||
versions = attrib(type=dict, default={})
|
||||
|
||||
def as_dict(self):
|
||||
return asdict(self)
|
||||
|
||||
def __init__(self, task_id=None, task_project=None, task_name=None, task=None, engine_type='triton'):
|
||||
# type: (Optional[str], Optional[str], Optional[str], Optional[Task], Optional[str]) -> None
|
||||
"""
|
||||
:param task_id: Optional specify existing Task ID of the ServingService
|
||||
:param task_project: Select the project where the new ServingService task will be created
|
||||
:param task_name: Specify the Task name for the newly created ServingService
|
||||
:param task: Optional pass existing ServingService Task object
|
||||
:param engine_type: Specify the serving engine Type. Examples: triton, ovms, kfserving
|
||||
"""
|
||||
assert engine_type in self._supported_serving_engines
|
||||
|
||||
if task:
|
||||
self._task = task
|
||||
elif task_id:
|
||||
self._task = Task.get_task(task_id=task_id)
|
||||
else:
|
||||
# try to get a Task if we can find one
|
||||
self._task = None
|
||||
try:
|
||||
# noinspection PyProtectedMember
|
||||
if Task._query_tasks(project_name=task_project, task_name=task_name):
|
||||
self._task = Task.get_task(project_name=task_project, task_name=task_name)
|
||||
except ValueError:
|
||||
pass
|
||||
|
||||
if not self._task:
|
||||
self._task = Task.create(
|
||||
project_name=task_project, task_name=task_name, task_type=Task.TaskTypes.service,
|
||||
repo="https://github.com/allegroai/clearml-serving.git",
|
||||
branch="main",
|
||||
commit="ad049c51c146e9b7852f87e2f040e97d88848a1f",
|
||||
script="clearml_serving/service.py",
|
||||
working_directory=".",
|
||||
add_task_init_call=False,
|
||||
)
|
||||
self._task.set_system_tags(list(self._task.get_system_tags()) + ['serving'])
|
||||
|
||||
# self._current_serving_endpoints = {'an_enpoint_url': {1: 'model_id'}}
|
||||
self._current_serving_endpoints = {} # type: Dict[str, Dict[int, str]]
|
||||
# self._endpoints = {'an_enpoint_url': ServingService.EndPoint()}
|
||||
self._endpoints = {} # type: Dict[str, ServingService.EndPoint]
|
||||
self._engine_type = engine_type
|
||||
self._dirty = False
|
||||
self._last_update_step = None
|
||||
# try to deserialize from Task
|
||||
# noinspection PyBroadException
|
||||
try:
|
||||
self._deserialize()
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
def add_model_serving(
|
||||
self,
|
||||
serving_url, # type: str
|
||||
model_ids=None, # type: Optional[Sequence[str]]
|
||||
model_project=None, # type: Optional[str]
|
||||
model_name=None, # type: Optional[str]
|
||||
model_tags=None, # type: Optional[Sequence[str]]
|
||||
config_file=None, # type: Optional[Union[Path, Path3, str]]
|
||||
max_versions=1, # type: Optional[int]
|
||||
):
|
||||
"""
|
||||
Add new model serving endpoint, automatically published
|
||||
|
||||
:param serving_url:
|
||||
:param model_ids:
|
||||
:param model_project:
|
||||
:param model_name:
|
||||
:param model_tags:
|
||||
:param config_file:
|
||||
:param max_versions:
|
||||
:return:
|
||||
"""
|
||||
if not serving_url:
|
||||
raise ValueError("serving_url is required")
|
||||
|
||||
if model_tags and not isinstance(model_tags, (list, tuple)):
|
||||
raise ValueError("model_tags must be a list of strings")
|
||||
|
||||
# normalize endpoint url
|
||||
serving_url = str(serving_url).strip('/')
|
||||
|
||||
endpoint = self.EndPoint(
|
||||
serving_url=serving_url,
|
||||
model_ids=list(model_ids) if model_ids else None,
|
||||
model_name=model_name,
|
||||
model_project=model_project,
|
||||
model_tags=model_tags,
|
||||
max_num_revisions=max_versions or None,
|
||||
versions={},
|
||||
model_config_blob='',
|
||||
)
|
||||
# load config file
|
||||
if config_file:
|
||||
with open(str(config_file), 'rt') as f:
|
||||
endpoint.model_config_blob = f.read()
|
||||
else:
|
||||
# Look for the config on the Model generated Task
|
||||
found_models = Model.query_models(project_name=model_project, model_name=model_name, tags=model_tags) or []
|
||||
|
||||
selected_model = None
|
||||
# find the first model with config.pbtxt configuration
|
||||
# prefer published models
|
||||
found_models = [m for m in found_models if m.published] + [m for m in found_models if not m.published]
|
||||
for m in found_models:
|
||||
task_id = m.task
|
||||
task = Task.get_task(task_id=task_id)
|
||||
config_pbtxt = task.get_configuration_object(self._config_pbtxt_section)
|
||||
if config_pbtxt and str(config_pbtxt).strip():
|
||||
endpoint.model_config_blob = config_pbtxt
|
||||
selected_model = m
|
||||
break
|
||||
|
||||
if not selected_model:
|
||||
raise ValueError(
|
||||
"Requested Model project={} name={} tags={} not found. 'config.pbtxt' could not be inferred. "
|
||||
"please provide specific config.pbtxt definition.".format(model_project, model_name, model_tags))
|
||||
elif len(found_models) > 1:
|
||||
getLogger('clearml-serving').warning(
|
||||
"Found more than one Model, using model id={}".format(selected_model.id))
|
||||
|
||||
self._endpoints[serving_url] = endpoint
|
||||
self._dirty = True
|
||||
|
||||
def launch(self, queue_name='services', queue_id=None, force=False, verbose=True):
|
||||
# type: (Optional[str], Optional[str], bool, bool) -> None
|
||||
"""
|
||||
Launch serving service on a remote machine using the specified queue
|
||||
|
||||
:param queue_name: Queue name to launch the serving service control plane
|
||||
:param queue_id: specify queue id (unique stand stable) instead of queue_name
|
||||
:param force: if False check if service Task is already running before enqueuing
|
||||
:param verbose: If True print progress to console
|
||||
"""
|
||||
# check if we are not already running
|
||||
if not force and ((self._task.data.execution.queue and self._task.status == 'in_progress')
|
||||
or self._task.status == 'queued'):
|
||||
if verbose:
|
||||
print('Serving service already running')
|
||||
else:
|
||||
if verbose:
|
||||
print('Launching Serving service on {} queue'.format(queue_id or queue_name))
|
||||
self.update_endpoint_graph(force=True)
|
||||
self.update_model_endpoint_state()
|
||||
self.serialize()
|
||||
self._task.flush(wait_for_uploads=True)
|
||||
self._task.reset()
|
||||
self._task.enqueue(task=self._task, queue_name=queue_name, queue_id=queue_id)
|
||||
|
||||
def launch_engine(self, queue_name, queue_id=None, container=None, container_args=None, verbose=True):
|
||||
# type: (Optional[str], Optional[str], Optional[str], Optional[str], bool) -> None
|
||||
"""
|
||||
Launch serving engine on a specific queue
|
||||
|
||||
:param queue_name: Queue name to launch the engine service running the inference on.
|
||||
:param queue_id: specify queue id (unique stand stable) instead of queue_name
|
||||
:param container: Optional: specify serving engine container.
|
||||
:param container_args: Optional: specify serving engine container arguments.
|
||||
Notice these arguments will override any default container arguments!
|
||||
:param verbose: If True print progress to console
|
||||
"""
|
||||
|
||||
# todo: add more engines
|
||||
if self._engine_type == 'triton':
|
||||
engine_type_container = "nvcr.io/nvidia/tritonserver:21.03-py3"
|
||||
engine_type_args = "--ipc=host -p 8000:8000 -p 8001:8001 -p 8002:8002"
|
||||
|
||||
# create the serving engine Task
|
||||
engine_task = Task.create(
|
||||
project_name=self._task.get_project_name(),
|
||||
task_name="triton serving engine",
|
||||
task_type=Task.TaskTypes.inference,
|
||||
repo="https://github.com/allegroai/clearml-serving.git",
|
||||
branch="main",
|
||||
commit="ad049c51c146e9b7852f87e2f040e97d88848a1f",
|
||||
script="clearml_serving/triton_helper.py",
|
||||
working_directory=".",
|
||||
docker=container or engine_type_container,
|
||||
docker_args=container_args or engine_type_args,
|
||||
argparse_args=[('serving_id', self._task.id), ],
|
||||
add_task_init_call=False,
|
||||
packages=[
|
||||
'clearml',
|
||||
'azure-storage-blob>=2.0.1,<=2.1',
|
||||
'google-cloud-storage>=1.13.2',
|
||||
'boto3>=1.9',
|
||||
],
|
||||
)
|
||||
if verbose:
|
||||
print('Launching engine {} on queue {}'.format(self._engine_type, queue_id or queue_name))
|
||||
engine_task.enqueue(task=engine_task, queue_name=queue_name, queue_id=queue_id)
|
||||
|
||||
def update_endpoint_graph(self, force=False):
|
||||
# type: (bool) -> None
|
||||
"""
|
||||
Update the endpoint serving graph
|
||||
|
||||
:param force: If True always update, otherwise skip if service was not changed since lat time
|
||||
"""
|
||||
if not force and not self._dirty:
|
||||
return
|
||||
|
||||
# Generate configuration table and details
|
||||
table_values = [["Endpoint", "Model ID", "Model Project", "Model Name", "Model Tags", "Max Versions"]]
|
||||
for endpoint in sorted(self._endpoints.keys()):
|
||||
n = self._endpoints[endpoint]
|
||||
table_values.append([
|
||||
str(n.serving_url or ''),
|
||||
str(n.model_ids or ''),
|
||||
str(n.model_project or ''),
|
||||
str(n.model_name or ''),
|
||||
str(n.model_tags or ''),
|
||||
str(n.max_num_revisions or '')
|
||||
])
|
||||
self._task.get_logger().report_table(
|
||||
title='Serving Endpoint Configuration', series='Details', iteration=0, table_plot=table_values,
|
||||
extra_layout={"title": "Model Endpoints Details"})
|
||||
|
||||
# generate current endpoint view
|
||||
sankey_node = dict(
|
||||
label=[],
|
||||
color=[],
|
||||
customdata=[],
|
||||
hovertemplate='%{customdata}<extra></extra>',
|
||||
hoverlabel={"align": "left"},
|
||||
)
|
||||
sankey_link = dict(
|
||||
source=[],
|
||||
target=[],
|
||||
value=[],
|
||||
hovertemplate='<extra></extra>',
|
||||
)
|
||||
# root
|
||||
sankey_node['color'].append("mediumpurple")
|
||||
sankey_node['label'].append('{}'.format('serving'))
|
||||
sankey_node['customdata'].append("")
|
||||
|
||||
# Generate table and details
|
||||
table_values = [["Endpoint", "Version", "Model ID"]]
|
||||
# noinspection PyProtectedMember
|
||||
base_url = self._task._get_app_server() + '/projects/*/models/{model_id}/general'
|
||||
for i, serve_url in enumerate(sorted(self._endpoints.keys())):
|
||||
ep = self._endpoints[serve_url]
|
||||
sankey_node['color'].append("blue")
|
||||
sankey_node['label'].append('{}'.format(serve_url))
|
||||
sankey_node['customdata'].append(
|
||||
"project: {}<br />name: {}<br />tags: {}".format(
|
||||
ep.model_project or '', ep.model_name or '', ep.model_tags or '')
|
||||
)
|
||||
sankey_link['source'].append(0)
|
||||
sankey_link['target'].append(i + 1)
|
||||
sankey_link['value'].append(1. / len(self._endpoints))
|
||||
|
||||
for v in sorted(self._current_serving_endpoints.get(serve_url, [])):
|
||||
model_id = self._current_serving_endpoints[serve_url][v]
|
||||
href = '<a href="{}"> {} </a>'.format(base_url.format(model_id=model_id), model_id)
|
||||
table_values.append([str(serve_url), str(v), href])
|
||||
sankey_node['color'].append("lightblue")
|
||||
sankey_node['label'].append('{}'.format(v))
|
||||
sankey_node['customdata'].append(model_id)
|
||||
|
||||
sankey_link['source'].append(i + 1)
|
||||
sankey_link['target'].append(len(sankey_node['color']) - 1)
|
||||
sankey_link['value'].append(1. / len(self._current_serving_endpoints[serve_url]))
|
||||
|
||||
# create the sankey graph
|
||||
dag_flow = dict(
|
||||
link=sankey_link,
|
||||
node=sankey_node,
|
||||
textfont=dict(color='rgba(0,0,0,255)', size=10),
|
||||
type='sankey',
|
||||
orientation='h'
|
||||
)
|
||||
fig = dict(data=[dag_flow], layout={'xaxis': {'visible': False}, 'yaxis': {'visible': False}})
|
||||
|
||||
self._task.get_logger().report_plotly(
|
||||
title='Model Serving Endpoints', series='', iteration=0, figure=fig)
|
||||
|
||||
# report detailed table
|
||||
self._task.get_logger().report_table(
|
||||
title='Serving Endpoint', series='Details', iteration=0, table_plot=table_values,
|
||||
extra_layout={"title": "Model Endpoints Details"})
|
||||
|
||||
self._dirty = False
|
||||
|
||||
def update_model_endpoint_state(self):
|
||||
# type: () -> bool
|
||||
"""
|
||||
Update model endpoint state from the model repository
|
||||
|
||||
:return: True if endpoints were updated
|
||||
"""
|
||||
|
||||
for endpoint, node in self._endpoints.items():
|
||||
# model ID supersedes everything
|
||||
if node.model_ids:
|
||||
model_ids = node.model_ids
|
||||
else:
|
||||
# get list of models sorted by descending update time
|
||||
models = Model.query_models(
|
||||
project_name=node.model_project,
|
||||
model_name=node.model_name,
|
||||
tags=node.model_tags
|
||||
)
|
||||
# prefer published models
|
||||
model_ids = [m.id for m in models if m.published] + [m.id for m in models if not m.published]
|
||||
|
||||
cur_endpoint = self._current_serving_endpoints.get(node.serving_url, {})
|
||||
cur_endpoint = {int(k): v for k, v in cur_endpoint.items() if v in model_ids}
|
||||
cur_endpoint_m_ids = list(cur_endpoint.values())
|
||||
max_v = max(list(cur_endpoint.keys()) or [0])
|
||||
for i, m_id in enumerate(model_ids):
|
||||
# only pick the latest in the history
|
||||
if node.max_num_revisions and max_v >= node.max_num_revisions:
|
||||
break
|
||||
|
||||
if m_id in cur_endpoint_m_ids:
|
||||
continue
|
||||
max_v += 1
|
||||
cur_endpoint[max_v] = m_id
|
||||
|
||||
# check if we need to update,
|
||||
if self._current_serving_endpoints.get(node.serving_url) != cur_endpoint:
|
||||
# set dirty flag
|
||||
self._dirty = True
|
||||
# store updated results
|
||||
self._current_serving_endpoints[node.serving_url] = cur_endpoint
|
||||
|
||||
return self._dirty
|
||||
|
||||
def stats(self):
|
||||
pass
|
||||
|
||||
def get_endpoints(self):
|
||||
# type: () -> Dict[str, ServingService.EndPoint]
|
||||
"""
|
||||
return the internal endpoints configuration
|
||||
|
||||
:return: dict where the keys is the endpoint url and the value is the endpoint configuration
|
||||
"""
|
||||
return self._endpoints
|
||||
|
||||
def get_endpoint_version_model_id(self, serving_url):
|
||||
# type: (str) -> Dict[int, str]
|
||||
"""
|
||||
Return dict with model versions and model id for the specific serving url
|
||||
If serving url is not found, return None
|
||||
|
||||
:param serving_url: sering url string
|
||||
|
||||
:return: dictionary keys are the versions (integers) and values are the model IDs (str)
|
||||
"""
|
||||
return self._current_serving_endpoints.get(serving_url) or {}
|
||||
|
||||
def _serialize(self):
|
||||
configuration = dict()
|
||||
for name, ep in self._endpoints.items():
|
||||
# noinspection PyProtectedMember
|
||||
self._task.set_configuration_object(
|
||||
name="model.{}".format(name),
|
||||
description='Model Serving Configuration',
|
||||
config_type='pbtxt',
|
||||
config_text=ep.model_config_blob)
|
||||
ep_conf = ep.as_dict()
|
||||
ep_conf.pop('model_config_blob', None)
|
||||
configuration['"{}"'.format(name)] = ep_conf
|
||||
# noinspection PyProtectedMember
|
||||
self._task._set_configuration(
|
||||
config_dict=configuration, name='endpoints',
|
||||
config_type='hocon', description='Serving Endpoints Configuration')
|
||||
# set configuration of current served endpoints
|
||||
# noinspection PyProtectedMember
|
||||
self._task._set_configuration(
|
||||
config_dict=self._current_serving_endpoints, name='serving_state',
|
||||
config_type='hocon', description='Current Serving Endpoints State',
|
||||
)
|
||||
serving = dict(engine=self._engine_type)
|
||||
self._task.connect(serving, name='serving')
|
||||
|
||||
def _deserialize(self):
|
||||
# type: () -> bool
|
||||
"""
|
||||
deserialize internal state from Task backend
|
||||
|
||||
:return: return True if new state a was updated.
|
||||
"""
|
||||
# update if the task was updated
|
||||
if self._endpoints:
|
||||
last_update = self._task.data.last_update
|
||||
try:
|
||||
# noinspection PyProtectedMember
|
||||
if last_update == self._task._get_last_update():
|
||||
return True
|
||||
except AttributeError:
|
||||
# support old clearml packages
|
||||
pass
|
||||
|
||||
self._task.reload()
|
||||
|
||||
# noinspection PyProtectedMember
|
||||
configuration = self._task._get_configuration_dict(name='endpoints')
|
||||
if not configuration:
|
||||
return False
|
||||
|
||||
self._endpoints = {}
|
||||
self._current_serving_endpoints = {}
|
||||
serving = dict(engine='')
|
||||
task_parameters = self._task.get_parameters_as_dict()
|
||||
serving.update(task_parameters.get('serving', {}))
|
||||
self._engine_type = serving['engine']
|
||||
|
||||
for name, endpoint in configuration.items():
|
||||
ep = self.EndPoint(model_config_blob='', **endpoint)
|
||||
ep.model_config_blob = self._task.get_configuration_object(
|
||||
name="model.{}".format(ep.serving_url))
|
||||
self._endpoints[ep.serving_url] = ep
|
||||
|
||||
# get configuration of current served endpoints
|
||||
# noinspection PyProtectedMember
|
||||
self._current_serving_endpoints = self._task._get_configuration_dict(name='serving_state')
|
||||
|
||||
self._dirty = True
|
||||
return True
|
||||
|
||||
def update(self, force=False):
|
||||
# type: (bool) -> bool
|
||||
"""
|
||||
Update internal endpoint state based on Task configuration and model repository
|
||||
|
||||
:param force: if True force update
|
||||
|
||||
:return: True if internal state updated.
|
||||
"""
|
||||
if not self._task:
|
||||
return False
|
||||
|
||||
# store current internal state
|
||||
state_hash = self.__state_hash()
|
||||
|
||||
if not self._deserialize():
|
||||
return False
|
||||
|
||||
# check if current internal state changed
|
||||
if not force and state_hash == self.__state_hash():
|
||||
print("Skipping update, nothing changed")
|
||||
return False
|
||||
|
||||
return self.update_model_endpoint_state()
|
||||
|
||||
def get_id(self):
|
||||
# type: () -> str
|
||||
"""
|
||||
Return the Serving Service Task ID
|
||||
:return: Unique Task ID (str)
|
||||
"""
|
||||
return self._task.id
|
||||
|
||||
def get_engine_type(self):
|
||||
# type: () -> str
|
||||
"""
|
||||
return the engine type used ib the serving service
|
||||
:return: engine type (str). example: triton, ovms, kfserving
|
||||
"""
|
||||
return self._engine_type
|
||||
|
||||
def serialize(self, force=False):
|
||||
# type: (bool) -> None
|
||||
"""
|
||||
Serialize current service state to the Task
|
||||
|
||||
:param force: If True synchronize an aborted/completed Task
|
||||
"""
|
||||
if force and self._task.status not in (Task.TaskStatusEnum.created, Task.TaskStatusEnum.in_progress):
|
||||
self._task.mark_started(force=True)
|
||||
|
||||
self._serialize()
|
||||
|
||||
def triton_model_service_update_step(self, model_repository_folder=None, verbose=True):
|
||||
# type: (Optional[str], bool) -> None
|
||||
|
||||
# check if something changed since last time
|
||||
if not self.update(force=self._last_update_step is None):
|
||||
return
|
||||
|
||||
self._last_update_step = time()
|
||||
|
||||
if not model_repository_folder:
|
||||
model_repository_folder = '/models/'
|
||||
|
||||
if verbose:
|
||||
print('Updating local model folder: {}'.format(model_repository_folder))
|
||||
|
||||
for url, endpoint in self.get_endpoints().items():
|
||||
folder = Path(model_repository_folder) / url
|
||||
folder.mkdir(parents=True, exist_ok=True)
|
||||
with open((folder / 'config.pbtxt').as_posix(), 'wt') as f:
|
||||
f.write(endpoint.model_config_blob)
|
||||
|
||||
# download model versions
|
||||
for version, model_id in self.get_endpoint_version_model_id(serving_url=url).items():
|
||||
model_folder = folder / str(version)
|
||||
|
||||
model_folder.mkdir(parents=True, exist_ok=True)
|
||||
model = None
|
||||
# noinspection PyBroadException
|
||||
try:
|
||||
model = InputModel(model_id)
|
||||
local_path = model.get_local_copy()
|
||||
except Exception:
|
||||
local_path = None
|
||||
if not local_path:
|
||||
print("Error retrieving model ID {} []".format(model_id, model.url if model else ''))
|
||||
continue
|
||||
|
||||
local_path = Path(local_path)
|
||||
|
||||
if verbose:
|
||||
print('Update model v{} in {}'.format(version, model_folder))
|
||||
|
||||
# if this is a folder copy every and delete the temp folder
|
||||
if local_path.is_dir():
|
||||
# we assume we have a `tensorflow.savedmodel` folder
|
||||
model_folder /= 'model.savedmodel'
|
||||
model_folder.mkdir(parents=True, exist_ok=True)
|
||||
# rename to old
|
||||
old_folder = None
|
||||
if model_folder.exists():
|
||||
old_folder = model_folder.parent / '.old.{}'.format(model_folder.name)
|
||||
model_folder.replace(old_folder)
|
||||
if verbose:
|
||||
print('copy model into {}'.format(model_folder))
|
||||
shutil.copytree(
|
||||
local_path.as_posix(), model_folder.as_posix(), symlinks=False,
|
||||
)
|
||||
if old_folder:
|
||||
shutil.rmtree(path=old_folder.as_posix())
|
||||
# delete temp folder
|
||||
shutil.rmtree(local_path.as_posix())
|
||||
else:
|
||||
# single file should be moved
|
||||
target_path = model_folder / local_path.name
|
||||
old_file = None
|
||||
if target_path.exists():
|
||||
old_file = target_path.parent / '.old.{}'.format(target_path.name)
|
||||
target_path.replace(old_file)
|
||||
shutil.move(local_path.as_posix(), target_path.as_posix())
|
||||
if old_file:
|
||||
old_file.unlink()
|
||||
|
||||
def __state_hash(self):
|
||||
# type: () -> int
|
||||
"""
|
||||
Return Hash of the internal state (use only for in process comparison
|
||||
:return: hash int
|
||||
"""
|
||||
return hash(json.dumps(
|
||||
[self._current_serving_endpoints, {k: v.as_dict() for k, v in self._endpoints.items()}],
|
||||
sort_keys=True))
|
||||
@@ -1,219 +0,0 @@
|
||||
import re
|
||||
import subprocess
|
||||
from argparse import ArgumentParser
|
||||
from time import time
|
||||
from typing import Optional
|
||||
|
||||
from pathlib2 import Path
|
||||
|
||||
from clearml import Task, Logger
|
||||
from clearml.backend_api.utils import get_http_session_with_retry
|
||||
from clearml_serving.serving_service import ServingService
|
||||
|
||||
|
||||
class TritonHelper(object):
|
||||
_metric_line_parsing = r"(\w+){(gpu_uuid=\"[\w\W]*\",)?model=\"(\w+)\",\s*version=\"(\d+)\"}\s*([0-9.]*)"
|
||||
_default_metrics_port = 8002
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
args, # Any
|
||||
task, # type: Task
|
||||
serving_id, # type: str
|
||||
metric_host=None, # type: Optional[str]
|
||||
metric_port=None, # type: int
|
||||
):
|
||||
# type: (...) -> None
|
||||
self._http_session = get_http_session_with_retry()
|
||||
self.args = dict(**args.__dict__) if args else {}
|
||||
self.task = task
|
||||
self.serving_id = serving_id
|
||||
self.metric_host = metric_host or '0.0.0.0'
|
||||
self.metric_port = metric_port or self._default_metrics_port
|
||||
self._parse_metric = re.compile(self._metric_line_parsing)
|
||||
self._timestamp = time()
|
||||
print('String Triton Helper service\n{}\n'.format(self.args))
|
||||
|
||||
def report_metrics(self, remote_logger):
|
||||
# type: (Optional[Logger]) -> bool
|
||||
# iterations are seconds from start
|
||||
iteration = int(time() - self._timestamp)
|
||||
|
||||
report_msg = "reporting metrics: relative time {} sec".format(iteration)
|
||||
self.task.get_logger().report_text(report_msg)
|
||||
if remote_logger:
|
||||
remote_logger.report_text(report_msg)
|
||||
|
||||
# noinspection PyBroadException
|
||||
try:
|
||||
request = self._http_session.get('http://{}:{}/metrics'.format(
|
||||
self.metric_host, self.metric_port))
|
||||
if not request.ok:
|
||||
return False
|
||||
content = request.content.decode().split('\n')
|
||||
except Exception:
|
||||
return False
|
||||
|
||||
for line in content:
|
||||
line = line.strip()
|
||||
if not line or line.startswith('#'):
|
||||
continue
|
||||
# noinspection PyBroadException
|
||||
try:
|
||||
metric, gpu_uuid, variant, version, value = self._parse_metric.match(line).groups()
|
||||
value = float(value)
|
||||
except Exception:
|
||||
continue
|
||||
self.task.get_logger().report_scalar(
|
||||
title=metric,
|
||||
series='{}.v{}'.format(variant, version),
|
||||
iteration=iteration,
|
||||
value=value
|
||||
)
|
||||
# on the remote logger we add our own Task ID (unique ID),
|
||||
# to support multiple servers reporting to the same service controller
|
||||
if remote_logger:
|
||||
remote_logger.report_scalar(
|
||||
title=metric,
|
||||
series='{}.v{}.{}'.format(variant, version, self.task.id),
|
||||
iteration=iteration,
|
||||
value=value
|
||||
)
|
||||
|
||||
def maintenance_daemon(
|
||||
self,
|
||||
local_model_repo='/models', # type: str
|
||||
update_frequency_sec=60.0, # type: float
|
||||
metric_frequency_sec=60.0 # type: float
|
||||
):
|
||||
# type: (...) -> None
|
||||
|
||||
Path(local_model_repo).mkdir(parents=True, exist_ok=True)
|
||||
|
||||
a_service = ServingService(task_id=self.serving_id)
|
||||
a_service.triton_model_service_update_step(model_repository_folder=local_model_repo)
|
||||
|
||||
# noinspection PyProtectedMember
|
||||
remote_logger = a_service._task.get_logger()
|
||||
|
||||
# todo: log triton server outputs when running locally
|
||||
|
||||
# we assume we can run the triton server
|
||||
cmd = [
|
||||
'tritonserver',
|
||||
'--model-control-mode=poll',
|
||||
'--model-repository={}'.format(local_model_repo),
|
||||
'--repository-poll-secs={}'.format(update_frequency_sec),
|
||||
'--metrics-port={}'.format(self._default_metrics_port),
|
||||
'--allow-metrics=true',
|
||||
'--allow-gpu-metrics=true',
|
||||
]
|
||||
for k, v in self.args.items():
|
||||
if not v or not str(k).startswith('t_'):
|
||||
continue
|
||||
cmd.append('--{}={}'.format(k, v))
|
||||
|
||||
print('Starting server: {}'.format(cmd))
|
||||
try:
|
||||
proc = subprocess.Popen(cmd)
|
||||
except FileNotFoundError:
|
||||
raise ValueError(
|
||||
"Triton Server Engine (tritonserver) could not be found!\n"
|
||||
"Verify you running inside the `nvcr.io/nvidia/tritonserver` docker container")
|
||||
base_freq = min(update_frequency_sec, metric_frequency_sec)
|
||||
metric_tic = update_tic = time()
|
||||
while True:
|
||||
try:
|
||||
error_code = proc.wait(timeout=base_freq)
|
||||
if error_code == 0:
|
||||
print("triton-server process ended with error code {}".format(error_code))
|
||||
return
|
||||
raise ValueError("triton-server process ended with error code {}".format(error_code))
|
||||
except subprocess.TimeoutExpired:
|
||||
pass
|
||||
pass
|
||||
|
||||
# update models
|
||||
if time() - update_tic > update_frequency_sec:
|
||||
a_service.triton_model_service_update_step(model_repository_folder=local_model_repo)
|
||||
update_tic = time()
|
||||
|
||||
# update stats
|
||||
if time() - metric_tic > metric_frequency_sec:
|
||||
metric_tic = time()
|
||||
self.report_metrics(remote_logger)
|
||||
|
||||
|
||||
def main():
|
||||
title = 'clearml-serving - Nvidia Triton Engine Helper'
|
||||
print(title)
|
||||
parser = ArgumentParser(prog='clearml-serving', description=title)
|
||||
parser.add_argument(
|
||||
'--serving-id', default=None, type=str, required=True,
|
||||
help='Specify main serving service Task ID')
|
||||
parser.add_argument(
|
||||
'--project', default='serving', type=str,
|
||||
help='Optional specify project for the serving engine Task')
|
||||
parser.add_argument(
|
||||
'--name', default='nvidia-triton', type=str,
|
||||
help='Optional specify task name for the serving engine Task')
|
||||
parser.add_argument(
|
||||
'--update-frequency', default=10, type=float,
|
||||
help='Model update frequency in minutes')
|
||||
parser.add_argument(
|
||||
'--metric-frequency', default=1, type=float,
|
||||
help='Metric reporting update frequency in minutes')
|
||||
parser.add_argument(
|
||||
'--t-http-port', type=str, help='<integer> The port for the server to listen on for HTTP requests')
|
||||
parser.add_argument(
|
||||
'--t-http-thread-count', type=str, help='<integer> Number of threads handling HTTP requests')
|
||||
parser.add_argument(
|
||||
'--t-allow-grpc', type=str, help='<integer> Allow the server to listen for GRPC requests')
|
||||
parser.add_argument(
|
||||
'--t-grpc-port', type=str, help='<integer> The port for the server to listen on for GRPC requests')
|
||||
parser.add_argument(
|
||||
'--t-grpc-infer-allocation-pool-size', type=str,
|
||||
help='<integer> The maximum number of inference request/response objects that remain '
|
||||
'allocated for reuse. As long as the number of in-flight requests doesn\'t exceed '
|
||||
'this value there will be no allocation/deallocation of request/response objects')
|
||||
parser.add_argument(
|
||||
'--t-pinned-memory-pool-byte-size', type=str,
|
||||
help='<integer> The total byte size that can be allocated as pinned system '
|
||||
'memory. If GPU support is enabled, the server will allocate pinned '
|
||||
'system memory to accelerate data transfer between host and devices '
|
||||
'until it exceeds the specified byte size. This option will not affect '
|
||||
'the allocation conducted by the backend frameworks. Default is 256 MB')
|
||||
parser.add_argument(
|
||||
'--t-cuda-memory-pool-byte-size', type=str,
|
||||
help='<<integer>:<integer>> The total byte size that can be allocated as CUDA memory for '
|
||||
'the GPU device. If GPU support is enabled, the server will allocate '
|
||||
'CUDA memory to minimize data transfer between host and devices '
|
||||
'until it exceeds the specified byte size. This option will not affect '
|
||||
'the allocation conducted by the backend frameworks. The argument '
|
||||
'should be 2 integers separated by colons in the format <GPU device'
|
||||
'ID>:<pool byte size>. This option can be used multiple times, but only '
|
||||
'once per GPU device. Subsequent uses will overwrite previous uses for '
|
||||
'the same GPU device. Default is 64 MB')
|
||||
parser.add_argument(
|
||||
'--t-min-supported-compute-capability', type=str,
|
||||
help='<float> The minimum supported CUDA compute capability. GPUs that '
|
||||
'don\'t support this compute capability will not be used by the server')
|
||||
parser.add_argument(
|
||||
'--t-buffer-manager-thread-count', type=str,
|
||||
help='<integer> The number of threads used to accelerate copies and other'
|
||||
'operations required to manage input and output tensor contents.'
|
||||
'Default is 0')
|
||||
|
||||
args = parser.parse_args()
|
||||
task = Task.init(project_name=args.project, task_name=args.name, task_type=Task.TaskTypes.inference)
|
||||
helper = TritonHelper(args, task, serving_id=args.serving_id)
|
||||
# this function will never end
|
||||
helper.maintenance_daemon(
|
||||
local_model_repo='/models',
|
||||
update_frequency_sec=args.update_frequency*60.0,
|
||||
metric_frequency_sec=args.metric_frequency*60.0,
|
||||
)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
@@ -1 +1 @@
|
||||
__version__ = '0.3.3'
|
||||
__version__ = '0.9.0'
|
||||
|
||||
BIN
docs/design_diagram.png
Normal file
BIN
docs/design_diagram.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 332 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.1 KiB |
@@ -1,88 +0,0 @@
|
||||
#!/usr/bin/env python
|
||||
# Copyright (c) 2020, NVIDIA CORPORATION. All rights reserved.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions
|
||||
# are met:
|
||||
# * Redistributions of source code must retain the above copyright
|
||||
# notice, this list of conditions and the following disclaimer.
|
||||
# * Redistributions in binary form must reproduce the above copyright
|
||||
# notice, this list of conditions and the following disclaimer in the
|
||||
# documentation and/or other materials provided with the distribution.
|
||||
# * Neither the name of NVIDIA CORPORATION nor the names of its
|
||||
# contributors may be used to endorse or promote products derived
|
||||
# from this software without specific prior written permission.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
|
||||
# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
|
||||
# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
||||
# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||
# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
|
||||
# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
|
||||
# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
import argparse
|
||||
from PIL import Image
|
||||
import numpy as np
|
||||
|
||||
from http_triton import InferenceServerClient, InferInput
|
||||
|
||||
if __name__ == '__main__':
|
||||
parser = argparse.ArgumentParser()
|
||||
parser.add_argument('-v',
|
||||
'--verbose',
|
||||
action="store_true",
|
||||
required=False,
|
||||
default=False,
|
||||
help='Enable verbose output')
|
||||
parser.add_argument('-u',
|
||||
'--url',
|
||||
type=str,
|
||||
required=False,
|
||||
default='localhost:8000',
|
||||
help='Inference server URL. Default localhost:8000')
|
||||
|
||||
FLAGS = parser.parse_args()
|
||||
|
||||
model_name = "keras_mnist"
|
||||
model_version = "1"
|
||||
|
||||
input_name = "dense_input"
|
||||
shape = (1, 784)
|
||||
datatype = 'FP32'
|
||||
|
||||
output_name = 'activation_2'
|
||||
|
||||
# Path of an image
|
||||
image_path = '68747470733a2f2f646174616d61646e6573732e6769746875622e696f2f6173736574732f696d616765732f74665f66696c655f666565642f4d4e4953545f64696769742e706e67.png'
|
||||
|
||||
# The image is opened using Pillow, then converted to grayscale since the model deployed is trained on grayscale images
|
||||
image = Image.open(image_path).convert('L')
|
||||
|
||||
# The image is resized to 28x28 pixels
|
||||
image = image.resize(shape, Image.ANTIALIAS)
|
||||
|
||||
# The image is converted to a numpy array and data type is converted to float32 since the model is trained on float32
|
||||
np_image = np.array(image).astype(np.float32)
|
||||
|
||||
# The image is reshaped to fit the model
|
||||
np_image = np_image.reshape(-1, 784)
|
||||
|
||||
# Create an InferInput object with the input name, its data type and its shape defined
|
||||
inferInput = InferInput(name=input_name, datatype=datatype, shape=shape)
|
||||
|
||||
# Set the data inside the InferInput object to the image in numpy format
|
||||
inferInput.set_data_from_numpy(np_image)
|
||||
|
||||
# Create an InferenceServerClient and pass to it the url of the server
|
||||
client = InferenceServerClient(url=FLAGS.url, verbose=FLAGS.verbose)
|
||||
|
||||
# Call client.infer(), pass the model name, version and the InferInput object inside a list since there can be multiple inputs
|
||||
inferResult = client.infer(model_name=model_name, inputs=[inferInput], model_version=model_version)
|
||||
|
||||
# Print the output of the model in numpy format, pass in the name of the output layer
|
||||
print(inferResult.as_numpy(output_name))
|
||||
File diff suppressed because it is too large
Load Diff
Binary file not shown.
|
Before Width: | Height: | Size: 26 KiB |
36
examples/keras/preprocess.py
Normal file
36
examples/keras/preprocess.py
Normal file
@@ -0,0 +1,36 @@
|
||||
from typing import Any
|
||||
|
||||
import numpy as np
|
||||
from PIL import Image, ImageOps
|
||||
|
||||
|
||||
# Notice Preprocess class Must be named "Preprocess"
|
||||
from clearml import StorageManager
|
||||
|
||||
|
||||
class Preprocess(object):
|
||||
def __init__(self):
|
||||
# set internal state, this will be called only once. (i.e. not per request)
|
||||
pass
|
||||
|
||||
def preprocess(self, body: dict) -> Any:
|
||||
# we expect to get two valid on the dict x0, and x1
|
||||
url = body.get("url")
|
||||
if not url:
|
||||
raise ValueError("'url' entry not provided, expected http/s link to image")
|
||||
|
||||
local_file = StorageManager.get_local_copy(remote_url=url)
|
||||
image = Image.open(local_file)
|
||||
image = ImageOps.grayscale(image).resize((28, 28))
|
||||
|
||||
return np.array(image).flatten()
|
||||
|
||||
def postprocess(self, data: Any) -> dict:
|
||||
# post process the data returned from the model inference engine
|
||||
# data is the return value from model.predict we will put is inside a return value as Y
|
||||
if not isinstance(data, np.ndarray):
|
||||
# this should not happen
|
||||
return dict(digit=-1)
|
||||
|
||||
# data is returned as probability per class (10 class/digits)
|
||||
return dict(digit=int(data.flatten().argmax()))
|
||||
46
examples/keras/readme.md
Normal file
46
examples/keras/readme.md
Normal file
@@ -0,0 +1,46 @@
|
||||
# Train and Deploy Keras model with Nvidia Triton Engine
|
||||
|
||||
## training mock model
|
||||
|
||||
Run the mock python training code
|
||||
```bash
|
||||
python3 train_keras_mnist.py
|
||||
```
|
||||
|
||||
The output will be a model created on the project "serving examples", by the name "train keras model"
|
||||
|
||||
## setting up the serving service
|
||||
|
||||
1. Create serving Service: `clearml-serving create --name "serving example"` (write down the service ID)
|
||||
2. Create model endpoint:
|
||||
`clearml-serving --id <service_id> model add --engine triton --endpoint "test_model_keras" --preprocess "preprocess.py" --name "train keras model" --project "serving examples" --input-size 1 784 --input-name "dense_input" --input-type float32 --output-size -1 10 --output-name "activation_2" --output-type float32
|
||||
`
|
||||
Or auto update
|
||||
`clearml-serving --id <service_id> model auto-update --engine triton --endpoint "test_model_auto" --preprocess "preprocess.py" --name "train keras model" --project "serving examples" --max-versions 2
|
||||
--input-size 1 784 --input-name "dense_input" --input-type float32
|
||||
--output-size -1 10 --output-name "activation_2" --output-type float32
|
||||
`
|
||||
Or add Canary endpoint
|
||||
`clearml-serving --id <service_id> model canary --endpoint "test_model_auto" --weights 0.1 0.9 --input-endpoint-prefix test_model_auto`
|
||||
|
||||
3. Run the Triton Engine `docker run -v ~/clearml.conf:/root/clearml.conf -p 8001:8001 -e CLEARML_SERVING_TASK_ID=<service_id> clearml-serving-triton:latest`
|
||||
4. Configure the Triton Engine IP on the Serving Service (if running on k8s, the gRPC ingest of the triton container)
|
||||
`clearml-serving --id <service_id> config --triton-grpc-server <local_ip_here>:8001`
|
||||
5. Run the clearml-serving container `docker run -v ~/clearml.conf:/root/clearml.conf -p 8001:8001 -e CLEARML_SERVING_TASK_ID=<service_id> clearml-serving:latest`
|
||||
6. Test new endpoint: `curl -X POST "http://127.0.0.1:8080/serve/test_model_keras" -H "accept: application/json" -H "Content-Type: application/json" -d '{"url": "https://camo.githubusercontent.com/8385ca52c9cba1f6e629eb938ab725ec8c9449f12db81f9a34e18208cd328ce9/687474703a2f2f706574722d6d6172656b2e636f6d2f77702d636f6e74656e742f75706c6f6164732f323031372f30372f6465636f6d707265737365642e6a7067"}'`
|
||||
|
||||
> **_Notice:_** You can also change the serving service while it is already running!
|
||||
This includes adding/removing endpoints, adding canary model routing etc.
|
||||
|
||||
|
||||
### Running / debugging the serving service manually
|
||||
Once you have setup the Serving Service Task
|
||||
|
||||
```bash
|
||||
$ pip3 install -r clearml_serving/serving/requirements.txt
|
||||
$ CLEARML_SERVING_TASK_ID=<service_id> PYHTONPATH=$(pwd) python3 -m gunicorn \
|
||||
--preload clearml_serving.serving.main:app \
|
||||
--workers 4 \
|
||||
--worker-class uvicorn.workers.UvicornWorker \
|
||||
--bind 0.0.0.0:8080
|
||||
```
|
||||
@@ -1,2 +1,3 @@
|
||||
tensorflow>=2.0
|
||||
clearml
|
||||
PIL
|
||||
@@ -48,41 +48,6 @@ class TensorBoardImage(TensorBoard):
|
||||
self.writer.add_summary(summary, epoch)
|
||||
|
||||
|
||||
def create_config_pbtxt(model, config_pbtxt_file):
|
||||
platform = "tensorflow_savedmodel"
|
||||
input_name = model.input_names[0]
|
||||
output_name = model.output_names[0]
|
||||
input_data_type = "TYPE_FP32"
|
||||
output_data_type = "TYPE_FP32"
|
||||
input_dims = str(model.input.shape.as_list()).replace("None", "-1")
|
||||
output_dims = str(model.output.shape.as_list()).replace("None", "-1")
|
||||
|
||||
config_pbtxt = """
|
||||
platform: "%s"
|
||||
input [
|
||||
{
|
||||
name: "%s"
|
||||
data_type: %s
|
||||
dims: %s
|
||||
}
|
||||
]
|
||||
output [
|
||||
{
|
||||
name: "%s"
|
||||
data_type: %s
|
||||
dims: %s
|
||||
}
|
||||
]
|
||||
""" % (
|
||||
platform,
|
||||
input_name, input_data_type, input_dims,
|
||||
output_name, output_data_type, output_dims
|
||||
)
|
||||
|
||||
with open(config_pbtxt_file, "w") as config_file:
|
||||
config_file.write(config_pbtxt)
|
||||
|
||||
|
||||
def main():
|
||||
parser = argparse.ArgumentParser(description='Keras MNIST Example - training CNN classification model')
|
||||
parser.add_argument('--batch-size', type=int, default=128, help='input batch size for training (default: 128)')
|
||||
@@ -126,7 +91,7 @@ def main():
|
||||
|
||||
# Connecting ClearML with the current process,
|
||||
# from here on everything is logged automatically
|
||||
task = Task.init(project_name='examples', task_name='Keras MNIST serve example', output_uri=True)
|
||||
task = Task.init(project_name='serving examples', task_name='train keras model', output_uri=True)
|
||||
|
||||
# Advanced: setting model class enumeration
|
||||
labels = dict(('digit_%d' % i, i) for i in range(10))
|
||||
@@ -155,12 +120,6 @@ def main():
|
||||
# store the model in a format that can be served
|
||||
model.save('serving_model', include_optimizer=False)
|
||||
|
||||
# create the config.pbtxt for triton to be able to serve the model
|
||||
create_config_pbtxt(model=model, config_pbtxt_file='config.pbtxt')
|
||||
# store the configuration on the creating Task,
|
||||
# this will allow us to skip over manually setting the config.pbtxt for `clearml-serving`
|
||||
task.connect_configuration(configuration=Path('config.pbtxt'), name='config.pbtxt')
|
||||
|
||||
print('Test score: {}'.format(score[0]))
|
||||
print('Test accuracy: {}'.format(score[1]))
|
||||
|
||||
23
examples/lightgbm/preprocess.py
Normal file
23
examples/lightgbm/preprocess.py
Normal file
@@ -0,0 +1,23 @@
|
||||
from typing import Any
|
||||
|
||||
import numpy as np
|
||||
|
||||
|
||||
# Notice Preprocess class Must be named "Preprocess"
|
||||
class Preprocess(object):
|
||||
def __init__(self):
|
||||
# set internal state, this will be called only once. (i.e. not per request)
|
||||
pass
|
||||
|
||||
def preprocess(self, body: dict) -> Any:
|
||||
# we expect to get four valid numbers on the dict: x0, x1, x2, x3
|
||||
return np.array(
|
||||
[[body.get("x0", None), body.get("x1", None), body.get("x2", None), body.get("x3", None)], ],
|
||||
dtype=np.float32
|
||||
)
|
||||
|
||||
def postprocess(self, data: Any) -> dict:
|
||||
# post process the data returned from the model inference engine
|
||||
# data is the return value from model.predict we will put is inside a return value as Y
|
||||
# we pick the most probably class and return the class index (argmax)
|
||||
return dict(y=int(np.argmax(data)) if isinstance(data, np.ndarray) else data)
|
||||
42
examples/lightgbm/readme.md
Normal file
42
examples/lightgbm/readme.md
Normal file
@@ -0,0 +1,42 @@
|
||||
# Train and Deploy LightGBM model
|
||||
|
||||
## training mock model
|
||||
|
||||
Run the mock python training code
|
||||
```bash
|
||||
python3 train_model.py
|
||||
```
|
||||
|
||||
The output will be a model created on the project "serving examples", by the name "train lightgbm model"
|
||||
|
||||
## setting up the serving service
|
||||
|
||||
1. Create serving Service: `clearml-serving create --name "serving example"` (write down the service ID)
|
||||
|
||||
2. Create model endpoint:
|
||||
|
||||
3. `clearml-serving --id <service_id> model add --engine lightgbm --endpoint "test_model_lgbm" --preprocess "preprocess.py" --name "train lightgbm model" --project "serving examples"`
|
||||
Or auto-update
|
||||
`clearml-serving --id <service_id> model auto-update --engine lightgbm --endpoint "test_model_auto" --preprocess "preprocess.py" --name "train lightgbm model" --project "serving examples" --max-versions 2`
|
||||
Or add Canary endpoint
|
||||
`clearml-serving --id <service_id> model canary --endpoint "test_model_auto" --weights 0.1 0.9 --input-endpoint-prefix test_model_auto`
|
||||
|
||||
4. Run the clearml-serving container `docker run -v ~/clearml.conf:/root/clearml.conf -p 8080:8080 -e CLEARML_SERVING_TASK_ID=<service_id> clearml-serving:latest`
|
||||
|
||||
5. Test new endpoint: `curl -X POST "http://127.0.0.1:8080/serve/test_model_lgbm" -H "accept: application/json" -H "Content-Type: application/json" -d '{"x0": 1, "x1": 2, "x2": 3, "x3": 4}'`
|
||||
|
||||
> **_Notice:_** You can also change the serving service while it is already running!
|
||||
This includes adding/removing endpoints, adding canary model routing etc.
|
||||
|
||||
|
||||
### Running / debugging the serving service manually
|
||||
Once you have setup the Serving Service Task
|
||||
|
||||
```bash
|
||||
$ pip3 install -r clearml_serving/serving/requirements.txt
|
||||
$ CLEARML_SERVING_TASK_ID=<service_id> PYHTONPATH=$(pwd) python3 -m gunicorn \
|
||||
--preload clearml_serving.serving.main:app \
|
||||
--workers 4 \
|
||||
--worker-class uvicorn.workers.UvicornWorker \
|
||||
--bind 0.0.0.0:8080
|
||||
```
|
||||
22
examples/lightgbm/train_model.py
Normal file
22
examples/lightgbm/train_model.py
Normal file
@@ -0,0 +1,22 @@
|
||||
import lightgbm as lgb
|
||||
from sklearn.datasets import load_iris
|
||||
from sklearn.model_selection import train_test_split
|
||||
|
||||
from clearml import Task
|
||||
|
||||
task = Task.init(project_name="serving examples", task_name="train lightgbm model", output_uri=True)
|
||||
|
||||
iris = load_iris()
|
||||
y = iris['target']
|
||||
X = iris['data']
|
||||
X_train, X_test, y_train, y_test = train_test_split(X, y, test_size=0.1)
|
||||
dtrain = lgb.Dataset(X_train, label=y_train)
|
||||
|
||||
params = {
|
||||
'objective': 'multiclass',
|
||||
'metric': 'softmax',
|
||||
'num_class': 3
|
||||
}
|
||||
lgb_model = lgb.train(params=params, train_set=dtrain)
|
||||
|
||||
lgb_model.save_model("lgbm_model")
|
||||
35
examples/pytorch/preprocess.py
Normal file
35
examples/pytorch/preprocess.py
Normal file
@@ -0,0 +1,35 @@
|
||||
from typing import Any
|
||||
|
||||
import numpy as np
|
||||
from PIL import Image, ImageOps
|
||||
|
||||
|
||||
# Notice Preprocess class Must be named "Preprocess"
|
||||
from clearml import StorageManager
|
||||
|
||||
|
||||
class Preprocess(object):
|
||||
def __init__(self):
|
||||
# set internal state, this will be called only once. (i.e. not per request)
|
||||
pass
|
||||
|
||||
def preprocess(self, body: dict) -> Any:
|
||||
# we expect to get two valid on the dict x0, and x1
|
||||
url = body.get("url")
|
||||
if not url:
|
||||
raise ValueError("'url' entry not provided, expected http/s link to image")
|
||||
|
||||
local_file = StorageManager.get_local_copy(remote_url=url)
|
||||
image = Image.open(local_file)
|
||||
image = ImageOps.grayscale(image).resize((28, 28))
|
||||
return np.array(image).flatten()
|
||||
|
||||
def postprocess(self, data: Any) -> dict:
|
||||
# post process the data returned from the model inference engine
|
||||
# data is the return value from model.predict we will put is inside a return value as Y
|
||||
if not isinstance(data, np.ndarray):
|
||||
# this should not happen
|
||||
return dict(digit=-1)
|
||||
|
||||
# data is returned as probability per class (10 class/digits)
|
||||
return dict(digit=int(data.flatten().argmax()))
|
||||
49
examples/pytorch/readme.md
Normal file
49
examples/pytorch/readme.md
Normal file
@@ -0,0 +1,49 @@
|
||||
# Train and Deploy Keras model with Nvidia Triton Engine
|
||||
|
||||
## training mock model
|
||||
|
||||
Run the mock python training code
|
||||
```bash
|
||||
python3 train_pytorch_mnist.py
|
||||
```
|
||||
|
||||
The output will be a model created on the project "serving examples", by the name "train pytorch model"
|
||||
*Notice* Only TorchScript models are supported by Triton server
|
||||
|
||||
## setting up the serving service
|
||||
|
||||
1. Create serving Service: `clearml-serving create --name "serving example"` (write down the service ID)
|
||||
2. Create model endpoint:
|
||||
`clearml-serving --id <service_id> model add --engine triton --endpoint "test_model_pytorch" --preprocess "preprocess.py" --name "train pytorch model" --project "serving examples"
|
||||
--input-size 28 28 1 --input-name "INPUT__0" --input-type float32
|
||||
--output-size -1 10 --output-name "OUTPUT__0" --output-type float32
|
||||
`
|
||||
Or auto update
|
||||
`clearml-serving --id <service_id> model auto-update --engine triton --endpoint "test_model_pytorch_auto" --preprocess "preprocess.py" --name "train pytorch model" --project "serving examples" --max-versions 2
|
||||
--input-size 28 28 1 --input-name "INPUT__0" --input-type float32
|
||||
--output-size -1 10 --output-name "OUTPUT__0" --output-type float32
|
||||
`
|
||||
Or add Canary endpoint
|
||||
`clearml-serving --id <service_id> model canary --endpoint "test_model_pytorch_auto" --weights 0.1 0.9 --input-endpoint-prefix test_model_pytorch_auto`
|
||||
|
||||
3. Run the Triton Engine `docker run -v ~/clearml.conf:/root/clearml.conf -p 8001:8001 -e CLEARML_SERVING_TASK_ID=<service_id> clearml-serving-triton:latest`
|
||||
4. Configure the Triton Engine IP on the Serving Service (if running on k8s, the gRPC ingest of the triton container)
|
||||
`clearml-serving --id <service_id> config --triton-grpc-server <local_ip_here>:8001`
|
||||
5. Run the clearml-serving container `docker run -v ~/clearml.conf:/root/clearml.conf -p 8001:8001 -e CLEARML_SERVING_TASK_ID=<service_id> clearml-serving:latest`
|
||||
6. Test new endpoint: `curl -X POST "http://127.0.0.1:8080/serve/test_model_pytorch" -H "accept: application/json" -H "Content-Type: application/json" -d '{"url": "https://camo.githubusercontent.com/8385ca52c9cba1f6e629eb938ab725ec8c9449f12db81f9a34e18208cd328ce9/687474703a2f2f706574722d6d6172656b2e636f6d2f77702d636f6e74656e742f75706c6f6164732f323031372f30372f6465636f6d707265737365642e6a7067"}'`
|
||||
|
||||
> **_Notice:_** You can also change the serving service while it is already running!
|
||||
This includes adding/removing endpoints, adding canary model routing etc.
|
||||
|
||||
|
||||
### Running / debugging the serving service manually
|
||||
Once you have setup the Serving Service Task
|
||||
|
||||
```bash
|
||||
$ pip3 install -r clearml_serving/serving/requirements.txt
|
||||
$ CLEARML_SERVING_TASK_ID=<service_id> PYHTONPATH=$(pwd) python3 -m gunicorn \
|
||||
--preload clearml_serving.serving.main:app \
|
||||
--workers 4 \
|
||||
--worker-class uvicorn.workers.UvicornWorker \
|
||||
--bind 0.0.0.0:8080
|
||||
```
|
||||
5
examples/pytorch/requirements.txt
Normal file
5
examples/pytorch/requirements.txt
Normal file
@@ -0,0 +1,5 @@
|
||||
torchvision
|
||||
torch
|
||||
clearml
|
||||
PIL
|
||||
setuptools<58
|
||||
142
examples/pytorch/train_pytorch_mnist.py
Normal file
142
examples/pytorch/train_pytorch_mnist.py
Normal file
@@ -0,0 +1,142 @@
|
||||
# ClearML - Example of pytorch with tensorboard>=v1.14
|
||||
#
|
||||
from __future__ import print_function
|
||||
|
||||
import argparse
|
||||
import os
|
||||
from tempfile import gettempdir
|
||||
|
||||
import torch
|
||||
import torch.nn as nn
|
||||
import torch.nn.functional as F
|
||||
import torch.optim as optim
|
||||
from torchvision import datasets, transforms
|
||||
from torch.autograd import Variable
|
||||
from torch.utils.tensorboard import SummaryWriter
|
||||
|
||||
from clearml import Task, OutputModel
|
||||
|
||||
|
||||
class Net(nn.Module):
|
||||
|
||||
def __init__(self):
|
||||
super(Net, self).__init__()
|
||||
self.conv1 = nn.Conv2d(1, 10, kernel_size=5)
|
||||
self.conv2 = nn.Conv2d(10, 20, kernel_size=5)
|
||||
self.conv2_drop = nn.Dropout2d()
|
||||
self.fc1 = nn.Linear(320, 50)
|
||||
self.fc2 = nn.Linear(50, 10)
|
||||
|
||||
def forward(self, x):
|
||||
x = F.relu(F.max_pool2d(self.conv1(x), 2))
|
||||
x = F.relu(F.max_pool2d(self.conv2_drop(self.conv2(x)), 2))
|
||||
x = x.view(-1, 320)
|
||||
x = F.relu(self.fc1(x))
|
||||
x = F.dropout(x, training=self.training)
|
||||
x = self.fc2(x)
|
||||
return F.log_softmax(x, dim=1)
|
||||
|
||||
|
||||
def train(model, epoch, train_loader, args, optimizer, writer):
|
||||
model.train()
|
||||
for batch_idx, (data, target) in enumerate(train_loader):
|
||||
if args.cuda:
|
||||
data, target = data.cuda(), target.cuda()
|
||||
data, target = Variable(data), Variable(target)
|
||||
optimizer.zero_grad()
|
||||
output = model(data)
|
||||
loss = F.nll_loss(output, target)
|
||||
loss.backward()
|
||||
optimizer.step()
|
||||
if batch_idx % args.log_interval == 0:
|
||||
print('Train Epoch: {} [{}/{} ({:.0f}%)]\tLoss: {:.6f}'.format(
|
||||
epoch, batch_idx * len(data), len(train_loader.dataset),
|
||||
100. * batch_idx / len(train_loader), loss.data.item()))
|
||||
niter = epoch*len(train_loader)+batch_idx
|
||||
writer.add_scalar('Train/Loss', loss.data.item(), niter)
|
||||
|
||||
|
||||
def test(model, test_loader, args, optimizer, writer):
|
||||
model.eval()
|
||||
test_loss = 0
|
||||
correct = 0
|
||||
for niter, (data, target) in enumerate(test_loader):
|
||||
if args.cuda:
|
||||
data, target = data.cuda(), target.cuda()
|
||||
data, target = Variable(data), Variable(target)
|
||||
output = model(data)
|
||||
test_loss += F.nll_loss(output, target, reduction='sum').data.item() # sum up batch loss
|
||||
pred = output.data.max(1)[1] # get the index of the max log-probability
|
||||
pred = pred.eq(target.data).cpu().sum()
|
||||
writer.add_scalar('Test/Loss', pred, niter)
|
||||
correct += pred
|
||||
if niter % 100 == 0:
|
||||
writer.add_image('test', data[0, :, :, :], niter)
|
||||
|
||||
test_loss /= len(test_loader.dataset)
|
||||
print('\nTest set: Average loss: {:.4f}, Accuracy: {}/{} ({:.0f}%)\n'.format(
|
||||
test_loss, correct, len(test_loader.dataset),
|
||||
100. * correct / len(test_loader.dataset)))
|
||||
|
||||
|
||||
def main():
|
||||
# Training settings
|
||||
parser = argparse.ArgumentParser(description='PyTorch MNIST Example')
|
||||
parser.add_argument('--batch-size', type=int, default=64, metavar='N',
|
||||
help='input batch size for training (default: 64)')
|
||||
parser.add_argument('--test-batch-size', type=int, default=1000, metavar='N',
|
||||
help='input batch size for testing (default: 1000)')
|
||||
parser.add_argument('--epochs', type=int, default=10, metavar='N',
|
||||
help='number of epochs to train (default: 10)')
|
||||
parser.add_argument('--lr', type=float, default=0.01, metavar='LR',
|
||||
help='learning rate (default: 0.01)')
|
||||
parser.add_argument('--momentum', type=float, default=0.5, metavar='M',
|
||||
help='SGD momentum (default: 0.5)')
|
||||
parser.add_argument('--no-cuda', action='store_true', default=False,
|
||||
help='disables CUDA training')
|
||||
parser.add_argument('--seed', type=int, default=1, metavar='S',
|
||||
help='random seed (default: 1)')
|
||||
parser.add_argument('--log-interval', type=int, default=10, metavar='N',
|
||||
help='how many batches to wait before logging training status')
|
||||
args = parser.parse_args()
|
||||
|
||||
# Connecting ClearML with the current process,
|
||||
# from here on everything is logged automatically
|
||||
task = Task.init(project_name='serving examples', task_name='train pytorch model', output_uri=True) # noqa: F841
|
||||
writer = SummaryWriter('runs')
|
||||
writer.add_text('TEXT', 'This is some text', 0)
|
||||
args.cuda = not args.no_cuda and torch.cuda.is_available()
|
||||
|
||||
torch.manual_seed(args.seed)
|
||||
if args.cuda:
|
||||
torch.cuda.manual_seed(args.seed)
|
||||
|
||||
kwargs = {'num_workers': 4, 'pin_memory': True} if args.cuda else {}
|
||||
train_loader = torch.utils.data.DataLoader(datasets.MNIST('./data', train=True, download=True,
|
||||
transform=transforms.Compose([
|
||||
transforms.ToTensor(),
|
||||
transforms.Normalize((0.1307,), (0.3081,))])),
|
||||
batch_size=args.batch_size, shuffle=True, **kwargs)
|
||||
test_loader = torch.utils.data.DataLoader(datasets.MNIST('./data', train=False,
|
||||
transform=transforms.Compose([
|
||||
transforms.ToTensor(),
|
||||
transforms.Normalize((0.1307,), (0.3081,))])),
|
||||
batch_size=args.test_batch_size, shuffle=True, **kwargs)
|
||||
|
||||
model = Net()
|
||||
if args.cuda:
|
||||
model.cuda()
|
||||
|
||||
optimizer = optim.SGD(model.parameters(), lr=args.lr, momentum=args.momentum)
|
||||
|
||||
for epoch in range(1, args.epochs + 1):
|
||||
train(model, epoch, train_loader, args, optimizer, writer)
|
||||
|
||||
# store in a way we can easily load into triton without having to have the model class
|
||||
torch.jit.script(model).save('serving_model.pt')
|
||||
OutputModel().update_weights('serving_model.pt')
|
||||
test(model, test_loader, args, optimizer, writer)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
19
examples/sklearn/preprocess.py
Normal file
19
examples/sklearn/preprocess.py
Normal file
@@ -0,0 +1,19 @@
|
||||
from typing import Any
|
||||
|
||||
import numpy as np
|
||||
|
||||
|
||||
# Notice Preprocess class Must be named "Preprocess"
|
||||
class Preprocess(object):
|
||||
def __init__(self):
|
||||
# set internal state, this will be called only once. (i.e. not per request)
|
||||
pass
|
||||
|
||||
def preprocess(self, body: dict) -> Any:
|
||||
# we expect to get two valid on the dict x0, and x1
|
||||
return [[body.get("x0", None), body.get("x1", None)], ]
|
||||
|
||||
def postprocess(self, data: Any) -> dict:
|
||||
# post process the data returned from the model inference engine
|
||||
# data is the return value from model.predict we will put is inside a return value as Y
|
||||
return dict(y=data.tolist() if isinstance(data, np.ndarray) else data)
|
||||
39
examples/sklearn/readme.md
Normal file
39
examples/sklearn/readme.md
Normal file
@@ -0,0 +1,39 @@
|
||||
# Train and Deploy Scikit-Learn model
|
||||
|
||||
## training mock model
|
||||
|
||||
Run the mock python training code
|
||||
```bash
|
||||
python3 train_model.py
|
||||
```
|
||||
|
||||
The output will be a model created on the project "serving examples", by the name "train sklearn model"
|
||||
|
||||
## setting up the serving service
|
||||
|
||||
1. Create serving Service: `clearml-serving create --name "serving example"` (write down the service ID)
|
||||
2. Create model endpoint:
|
||||
`clearml-serving --id <service_id> model add --engine sklearn --endpoint "test_model_sklearn" --preprocess "preprocess.py" --name "train sklearn model" --project "serving examples"`
|
||||
Or auto update
|
||||
`clearml-serving --id <service_id> model auto-update --engine sklearn --endpoint "test_model_sklearn_auto" --preprocess "preprocess.py" --name "train sklearn model" --project "serving examples" --max-versions 2`
|
||||
Or add Canary endpoint
|
||||
`clearml-serving --id <service_id> model canary --endpoint "test_model_sklearn_auto" --weights 0.1 0.9 --input-endpoint-prefix test_model_sklearn_auto`
|
||||
|
||||
4. Run the clearml-serving container `docker run -v ~/clearml.conf:/root/clearml.conf -p 8080:8080 -e CLEARML_SERVING_TASK_ID=<service_id> clearml-serving:latest`
|
||||
5. Test new endpoint: `curl -X POST "http://127.0.0.1:8080/serve/test_model_sklearn" -H "accept: application/json" -H "Content-Type: application/json" -d '{"x0": 1, "x1": 2}'`
|
||||
|
||||
> **_Notice:_** You can also change the serving service while it is already running!
|
||||
This includes adding/removing endpoints, adding canary model routing etc.
|
||||
|
||||
|
||||
### Running / debugging the serving service manually
|
||||
Once you have setup the Serving Service Task
|
||||
|
||||
```bash
|
||||
$ pip3 install -r clearml_serving/serving/requirements.txt
|
||||
$ CLEARML_SERVING_TASK_ID=<service_id> PYHTONPATH=$(pwd) python3 -m gunicorn \
|
||||
--preload clearml_serving.serving.main:app \
|
||||
--workers 4 \
|
||||
--worker-class uvicorn.workers.UvicornWorker \
|
||||
--bind 0.0.0.0:8080
|
||||
```
|
||||
15
examples/sklearn/train_model.py
Normal file
15
examples/sklearn/train_model.py
Normal file
@@ -0,0 +1,15 @@
|
||||
from sklearn.linear_model import LogisticRegression
|
||||
from sklearn.datasets import make_blobs
|
||||
from joblib import dump
|
||||
from clearml import Task
|
||||
|
||||
task = Task.init(project_name="serving examples", task_name="train sklearn model", output_uri=True)
|
||||
|
||||
# generate 2d classification dataset
|
||||
X, y = make_blobs(n_samples=100, centers=2, n_features=2, random_state=1)
|
||||
# fit final model
|
||||
model = LogisticRegression()
|
||||
model.fit(X, y)
|
||||
|
||||
dump(model, filename="sklearn-model.pkl", compress=9)
|
||||
|
||||
21
examples/xgboost/preprocess.py
Normal file
21
examples/xgboost/preprocess.py
Normal file
@@ -0,0 +1,21 @@
|
||||
from typing import Any
|
||||
|
||||
import numpy as np
|
||||
import xgboost as xgb
|
||||
|
||||
|
||||
# Notice Preprocess class Must be named "Preprocess"
|
||||
class Preprocess(object):
|
||||
def __init__(self):
|
||||
# set internal state, this will be called only once. (i.e. not per request)
|
||||
pass
|
||||
|
||||
def preprocess(self, body: dict) -> Any:
|
||||
# we expect to get four valid numbers on the dict: x0, x1, x2, x3
|
||||
return xgb.DMatrix(
|
||||
[[body.get("x0", None), body.get("x1", None), body.get("x2", None), body.get("x3", None)]])
|
||||
|
||||
def postprocess(self, data: Any) -> dict:
|
||||
# post process the data returned from the model inference engine
|
||||
# data is the return value from model.predict we will put is inside a return value as Y
|
||||
return dict(y=data.tolist() if isinstance(data, np.ndarray) else data)
|
||||
40
examples/xgboost/readme.md
Normal file
40
examples/xgboost/readme.md
Normal file
@@ -0,0 +1,40 @@
|
||||
# Train and Deploy XGBoost model
|
||||
|
||||
## training mock model
|
||||
|
||||
Run the mock python training code
|
||||
```bash
|
||||
python3 train_model.py
|
||||
```
|
||||
|
||||
The output will be a model created on the project "serving examples", by the name "train xgboost model"
|
||||
|
||||
## setting up the serving service
|
||||
|
||||
1. Create serving Service: `clearml-serving create --name "serving example"` (write down the service ID)
|
||||
2. Create model endpoint:
|
||||
|
||||
3. `clearml-serving --id <service_id> model add --engine xgboost --endpoint "test_model_xgb" --preprocess "preprocess.py" --name "train xgboost model" --project "serving examples"`
|
||||
Or auto update
|
||||
`clearml-serving --id <service_id> model auto-update --engine xgboost --endpoint "test_model_xgb_auto" --preprocess "preprocess.py" --name "train xgboost model" --project "serving examples" --max-versions 2`
|
||||
Or add Canary endpoint
|
||||
`clearml-serving --id <service_id> model canary --endpoint "test_model_xgb_auto" --weights 0.1 0.9 --input-endpoint-prefix test_model_xgb_auto`
|
||||
|
||||
4. Run the clearml-serving container `docker run -v ~/clearml.conf:/root/clearml.conf -p 8080:8080 -e CLEARML_SERVING_TASK_ID=<service_id> clearml-serving:latest`
|
||||
5. Test new endpoint: `curl -X POST "http://127.0.0.1:8080/serve/test_model_xgb" -H "accept: application/json" -H "Content-Type: application/json" -d '{"x0": 1, "x1": 2, "x2": 3, "x3": 4}'`
|
||||
|
||||
> **_Notice:_** You can also change the serving service while it is already running!
|
||||
This includes adding/removing endpoints, adding canary model routing etc.
|
||||
|
||||
|
||||
### Running / debugging the serving service manually
|
||||
Once you have setup the Serving Service Task
|
||||
|
||||
```bash
|
||||
$ pip3 install -r clearml_serving/serving/requirements.txt
|
||||
$ CLEARML_SERVING_TASK_ID=<service_id> PYHTONPATH=$(pwd) python3 -m gunicorn \
|
||||
--preload clearml_serving.serving.main:app \
|
||||
--workers 4 \
|
||||
--worker-class uvicorn.workers.UvicornWorker \
|
||||
--bind 0.0.0.0:8080
|
||||
```
|
||||
28
examples/xgboost/train_model.py
Normal file
28
examples/xgboost/train_model.py
Normal file
@@ -0,0 +1,28 @@
|
||||
import xgboost as xgb
|
||||
from sklearn.datasets import load_iris
|
||||
from sklearn.model_selection import train_test_split
|
||||
|
||||
from clearml import Task
|
||||
|
||||
task = Task.init(project_name="serving examples", task_name="train xgboost model", output_uri=True)
|
||||
|
||||
X, y = load_iris(return_X_y=True)
|
||||
X_train, X_test, y_train, y_test = train_test_split(
|
||||
X, y, test_size=0.2, random_state=100
|
||||
)
|
||||
|
||||
dtrain = xgb.DMatrix(X_train, label=y_train)
|
||||
dtest = xgb.DMatrix(X_test, label=y_test)
|
||||
|
||||
params = {"objective": "reg:squarederror", "eval_metric": "rmse"}
|
||||
|
||||
|
||||
bst = xgb.train(
|
||||
params,
|
||||
dtrain,
|
||||
num_boost_round=100,
|
||||
evals=[(dtrain, "train"), (dtest, "test")],
|
||||
verbose_eval=0,
|
||||
)
|
||||
|
||||
bst.save_model("xgb_model")
|
||||
@@ -1 +1 @@
|
||||
clearml >= 0.17.6rc1
|
||||
clearml >= 1.1.6
|
||||
|
||||
Reference in New Issue
Block a user