Prepravka za usaglašavanje sa frontend-om.

2 files changed, 17 insertions, 14 deletions

diff --git a/backend/microservice/api/controller.py b/backend/microservice/api/controller.py
index 95ceccbb..437690ee 100644
--- a/backend/microservice/api/controller.py
+++ b/backend/microservice/api/controller.py
@@ -65,19 +65,22 @@ def train():
     files = {'file': open(filepath, 'rb')}
     r=requests.post(url, files=files)
     fileId=r.text
-    predictor = Predictor()
-    predictor._id = ""
-    predictor.username = paramsModel["username"]
-    predictor.inputs = paramsExperiment["inputColumns"]
-    predictor.output = paramsExperiment["outputColumn"]
-    predictor.isPublic = False
-    predictor.accessibleByLink = False
-    predictor.dateCreated = datetime.now()
-    predictor.experimentId = paramsExperiment["_id"]
-    predictor.modelId = paramsModel["_id"]
-    predictor.h5FileId = fileId
+    predictor = Predictor(
+        _id = "",
+        username = paramsModel["username"],
+        inputs = paramsExperiment["inputColumns"],
+        output = paramsExperiment["outputColumn"],
+        isPublic = False,
+        accessibleByLink = False,
+        dateCreated = datetime.now(),
+        experimentId = paramsExperiment["_id"],
+        modelId = paramsModel["_id"],
+        h5FileId = fileId,
+        metrics=[]
+    )
 
     print(result)
+    print(predictor)
     return jsonify(result)
 
 @app.route('/predict', methods = ['POST'])
diff --git a/backend/microservice/api/newmlservice.py b/backend/microservice/api/newmlservice.py
index e81192ab..585db480 100644
--- a/backend/microservice/api/newmlservice.py
+++ b/backend/microservice/api/newmlservice.py
@@ -122,7 +122,7 @@ def train(dataset, paramsModel,paramsExperiment,paramsDataset,callback):
     for col in paramsExperiment["inputColumns"]:
         #print(col)
         data[col]=dataset[col]
-    output_column = paramsExperiment["columnToPredict"]
+    output_column = paramsExperiment["outputColumn"]
     data[output_column] = dataset[output_column]
     #print(data)
 
@@ -297,8 +297,8 @@ def train(dataset, paramsModel,paramsExperiment,paramsDataset,callback):
         history=classifier.fit(x_train, y_train, epochs = paramsModel['epochs'],batch_size=paramsModel['batchSize'])
      
         hist=history.history
-        plt.plot(hist['accuracy'])
-        plt.show()
+        #plt.plot(hist['accuracy'])
+        #plt.show()
         y_pred=classifier.predict(x_test)
         y_pred=np.argmax(y_pred,axis=1)