From a8152f9ca33fe5e0b865012ed1089a940ef14b9d Mon Sep 17 00:00:00 2001 From: Untriex Programming Date: Wed, 10 Mar 2021 13:26:44 +0100 Subject: [PATCH] test files/comunication App is now working (partly) --- files/test.txt | 1 + files/test2.txt | 1 + log.txt | 3 +++ main.py | 50 +++++++++++++++++++++++++++++++++++++++---------- 4 files changed, 45 insertions(+), 10 deletions(-) create mode 100644 files/test.txt create mode 100644 files/test2.txt diff --git a/files/test.txt b/files/test.txt new file mode 100644 index 0000000..57dbbb2 --- /dev/null +++ b/files/test.txt @@ -0,0 +1 @@ +toto je test číslo 1 \ No newline at end of file diff --git a/files/test2.txt b/files/test2.txt new file mode 100644 index 0000000..96a90c6 --- /dev/null +++ b/files/test2.txt @@ -0,0 +1 @@ +toto je test n. 2 \ No newline at end of file diff --git a/log.txt b/log.txt index e69de29..60bcbdd 100644 --- a/log.txt +++ b/log.txt @@ -0,0 +1,3 @@ + +2021-03-10 12:20:52.490547 -> ERROR: heartbeat > list indices must be integers or slices, not str +2021-03-10 12:29:03.690483 -> ERROR: heartbeat > list indices must be integers or slices, not str \ No newline at end of file diff --git a/main.py b/main.py index 6b05cf7..5c9d426 100644 --- a/main.py +++ b/main.py @@ -1,9 +1,11 @@ from fastapi import FastAPI, Request +from fastapi.responses import FileResponse from pydantic import BaseModel import engine import requests import time import json +import os import threading app = FastAPI() @@ -14,12 +16,13 @@ sensors = { "počet ľudí": 10, "doba čakania": 2 } -log = engine.Log(print_m=True, debug=True) +log = engine.Log(print_m=True, debug=False) -time_to_heartbeat = 60 #Seconds +time_to_heartbeat = 20 # Seconds location = "2" ID = 2 IP = "192.168.1.99" + filesystem = { "otvaracie_hod": ["t", {"pon": "10-25"}, {"uto": "10-25"}], "prehliadka": ["pdf", "/files/prehliadka.pdf"], @@ -30,13 +33,15 @@ heartbeat_table = { "IP": ["192.168.1.231"], "location": ["1"], "file_system": ["x"], - "last_heartbeat": [7] + "last_heartbeat": [20] } heartbeat_table["ID"].append(ID) heartbeat_table["IP"].append(IP) heartbeat_table["location"].append(location) heartbeat_table["file_system"].append(filesystem) heartbeat_table["last_heartbeat"].append(time_to_heartbeat) + + # Todo better "host" ID handeling class Server_table(BaseModel): @@ -59,7 +64,7 @@ def heartbeat(s_table: Server_table, request: Request): heartbeat_table["last_heartbeat"][heartbeat_table["ID"].index(server_id)] = s_table.last_heartbeat[ position] log.debug(f"updated {server_id}`s heartbeat to {s_table.last_heartbeat[position]}") - #Todo update filesystem too. Now updating only last heartbeat + # Todo update filesystem too. Now updating only last heartbeat elif server_id == ID: log.debug(f"Updated my heartbeat from {s_table.last_heartbeat[position]} to {time_to_heartbeat}") heartbeat_table["last_heartbeat"][heartbeat_table["ID"].index(ID)] = time_to_heartbeat @@ -81,15 +86,39 @@ def get_sensors(request: Request): return sensors -@app.get("/files/{file}") -def get_file(file: str): - pass - #Todo Get files function for client (phone/ther rpi) +@app.get("/files/{IDx}/{file}") +def get_file(IDx: int, file: str): + if IDx == ID: + return FileResponse(f"files/{file}") + elif IDx in heartbeat_table["ID"]: + r = requests.get(f"""http://{heartbeat_table["IP"][heartbeat_table["ID"].index(IDx)]}:8000/files/{IDx}/{file}""") + r.encoding = "utf-8" + if os.path.isdir(f"cache/{IDx}"): + if os.path.isfile(f"cache/{IDx}/{file}"): + pass + # Todo cache time to live/compare files on server and cache with not resource heavy function + else: + with open(f"cache/{IDx}/{file}", "wb") as save: + save.write(bytes(r.content)) + else: + os.mkdir(f"cache/{IDx}") + with open(f"cache/{IDx}/{file}", "wb") as save: + save.write(bytes(r.content)) + return FileResponse(f"cache/{IDx}/{file}") + # Todo Get files function for client (phone/ther rpi) +@app.post("/update") +def update_sensors(): + pass + # Todo Make option to upload "live data" manually to rpi + def send_heartbeat(ip): + global heartbeat_table log.message(f"requesting heartbeat from {ip}") cache_request = requests.post(f"http://{ip}:8000/heartbeat", data=json.dumps(heartbeat_table)) + heartbeat_table = dict(cache_request.json()[0]) + #Todo test heartbeat table update log.debug(json.dumps(cache_request.json(), indent=4)) @@ -99,10 +128,11 @@ def mainloop(): if device_ID != ID: if heartbeat_table["last_heartbeat"][device_number] < 0: send_heartbeat(heartbeat_table["IP"][device_number]) - heartbeat_table["last_heartbeat"][device_number] = time_to_heartbeat + 5 - print(f"""{device_ID} : time to heartbeat : {heartbeat_table["last_heartbeat"][device_number]}""") + heartbeat_table["last_heartbeat"][int(device_number)] = int(time_to_heartbeat) + 5 + log.debug(f"""{device_ID} : time to heartbeat : {heartbeat_table["last_heartbeat"][device_number]}""") heartbeat_table["last_heartbeat"][device_number] -= 1 time.sleep(1) + thread_1 = threading.Thread(target=mainloop, daemon=True) thread_1.start()