Merge branch 'microserviceML' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into dev

# Conflicts:
#	backend/microservice/mlservice.py

1 files changed, 16 insertions, 5 deletions

diff --git a/backend/microservice/api.py b/backend/microservice/api.py
index b2fb503b..4768f34c 100644
--- a/backend/microservice/api.py
+++ b/backend/microservice/api.py
@@ -8,7 +8,9 @@ import keras
 import csv
 import json
 import mlservice
-from mlservice import obuka
+import h5py
+from mlservice2 import unositok
+
 
 app = flask.Flask(__name__)
 app.config["DEBUG"] = True
@@ -21,8 +23,17 @@ def index():
 @app.route('/data', methods = ['GET', 'POST'])
 def data():
     if request.method == 'POST':
-        f = request.json['filepath']  
-        data = pd.read_csv(f)
-        print(data)
-        return obuka(data,request.json)
+        print(request.json['filepath'])
+        f = request.json['filepath']
+
+        data1 = pd.read_csv(f)
+
+        d2=request.json['filepath2']
+        data2=pd.read_csv(d2)
+        
+        m=request.json['modelpath']
+        model=tf.keras.models.load_model(m)
+        
+        #print(data)
+        return unositok(data1,data2,request.json,model)
 app.run()
\ No newline at end of file