Merge pull request #72 from ControlCore-Project/main

Bring dev to upto date.

Author: pradeeban

0mq/funcall2.py

@@ -24,6 +24,7 @@
     #    ym = concore2.read(concore.iport['Y1'],"ym",init_simtime_ym)
     paired_transmitter = PairedTransmitter(
         remote_host="localhost", exposed_commands=[],  
+        #remote_host="193.136.132.10", exposed_commands=[],  
         remote_port=2345, listen_port=2346,)
     paired_transmitter.start_background_sync() 
     ym = paired_transmitter.request_with_immediate_reply(

concore.py

@@ -77,11 +77,14 @@ def read(port, name, initstr):
     try:
         infile = open(inpath+str(port)+"/"+name);
         ins = infile.read()
+        infile.close()
     except:
         ins = initstr
     while len(ins)==0:
         time.sleep(delay)
+        infile = open(inpath+str(port)+"/"+name);
         ins = infile.read()
+        infile.close()
         retrycount += 1
     s += ins
     inval = literal_eval(ins)
@@ -110,4 +113,3 @@ def initval(simtime_val):
     val = literal_eval(simtime_val)
     simtime = val[0]
     return val[1:]
-

fri/DOCKER-README.md

@@ -1,3 +1,24 @@
+# Install Docker:-
+
+Open Terminal and run the following commands:-
+
+````
+$ sudo apt-get update
+$ sudo apt-get install curl
+$ curl -fsSL https://get.docker.com/ | sh
+````
+Optional command:- To run docker commands without sudo 
+````
+$ sudo usermod -aG docker <system_username>
+````
+The above command add the system username in the docker group, Restart the system to complete the process. 
+
+After restart run 
+
+```` 
+$ sudo service docker start 
+````
+
 # Building FRI Container
 
 Now, we elaborate on building FRI as a container, together with the Kong API Gateway.
@@ -15,7 +36,7 @@ First build the Docker Container of the FRI.
 ````
 $ git pull
 
-$ sudo docker build -t fri .
+$ docker build -t fri .
 ````
 
 # Running Control-Core FRI with Kong as containers
@@ -67,7 +88,7 @@ $ docker run -d --name kong \
 
 Start FRI container
 ````
-$ nohup sudo docker run --name fri -p 8090:8081 fri > controlcore.out &
+$ nohup sudo docker run --name fri -p 8090:8080 fri > controlcore.out &
 ````
 
 Delete if there is a previously configured Kong service. If not, skip this step. First you need to find the ID-VALUE for the route with a GET command before deleting the route and service.
@@ -107,17 +128,17 @@ $ tail -f controlcore.out
 ````
 or
 ````
-$ sudo docker logs fri -f
+$ docker logs fri -f
 ````
 Find the FRI docker container
 ````
-$ sudo docker ps
+$ docker ps
 ````
 CONTAINER ID        IMAGE               COMMAND              CREATED             STATUS              PORTS                NAMES
 dfdd3b3d3308        fri            "python main.py"   38 minutes ago      Up 38 minutes       0.0.0.0:80->80/tcp   fri
 
 Access the container
 ````
-$ sudo docker exec -it dfdd /bin/bash
+$ docker exec -it dfdd /bin/bash
 ````
 

fri/README.md

@@ -4,9 +4,10 @@ The Control-Core File Receiving Interface (FRI) is built with is Python-3.10. It
 
 # Install Dependencies
 
-Install Jupyter lab
 ````
-$ pip install jupyterlab
+$ cd conore/fri
+
+$ pip3 install -r requirements.txt
 ````
 
 # Running the FRI and a quick test.
@@ -15,8 +16,6 @@ To run the FRI as a server:
 ````
 $ cd conore/fri
 
-$ git checkout dev
-
 $ cd server
 
 $ python3 main.py

fri/docker-compose.yml

@@ -0,0 +1,37 @@
+version: '3'
+
+services:
+  fri:
+    build:
+      context: .
+    image: fri
+    ports:
+      - 8090:8080
+    command: tail -f /dev/null
+
+  kong-database:
+    image: cassandra:3
+    ports:
+      - 9042:9042
+
+  kong:
+    image: kong
+    depends_on:
+      - kong-database
+    environment:
+      KONG_DATABASE: cassandra
+      KONG_PG_HOST: kong-database
+      KONG_PG_PASSWORD: kong
+      KONG_CASSANDRA_CONTACT_POINTS: kong-database
+      KONG_PROXY_ACCESS_LOG: /dev/stdout
+      KONG_ADMIN_ACCESS_LOG: /dev/stdout
+      KONG_PROXY_ERROR_LOG: /dev/stderr
+      KONG_ADMIN_ERROR_LOG: /dev/stderr
+      KONG_ADMIN_LISTEN: 0.0.0.0:8001, 0.0.0.0:8444 ssl
+    ports:
+      - 80:8000
+      - 8443:8443
+      - 8001:8001
+      - 8444:8444
+
+  

fri/requirements.txt

@@ -1,3 +1,4 @@
 Flask
 gunicorn==20.1.0
 FLASK_CORS
+jupyterlab

fri/server/main.py

@@ -1,10 +1,11 @@
 from flask import Flask, request, jsonify, send_file, send_from_directory
 from werkzeug.utils import secure_filename
 import os
+import subprocess
 from subprocess import call
 from pathlib import Path
 import json
-import subprocess
+import platform
 from flask_cors import CORS, cross_origin
 
 cur_path = os.path.dirname(os.path.abspath(__file__))
@@ -21,8 +22,10 @@
 @app.route('/upload/<dir>', methods=['POST'])
 def upload(dir):
     apikey = request.args.get('apikey')
-    dirname = secure_filename(dir) + "_" + apikey
-
+    if(apikey == None):
+        dirname = secure_filename(dir)
+    else:
+        dirname = secure_filename(dir) + "_" + apikey
     if 'files[]' not in request.files:
         resp = jsonify({'message': 'No file in the request'})
         resp.status_code = 400
@@ -38,7 +41,6 @@ def upload(dir):
     if not os.path.isdir(directory_name):
         os.mkdir(directory_name)
 
-
     for file in files:
         if file:
             filename = secure_filename(file.filename)
@@ -60,32 +62,52 @@ def upload(dir):
         return resp
 
 
-
 # to download /build/<dir>?fetch=<graphml>. For example, /build/test?fetch=sample1&apikey=xyz
 @app.route('/build/<dir>', methods=['POST'])
 def build(dir):
     graphml_file = request.args.get('fetch')  
     apikey = request.args.get('apikey') 
-    dirname = secure_filename(dir) + "_" + apikey   
+    out_dir = request.args.get('outdir')
+    if(apikey == None):
+        dirname = secure_filename(dir)
+    else:
+        dirname = secure_filename(dir) + "_" + apikey
     makestudy_dir = dirname + "/" + graphml_file   #for makestudy
-    dir_path = os.path.abspath(os.path.join(concore_path, graphml_file)) #path for ./build
+    if(out_dir == None or out_dir == ""):
+        dir_path = os.path.abspath(os.path.join(concore_path, graphml_file)) #path for ./build
+    else:
+        dir_path = os.path.abspath(os.path.join(concore_path, out_dir)) #path for ./build
     if not os.path.exists(dir_path):
-        proc = call(["./makestudy", makestudy_dir], cwd=concore_path)
+        if(platform.uname()[0]=='Windows'):
+            if(out_dir == None or out_dir == ""):
+                proc= call(["makestudy", makestudy_dir], shell=True, cwd=concore_path)
+            else:
+                proc= call(["makestudy", makestudy_dir, out_dir], shell=True, cwd=concore_path)
+        else:
+            if(out_dir == None or out_dir == ""):
+                proc= call(["./makestudy", makestudy_dir], cwd=concore_path)
+            else:
+                proc= call(["./makestudy", makestudy_dir, out_dir], cwd=concore_path)
         if(proc == 0):
             resp = jsonify({'message': 'Directory successfully created'})
             resp.status_code = 201
         else:
             resp = jsonify({'message': 'There is an Error'})
-            resp.status_code = 500        
-    call(["./build"], cwd=dir_path)   
+            resp.status_code = 500   
+    if(platform.uname()[0]=='Windows'):
+        call(["build"], cwd=dir_path, shell=True)
+    else:
+        call(["./build"], cwd=dir_path)  
     return resp 
 
-
 @app.route('/debug/<dir>', methods=['POST'])
 def debug(dir):
-    dir = secure_filename(dir)
-    dir_path = os.path.abspath(os.path.join(concore_path, dir))
-    proc = call(["./debug"], cwd=dir_path)
+    dir_name = secure_filename(dir)
+    dir_path = os.path.abspath(os.path.join(concore_path, dir_name))
+    if(platform.uname()[0]=='Windows'):
+        proc=call(["debug"],shell=True, cwd=dir_path)
+    else:
+        proc = call(["./debug"], cwd=dir_path)
     if(proc == 0):
         resp = jsonify({'message': 'Close the pop window after obtaining result'})
         resp.status_code = 201
@@ -95,12 +117,14 @@ def debug(dir):
         resp.status_code = 500
         return resp  
 
-
 @app.route('/run/<dir>', methods=['POST'])
 def run(dir):
-    dir = secure_filename(dir)
-    dir_path = os.path.abspath(os.path.join(concore_path, dir))
-    proc = call(["./run"], cwd=dir_path)
+    dir_name = secure_filename(dir)
+    dir_path = os.path.abspath(os.path.join(concore_path, dir_name))
+    if(platform.uname()[0]=='Windows'):
+        proc=call(["run"],shell=True, cwd=dir_path)
+    else:
+        proc = call(["./run"], cwd=dir_path)
     if(proc == 0):
         resp = jsonify({'message': 'result prepared'})
         resp.status_code = 201
@@ -112,9 +136,12 @@ def run(dir):
 
 @app.route('/stop/<dir>', methods=['POST'])
 def stop(dir):
-    dir = secure_filename(dir)
-    dir_path = os.path.abspath(os.path.join(concore_path, dir))
-    proc = call(["./stop"], cwd=dir_path)
+    dir_name = secure_filename(dir)
+    dir_path = os.path.abspath(os.path.join(concore_path, dir_name))
+    if(platform.uname()[0]=='Windows'):
+        proc=call(["stop"],shell=True, cwd=dir_path)
+    else:
+        proc = call(["./stop"], cwd=dir_path)
     if(proc == 0):
         resp = jsonify({'message': 'resources cleaned'})
         resp.status_code = 201
@@ -127,9 +154,12 @@ def stop(dir):
 
 @app.route('/clear/<dir>', methods=['POST'])
 def clear(dir):
-    dir = secure_filename(dir)
-    dir_path = os.path.abspath(os.path.join(concore_path, dir))
-    proc = call(["./clear"], cwd=dir_path)
+    dir_name = secure_filename(dir)
+    dir_path = os.path.abspath(os.path.join(concore_path, dir_name))
+    if(platform.uname()[0]=='Windows'):
+        proc=call(["clear"],shell=True, cwd=dir_path)
+    else:
+        proc = call(["./clear"], cwd=dir_path)
     if(proc == 0):
         resp = jsonify({'message': 'result deleted'})
         resp.status_code = 201
@@ -157,11 +187,13 @@ def download(dir):
         resp.status_code = 400
         return resp
 
-
 @app.route('/destroy/<dir>', methods=['DELETE'])
 def destroy(dir):
     dir = secure_filename(dir)
-    proc = call(["./destroy", dir], cwd=concore_path)
+    if(platform.uname()[0]=='Windows'):
+        proc=call(["destroy", dir],shell=True, cwd=concore_path)
+    else:
+        proc = call(["./destroy", dir], cwd=concore_path)
     if(proc == 0):
         resp = jsonify({'message': 'Successfuly deleted Dirctory'})
         resp.status_code = 201
@@ -181,7 +213,6 @@ def getFilesList(dir):
     res = json.dumps(res)  
     return res             
 
-
 @app.route('/openJupyter/', methods=['POST'])
 def openJupyter():
     proc = subprocess.Popen(['jupyter', 'lab'], shell=False, stdout=subprocess.PIPE, cwd=concore_path)
@@ -195,6 +226,5 @@ def openJupyter():
         return resp 
 
 
-
 if __name__ == "__main__":
     app.run(host="0.0.0.0", port=5000)