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

5 files changed, 86 insertions, 9 deletions

diff --git a/backend/microservice/PythonServer/project/api/api.py b/backend/microservice/PythonServer/project/api/api.py
index 1f4afdeb..b2fb503b 100644
--- a/backend/microservice/PythonServer/project/api/api.py
+++ b/backend/microservice/PythonServer/project/api/api.py
@@ -7,7 +7,8 @@ import pandas as pd
 import keras
 import csv
 import json
-
+import mlservice
+from mlservice import obuka
 
 app = flask.Flask(__name__)
 app.config["DEBUG"] = True
@@ -20,13 +21,8 @@ def index():
 @app.route('/data', methods = ['GET', 'POST'])
 def data():
     if request.method == 'POST':
-        f = request.json['filepath']
-        data = []
-        with open(f) as file:
-            csvfile = csv.reader(file)
-            for row in csvfile:
-                data.append(row)
-        data = pd.DataFrame(data)
+        f = request.json['filepath']  
+        data = pd.read_csv(f)
         print(data)
-        return render_template('data.html', data = data.to_html(header=False, index=False))
+        return obuka(data,request.json)
 app.run()
\ No newline at end of file
diff --git a/backend/microservice/PythonServer/project/api/socket/client.py b/backend/microservice/PythonServer/project/api/socket/client.py
new file mode 100644
index 00000000..d5740e25
--- /dev/null
+++ b/backend/microservice/PythonServer/project/api/socket/client.py
@@ -0,0 +1,10 @@
+import socket
+
+c = socket.socket()
+
+c.connect(('localhost', 9999))
+
+name = input("Client name:")
+c.send(bytes(name, 'utf-8'))
+
+print(c.recv(1024).decode())
\ No newline at end of file
diff --git a/backend/microservice/PythonServer/project/api/socket/server.py b/backend/microservice/PythonServer/project/api/socket/server.py
new file mode 100644
index 00000000..d6ff3f7c
--- /dev/null
+++ b/backend/microservice/PythonServer/project/api/socket/server.py
@@ -0,0 +1,16 @@
+import socket
+
+s = socket.socket()
+print('Socket Created')
+
+s.bind(('localhost', 9999))
+
+s.listen(3)
+print('waiting for connections')
+
+while True:
+    c, addr = s.accept()
+    name = c.recv(1024).decode()
+    print('Connected with ', addr, name)
+    c.send(bytes('Welcome', 'utf-8'))
+    c.close()
\ No newline at end of file
diff --git a/backend/microservice/PythonServer/project/api/socket2/client.py b/backend/microservice/PythonServer/project/api/socket2/client.py
new file mode 100644
index 00000000..65e76b55
--- /dev/null
+++ b/backend/microservice/PythonServer/project/api/socket2/client.py
@@ -0,0 +1,16 @@
+# Import socket module
+import socket            
+ 
+# Create a socket object
+s = socket.socket()        
+ 
+# Define the port on which you want to connect
+port = 12345               
+ 
+# connect to the server on local computer
+s.connect(('127.0.0.1', port))
+ 
+# receive data from the server and decoding to get the string.
+print (s.recv(1024).decode())
+# close the connection
+s.close()    
\ No newline at end of file
diff --git a/backend/microservice/PythonServer/project/api/socket2/server.py b/backend/microservice/PythonServer/project/api/socket2/server.py
new file mode 100644
index 00000000..c65dae78
--- /dev/null
+++ b/backend/microservice/PythonServer/project/api/socket2/server.py
@@ -0,0 +1,39 @@
+# first of all import the socket library
+import socket            
+ 
+# next create a socket object
+s = socket.socket()        
+print ("Socket successfully created")
+ 
+# reserve a port on your computer in our
+# case it is 12345 but it can be anything
+port = 12345               
+ 
+# Next bind to the port
+# we have not typed any ip in the ip field
+# instead we have inputted an empty string
+# this makes the server listen to requests
+# coming from other computers on the network
+s.bind(('', port))        
+print ("socket binded to %s" %(port))
+ 
+# put the socket into listening mode
+s.listen(5)    
+print ("socket is listening")           
+ 
+# a forever loop until we interrupt it or
+# an error occurs
+while True:
+ 
+# Establish connection with client.
+  c, addr = s.accept()    
+  print ('Got connection from', addr )
+ 
+  # send a thank you message to the client. encoding to send byte type.
+  c.send('Thank you for connecting'.encode())
+ 
+  # Close the connection with the client
+  c.close()
+   
+  # Breaking once connection closed
+  break
\ No newline at end of file