4 files changed, 15 insertions, 7 deletions
diff --git a/backend/microservice/api/config.py b/backend/microservice/api/config.py
new file mode 100644
index 00000000..2b6fbe89
--- /dev/null
+++ b/backend/microservice/api/config.py
@@ -0,0 +1,2 @@
+api_url = "http://localhost:5283/api"
+
diff --git a/backend/microservice/api/controller.py b/backend/microservice/api/controller.py
index 4d9f8f2a..937e643b 100644
--- a/backend/microservice/api/controller.py
+++ b/backend/microservice/api/controller.py
@@ -5,6 +5,8 @@ import newmlservice
 import tensorflow as tf
 import pandas as pd
 import json
+import requests
+import config
 
 app = flask.Flask(__name__)
 app.config["DEBUG"] = True
@@ -17,16 +19,19 @@ class train_callback(tf.keras.callbacks.Callback):
     #
     def on_epoch_end(self, epoch, logs=None):
         print(epoch)
-        ml_socket.send(epoch)
+        #ml_socket.send(epoch)
+        #file = request.files.get("file")
+        url = config.api_url + "/Model/epoch"
+        requests.post(url, epoch).text
         #print('Evaluation: ', self.model.evaluate(self.x_test,self.y_test),"\n") #broj parametara zavisi od izabranih metrika loss je default
 
 @app.route('/train', methods = ['POST'])
 def train():
     print("******************************TRAIN*************************************************")
-    f = request.json["dataset"]
-    dataset = pd.read_csv(f)
-    #
-    result = newmlservice.train(dataset, request.json["model"], train_callback)
+    f = request.files.get("file")
+    data = pd.read_csv(f)
+    #dataset, paramsModel, paramsExperiment, callback)
+    result = newmlservice.train(data, request.json["model"], request.json["experiment"], request.json["dataset"], train_callback)
     print(result)
     return jsonify(result)
 
diff --git a/backend/microservice/api/ml_service.py b/backend/microservice/api/ml_service.py
index 4d2212f7..16ee7cc6 100644
--- a/backend/microservice/api/ml_service.py
+++ b/backend/microservice/api/ml_service.py
@@ -101,7 +101,7 @@ class TrainingResultRegression:
 class TrainingResult:
     metrics: dict
 '''
-def train(dataset, paramsModel, paramsExperiment, callback):
+def train(dataset, paramsModel, paramsExperiment, paramsDataset, callback):
     problem_type = paramsModel["type"]
     dataModel = pd.DataFrame()
     dataExperiment = pd.DataFrame()
diff --git a/backend/microservice/api/ml_socket.py b/backend/microservice/ml_socket.py
index cab157eb..c624ffaa 100644
--- a/backend/microservice/api/ml_socket.py
+++ b/backend/microservice/ml_socket.py
@@ -24,7 +24,8 @@ async def start():
     get_or_create_eventloop().run_until_complete(start_server)
     get_or_create_eventloop().run_forever()
 
+
 async def send(msg):
     print("WS sending message:")
     print(msg)
-    await websocket.send(msg)
-\ No newline at end of file
+    await websocket.send(msg)