diff --git a/fri/server/main.py b/fri/server/main.py index 203a94d..fe16633 100644 --- a/fri/server/main.py +++ b/fri/server/main.py @@ -70,37 +70,47 @@ def build(dir): makestudy_dir = dirname + "/" + graphml_file #for makestudy dir_path = os.path.abspath(os.path.join(concore_path, graphml_file)) #path for ./build if not os.path.exists(dir_path): - proc = call(["./makestudy", makestudy_dir], cwd=concore_path) + proc = call(["makestudy", makestudy_dir],shell=True, 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) + else: + resp= jsonify({"message":"Success"}) + resp.status_code=200 + call(["build"],shell=True, cwd=dir_path) return resp +# Give the directory of the build files that are build using ./build @app.route('/debug/', 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) - if(proc == 0): - resp = jsonify({'message': 'Close the pop window after obtaining result'}) - resp.status_code = 201 - return resp + if not os.path.exists(dir_path): + resp=jsonify({"message":"Wrong directory given"}) + resp.status_code=500 else: - resp = jsonify({'message': 'There is an Error'}) - resp.status_code = 500 - return resp + proc = call(["debug"],shell=True , cwd=dir_path) + if(proc == 0): + resp = jsonify({'message': 'Close the pop window after obtaining result'}) + resp.status_code = 201 + return resp + else: + resp = jsonify({'message': 'There is an Error'}) + resp.status_code = 500 + return resp +# Give the directory of the build files that are build using ./build @app.route('/run/', 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) + print(dir_path) + proc = call(["run"],shell=True, cwd=dir_path) if(proc == 0): resp = jsonify({'message': 'result prepared'}) resp.status_code = 201 @@ -110,11 +120,12 @@ def run(dir): resp.status_code = 500 return resp +# Give the directory of the build files that are build using ./build @app.route('/stop/', 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) + proc = call(["stop"],shell=True, cwd=dir_path) if(proc == 0): resp = jsonify({'message': 'resources cleaned'}) resp.status_code = 201 @@ -129,7 +140,7 @@ def stop(dir): def clear(dir): dir = secure_filename(dir) dir_path = os.path.abspath(os.path.join(concore_path, dir)) - proc = call(["./clear"], cwd=dir_path) + proc = call(["clear"],shell=True, cwd=dir_path) if(proc == 0): resp = jsonify({'message': 'result deleted'}) resp.status_code = 201 @@ -161,7 +172,7 @@ def download(dir): @app.route('/destroy/', methods=['DELETE']) def destroy(dir): dir = secure_filename(dir) - proc = call(["./destroy", dir], cwd=concore_path) + proc = call(["destroy", dir],shell=True, cwd=concore_path) if(proc == 0): resp = jsonify({'message': 'Successfuly deleted Dirctory'}) resp.status_code = 201 @@ -182,7 +193,7 @@ def getFilesList(dir): return res -@app.route('/openJupyter/', methods=['POST']) +@app.route('/openJupyter', methods=['POST']) def openJupyter(): proc = subprocess.Popen(['jupyter', 'lab'], shell=False, stdout=subprocess.PIPE, cwd=concore_path) if proc.poll() is None: