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

# Conflicts:
#	frontend/src/app/_pages/add-model/add-model.component.html
#	frontend/src/app/_pages/add-model/add-model.component.ts
#	frontend/src/app/app.module.ts

1 files changed, 17 insertions, 5 deletions

diff --git a/backend/microservice/api/controller.py b/backend/microservice/api/controller.py
index 059af317..1b17f727 100644
--- a/backend/microservice/api/controller.py
+++ b/backend/microservice/api/controller.py
@@ -1,7 +1,7 @@
 import flask
 from flask import request, jsonify
 import ml_socket
-import ml_service
+import newmlservice
 import tensorflow as tf
 import pandas as pd
 
@@ -25,7 +25,7 @@ def train():
     f = request.json["dataset"]
     dataset = pd.read_csv(f)
     #
-    result = ml_service.train(dataset, request.json["model"], train_callback)
+    result = newmlservice.train(dataset, request.json["model"], train_callback)
     print(result)
     return jsonify(result)
 
@@ -34,10 +34,22 @@ def predict():
     f = request.json['filepath']
     dataset = pd.read_csv(f)
     m = request.json['modelpath']
-    #model = tf.keras.models.load_model(m)
-    #
-    #model.predict?
+    model = tf.keras.models.load_model(m)
+    print("********************************model loaded*******************************")
+    newmlservice.manageH5(dataset,request.json['model'],model)
+    return "done"
+
+@app.route('/preprocess',methods=['POST'])
+def returnColumnsInfo():
+    f=request.json['filepathcolinfo']
+    dataset=pd.read_csv(f)
+    
+    result=newmlservice.returnColumnsInfo(dataset)
+
+    return jsonify(result)
+    
 
+    
 print("App loaded.")
 ml_socket.start()
 app.run()
\ No newline at end of file