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

1 files changed, 25 insertions, 10 deletions

diff --git a/backend/microservice/api/controller.py b/backend/microservice/api/controller.py
index 7852b63d..c82634a2 100644
--- a/backend/microservice/api/controller.py
+++ b/backend/microservice/api/controller.py
@@ -69,22 +69,30 @@ def train():
     
 
     #dataset, paramsModel, paramsExperiment, callback)
-    filepath,result,finalMetrics= newmlservice.train(data, paramsModel, paramsExperiment,paramsDataset, train_callback)
+    filepath,histMetrics= newmlservice.train(data, paramsModel, paramsExperiment,paramsDataset, train_callback)
     """
     f = request.json['filepath']
     dataset = pd.read_csv(f)
     filepath,result=newmlservice.train(dataset,request.json['model'],train_callback)
     print(result)
     """
-
-
+    #m = []
+    #for attribute, value in result.items():
+       #m.append(histMetrics(attribute,str(value)).__dict__)
+    '''
+    m = []
+    for attribute, value in result.items():
+        m.append({"Name" : attribute, "JsonValue" : value}))
+    
+    print("**************************************************************")
+    print(m)
+    
+    print("**************************************************************")
+    '''
     url = config.api_url + "/file/h5"
     files = {'file': open(filepath, 'rb')}
     r=requests.post(url, files=files,data={"uploaderId":paramsExperiment['uploaderId']})
     fileId=r.text
-    m = []
-    for attribute, value in result.items():
-        m.append({"Name" : attribute, "JsonValue" : value})
     predictor = {
         "_id" : "",
         "uploaderId" : paramsModel["uploaderId"],
@@ -95,14 +103,21 @@ def train():
         "experimentId" : paramsExperiment["_id"],
         "modelId" : paramsModel["_id"],
         "h5FileId" : fileId,
-        "metrics" : m,
-        "finalMetrics":finalMetrics
-        
+        "metricsLoss":histMetrics[0],
+        "metricsValLoss":histMetrics[1],
+        "metricsAcc":histMetrics[2],
+        "metricsValAcc":histMetrics[3],
+        "metricsMae":histMetrics[4],
+        "metricsValMae":histMetrics[5],
+        "metricsMse":histMetrics[6],
+        "metricsValMse":histMetrics[7]
     }
     #print(predictor)
+    
     url = config.api_url + "/Predictor/add"
     r = requests.post(url, json=predictor).text
-    print(r)
+    
+    #print(r)
     return r
 
 @app.route('/predict', methods = ['POST'])