modif json

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
-
-
-
-
-    

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")

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"]:
+    for data in dataJson:
-        arrayBpm.append(data["BpmAvg"])
+        arrayBpm.append(data["json"]["BpmAvg"])
-        arrayTimeOfActivity.append(data["TimeOfActivity"])
+        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
         
-    jsonTmp["Identifiant"] = user["Identifiant"]
+        model = generateModele(category["infos"])
-    jsonTmp["Info"] = []
 
-    for category in user["Info"]:
+        jsonTmp["uuid"] = userUUID
-        #Mettre la condition longueur ici
+        jsonTmp["category"] = category["name"]
-        model = generateModele(category)
+        jsonTmp["model"] = generateJsonModel(model)
-        jsonTmp["Info"].append({"Category": category["Category"],"Model" : generateJsonModel(model)})
+
-    # Add User
+        sendJsonToApi(urlGetAllData,jsonTmp)
-    jsonBack["Users"].append(jsonTmp)
 
-# -- Send Api 
+logging.error("Exec Fini")
-sendJsonToApi(urlGetAllData,jsonBack)