From 724000d1dc30f456d77d39a233a309bb9e36f5a9 Mon Sep 17 00:00:00 2001
From: Danijel Andjelkovic <adanijel99@gmail.com>
Date: Thu, 7 Apr 2022 13:25:02 +0200
Subject: Ispravio mlkrontroler backend i frontend tako da je dataset
 sinhronizovan i osposobio preprocesiranje.

---
 backend/microservice/api/controller.py | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

(limited to 'backend/microservice/api/controller.py')

diff --git a/backend/microservice/api/controller.py b/backend/microservice/api/controller.py
index 1b17f727..ff803358 100644
--- a/backend/microservice/api/controller.py
+++ b/backend/microservice/api/controller.py
@@ -4,6 +4,7 @@ import ml_socket
 import newmlservice
 import tensorflow as tf
 import pandas as pd
+import json
 
 app = flask.Flask(__name__)
 app.config["DEBUG"] = True
@@ -41,14 +42,20 @@ def predict():
 
 @app.route('/preprocess',methods=['POST'])
 def returnColumnsInfo():
-    f=request.json['filepathcolinfo']
-    dataset=pd.read_csv(f)
-    
-    result=newmlservice.returnColumnsInfo(dataset)
-
-    return jsonify(result)
-    
-
+    print("********************************PREPROCESS*******************************")
+    dataset = json.loads(request.form["dataset"])
+    file = request.files.get("file")
+    data=pd.read_csv(file)
+    preprocess = newmlservice.returnColumnsInfo(data)
+    #samo 10 jedinstvenih posto ih ima previse, bilo bi dobro da promenimo ovo da to budu 10 najzastupljenijih vrednosti
+    for col in preprocess["columnInfo"]:
+        col["uniqueValues"] = col["uniqueValues"][0:10]
+    dataset["columnInfo"] = preprocess["columnInfo"]
+    dataset["nullCols"] = preprocess["allNullColl"]
+    dataset["nullRows"] = preprocess["allNullRows"]
+    dataset["isPreProcess"] = True
+    print(dataset)
+    return jsonify(dataset)
     
 print("App loaded.")
 ml_socket.start()
-- 
cgit v1.2.3