diff --git a/file_test/generateurModele.py b/file_test/generateurModele.py index f29814c..518dbc7 100644 --- a/file_test/generateurModele.py +++ b/file_test/generateurModele.py @@ -133,8 +133,3 @@ while(True): sleep_time.sleep(300) # Pause de 5 minutes else : sleep_time.sleep(30) # Pause de 30 secondes - - - - - diff --git a/generateurModele.py b/generateurModele.py index ab55e67..6ee848a 100644 --- a/generateurModele.py +++ b/generateurModele.py @@ -54,7 +54,7 @@ def sendJsonToApi(url,json): return # ---------------- Main ------------------- # -logging.error("RUNNNNNNNN !") + urlGetAllData = "https://codefirst.iut.uca.fr/containers/SmartFit-smartfit_api/ia/data" while(True): logging.warning("Info - Début de la boucle") diff --git a/testFinal.py b/testFinal.py index d114f78..3f51e89 100644 --- a/testFinal.py +++ b/testFinal.py @@ -16,17 +16,17 @@ def generateJsonModel(model:LinearRegression): json = {"coef":listCoef,"intercept":listIntercept} return json -def generateModele(dataJson:dict[str,str]): +def generateModele(dataJson): # -- Préparation des données arrayBpm = [] arrayStartTime = [] arrayTimeOfActivity = [] - for data in dataJson["Data"]: - arrayBpm.append(data["BpmAvg"]) - arrayTimeOfActivity.append(data["TimeOfActivity"]) + for data in dataJson: + arrayBpm.append(data["json"]["BpmAvg"]) + arrayTimeOfActivity.append(data["json"]["TimeOfActivity"]) - arrayStartTime.append(data["StartTime"]) + arrayStartTime.append(data["json"]["StartTime"]) # -- DataFrame data = pd.DataFrame({ "Bpm": arrayBpm, @@ -57,23 +57,47 @@ logging.error("RUNNNNNNNN !") urlGetAllData = "https://codefirst.iut.uca.fr/containers/SmartFit-smartfit_api/ia/data" -requests.get(urlGetAllData) - -jsonBack = { "Users" : []} # --- Call Api dataUser = getUserWithData(url=urlGetAllData) -for user in dataUser["Users"]: - jsonTmp = {} +''' +dataUser = [{ + "uuid": "xxxx", + "categories": [ + { + "name": "walking", + "infos": [ + { + "json": {"BpmAvg":100,"TimeOfActivity":225,"StartTime":1234} + } + ] + }, + { + "name": "cycling", + "infos": [ + { + "json": {"BpmAvg":110,"TimeOfActivity":225,"StartTime":12345} + } + ] + } + ] +} +]''' + + +for user in dataUser: + + userUUID= user["uuid"] + + for category in user["categories"]: + jsonTmp = {} + #Mettre la condition longueur ici + + model = generateModele(category["infos"]) - jsonTmp["Identifiant"] = user["Identifiant"] - jsonTmp["Info"] = [] + jsonTmp["uuid"] = userUUID + jsonTmp["category"] = category["name"] + jsonTmp["model"] = generateJsonModel(model) - for category in user["Info"]: - #Mettre la condition longueur ici - model = generateModele(category) - jsonTmp["Info"].append({"Category": category["Category"],"Model" : generateJsonModel(model)}) - # Add User - jsonBack["Users"].append(jsonTmp) + sendJsonToApi(urlGetAllData,jsonTmp) -# -- Send Api -sendJsonToApi(urlGetAllData,jsonBack) \ No newline at end of file +logging.error("Exec Fini") \ No newline at end of file