diff --git a/bdd/Dockerfiles/app/app/app.py b/bdd/Dockerfiles/app/app/app.py index e2b0606..8f4f4ad 100755 --- a/bdd/Dockerfiles/app/app/app.py +++ b/bdd/Dockerfiles/app/app/app.py @@ -12,7 +12,7 @@ def create_app(): data=pd.read_csv("/Datasets/database/questions.csv",delimiter=",") data.to_sql('questions',con,if_exists='replace',index=False) - @app.route('/get_question//',methods=['GET']) + @app.route('/question//',methods=['GET']) def get_question(id=1): with sql.connect("/Datasets/database/database.db") as con: cur = con.cursor() diff --git a/main/Dockerfiles/app/.entrypoint.sh.swp b/main/Dockerfiles/app/.entrypoint.sh.swp new file mode 100644 index 0000000..926b3c4 Binary files /dev/null and b/main/Dockerfiles/app/.entrypoint.sh.swp differ diff --git a/update/Dockerfiles/app/app/app.py b/update/Dockerfiles/app/app/app.py index 54592e6..7acb976 100644 --- a/update/Dockerfiles/app/app/app.py +++ b/update/Dockerfiles/app/app/app.py @@ -1,20 +1,25 @@ # app/__init__.py from flask import Flask - +import requests +import json +import sys def create_app(): app = Flask(__name__) - @app.route('/') - def create(id): + @app.route('/update////') + def update(id,attr,value): import update_grid; path = "/Datasets/grids/"# PATH TO VOLUME + r = requests.get("http://127.0.0.1:50011/update/"+id+"/"+attr+"/"+str(value)+"/") + print("Message",file=sys.stdout) + print(r,file=sys.stdout) + dict = r.json() # TO DO # GET COORDINATES x and y - x = 0.3 - y = 0.5 - nb_img = 24 - update_grid.hide_image(path+id+".png", path+id+".png", x,y) + nb_img = dict["Nb"] + for x,y in dict["img"]: + update_grid.hide_image(path+id+".png", path+id+".png", float(x),float(y)) return str(nb_img) return app