update two server.py files

inference_server/server.py

@@ -1,15 +1,31 @@
 '''
 sudo docker run --gpus all --runtime=nvidia --rm \
-    -v /home/fantasyfish/Desktop/dotdemo/third_party:/third_party \
-    -v /home/fantasyfish/Desktop/dotdemo/examples:/inputDir \
-    -v /home/fantasyfish/Desktop/dotdemo/logs:/logs \
-    -v /home/fantasyfish/Desktop/dotdemo/results:/outputDir \
-    -v /home/fantasyfish/Desktop/dotdemo/inference_server:/app \
-    -p 8081:8081 \
-    -it rvc:v0
-curl -X GET http://localhost:8081/inference \
+    -v /home/ubuntu/dotdemo/third_party:/third_party \
+    -v /home/ubuntu/dotdemo-dev:/dotdemo-dev \
+    -v /home/ubuntu/dot-demo-assets/ml-logs:/logs \
+    -v /home/ubuntu/audio-inference-output:/outputDir \
+    -v /home/ubuntu/dotdemo/inference_server:/app \
+    --network="host" \
+    -it fantasyfish677/rvc:v0 /bin/bash
+pip3 install flask_cors
+python3 /app/server.py 2>&1 | tee /logs/inference_server.log
+
+export FLASK_APP=server
+export FLASK_DEBUG=true
+pip3 install gunicorn
+gunicorn -b 0.0.0.0:8080 -w 4 --timeout=600 server:app
+
+curl -X POST http://3.16.130.199:8081/ping
+
+curl -X POST http://3.16.130.199:8081/available-models
+
+curl -X POST http://3.16.130.199:8081/inference \
+   -H 'Content-Type: application/json' \
+   -d '{"expName":"CashMoney","audioFilePath":"radwimps.mp3", "pitchShift": 0, "saveFilePath":"radwimps_CashMoney.wav"}'
+
+curl -X POST http://3.16.130.199:8081/delete \
    -H 'Content-Type: application/json' \
-   -d '{"expName":"drake-20","audioFileName":"radwimps.mp3", "pitchShift": 0, "saveFileName":"radwimps_drake-20.wav"}'
+   -d '{"modelName":"drake-100"}'
 '''
 import json
 import os
@@ -18,16 +34,22 @@ from logging import exception
 import time
 from server_utils import model_inference_single
 from glob import glob
+from flask_cors import CORS, cross_origin
+import shutil
 
 print("import successful!")
 
-app = Flask(__name__)
+app = Flask("inference server")
+cors = CORS(app)
+app.config['CORS_HEADERS'] = 'Content-Type'
 
-@app.route("/ping")
+@app.route("/ping", methods=['GET', 'POST'])
+@cross_origin()
 def healthcheck():
     return json.dumps({"code": 200, "message": "responding"}).encode('utf-8')
 
-@app.route("/inference", methods=['GET'])
+@app.route("/inference", methods=['GET', 'POST'])
+@cross_origin()
 def inference():
     if request.headers['Content-Type'] != 'application/json':
         exception("Header error")
@@ -35,12 +57,12 @@ def inference():
     try:
         content = request.get_json()
         exp_name = content['expName']
-        audio_file_name = content['audioFileName']
+        audio_file_path = content['audioFilePath']
         pitch_shift = content['pitchShift']
-        save_file_name = content['saveFileName']
+        save_file_path = content['saveFilePath']
         
         model_path = exp_name + '.pth'
-        audio_path = os.path.join('/inputDir', audio_file_name)
+        audio_path = os.path.join('/dotdemo-dev', audio_file_path)
         if not os.path.exists('/third_party/RVC/weights/{}'.format(model_path)):
             exception("Model doesn't exist")
             return json.dumps({"message":"Model doesn't exist"}), 404
@@ -48,7 +70,10 @@ def inference():
             exception("Audio file doesn't exist")
             return json.dumps({"message":"Audio file doesn't exist"}), 404
 
-        save_path = os.path.join('/outputDir', save_file_name)
+        save_path = os.path.join('/dotdemo-dev', save_file_path)
+        save_dir = os.path.dirname(save_path)
+        os.makedirs(save_dir, exist_ok=True)
+
         error_log_path = os.path.join("/logs{}.log".format(exp_name))
         index_path_list = glob("/third_party/RVC/logs/{}/added_IVF*_Flat_nprobe_1_v1.index".format(exp_name))
         index_path = index_path_list[0] if len(index_path_list) > 0 else ""
@@ -62,5 +87,40 @@ def inference():
         exception("Training process failed")
         return json.dumps({"message":"Inference process failed due to {}".format(e)}), 500
 
+@app.route("/available-models", methods=['GET', 'POST'])
+@cross_origin()
+def get_available_models():
+    model_dir = '/third_party/RVC/weights'
+    model_list = os.listdir(model_dir)
+    model_list = [model_name[:-4] for model_name in model_list]
+    return json.dumps({"message": ','.join(model_list)}), 200
+
+@app.route("/delete", methods=['GET', 'POST'])
+@cross_origin()
+def delete_model():
+    if request.headers['Content-Type'] != 'application/json':
+        exception("Header error")
+        return json.dumps({"message":"Header error"}), 500
+    try:
+        content = request.get_json()
+        model_name = content['modelName']
+        if model_name == "mute":
+            return json.dumps({"message": "Sorry, it's not allowed to delete mute directory"}), 500
+
+        model_dir = '/third_party/RVC/weights'
+        model_path = '{}/{}.pth'.format(model_dir, model_name)
+        if not os.path.exists(model_path):
+            exception("Model doesn't exist")
+            return json.dumps({"message":"Model doesn't exist"}), 404
+        
+        os.remove(model_path)
+        log_dir = '/third_party/RVC/logs/' + model_name
+        if os.path.exists(log_dir):
+            shutil.rmtree(model_path)
+        return json.dumps({"message": 'Model {} has been deleted'.format(model_name)}), 200
+    except Exception as e:
+        exception("Training process failed")
+        return json.dumps({"message":"Inference process failed due to {}".format(e)}), 500
+
 if __name__ == "__main__":
      app.run(host="0.0.0.0", port=8081, debug=True)

train_server/server.py

@@ -1,18 +1,29 @@
 '''
 sudo docker run --gpus all --runtime=nvidia --rm \
-    -v /home/fantasyfish/Desktop/dotdemo/third_party:/third_party \
-    -v /home/fantasyfish/Desktop/dotdemo/examples:/inputDir \
-    -v /home/fantasyfish/Desktop/dotdemo/logs:/logs \
-    -v /home/fantasyfish/Desktop/dotdemo/train_server:/app \
-    -p 8080:8080 \
-    -it rvc:v0
-curl -X GET http://localhost:8080/train \
-   -H 'Content-Type: application/json' \
-   -d '{"expName":"drake-20","trainsetDir":"drake"}'
+    -v /home/ubuntu/dotdemo/third_party:/third_party \
+    -v /home/ubuntu/dotdemo-dev:/dotdemo-dev \
+    -v /home/ubuntu/dot-demo-assets/ml-logs:/logs \
+    -v /home/ubuntu/dotdemo/train_server:/app \
+    --network="host" \
+    --shm-size 1G \
+    -it fantasyfish677/rvc:v0 /bin/bash
+pip3 install flask_cors
+python3 /app/server.py 2>&1 | tee /logs/train_server.log
 
-curl -X GET http://localhost:8080/check \
-   -H 'Content-Type: application/json' \
-   -d '{"expName":"drake-20"}'
+export FLASK_APP=server
+export FLASK_DEBUG=true
+pip3 install gunicorn
+gunicorn -b :8080 --timeout=600 server:app
+
+curl -X GET http://3.16.130.199:8080/ping
+
+curl -X POST http://3.16.130.199:8080/train \
+-H 'Content-Type: application/json' \
+-d '{"expName":"varun124","trainsetDir":"varun124"}'
+
+curl -X GET http://3.16.130.199:8080/check \
+-H 'Content-Type: application/json' \
+-d '{"expName":"kanye-1"}'
 '''
 import json
 import os
@@ -20,16 +31,21 @@ from flask import Flask, request
 from logging import exception
 import time
 from server_utils import train_model
+from flask_cors import CORS, cross_origin
 
 print("import successful!")
 
-app = Flask(__name__)
+app = Flask("train server")
+cors = CORS(app)
+app.config['CORS_HEADERS'] = 'Content-Type'
 
-@app.route("/ping")
+@app.route("/ping", methods=['GET', 'POST'])
+@cross_origin()
 def healthcheck():
     return json.dumps({"code": 200, "message": "responding"}).encode('utf-8')
 
-@app.route("/train", methods=['GET'])
+@app.route("/train", methods=['GET', 'POST'])
+@cross_origin()
 def train():
     if request.headers['Content-Type'] != 'application/json':
         exception("Header error")
@@ -37,7 +53,7 @@ def train():
     try:
         content = request.get_json()
         exp_name = content['expName']
-        trainset_dir = os.path.join('/inputDir', content['trainsetDir'])
+        trainset_dir = os.path.join('/dotdemo-dev', content['trainsetDir'])
         log_path = os.path.join("/logs{}.log".format(exp_name))
         if os.path.exists('/third_party/RVC/logs/{}'.format(exp_name)):
             os.system('rm -rf /third_party/RVC/logs/{}'.format(exp_name))
@@ -54,7 +70,8 @@ def train():
         exception("Training process failed")
         return json.dumps({"message":"Training process failed due to {}".format(e)}), 500
 
-@app.route("/check", methods=['GET'])
+@app.route("/check", methods=['GET', 'POST'])
+@cross_origin()
 def check():
     if request.headers['Content-Type'] != 'application/json':
         exception("Header error")