Résolution des conflits Git et nettoyage du code

.idea/Gestion sondes.iml

@@ -4,7 +4,7 @@
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.venv" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="Python 3.13" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>

.idea/misc.xml

@@ -3,7 +3,7 @@
   <component name="Black">
     <option name="sdkName" value="Python 3.11 (Gestion sondes) (2)" />
   </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.11 (Gestion sondes) (2)" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.13" project-jdk-type="Python SDK" />
   <component name="PyPackaging">
     <option name="earlyReleasesAsUpgrades" value="true" />
   </component>

Cuisine_meudon.py

@@ -64,5 +64,5 @@ try:
     client.subscribe("Meudon/#")
     logging.info("Connexion MQTT réussie et abonnement au topic 'Meudon/#'.")
     client.loop_forever()
-except Exception as e:
-    logging.error(f"Erreur MQTT : {e}")
+except Exception as err:
+    logging.error(f"Erreur MQTT : {err}")

Cuisine_saclay.py

@@ -64,5 +64,5 @@ try:
     client.subscribe("Saclay/#")
     logging.info("Connexion MQTT réussie et abonnement au topic 'Saclay/#'.")
     client.loop_forever()
-except Exception as e:
-    logging.error(f"Erreur MQTT : {e}")
+except Exception as err:
+    logging.error(f"Erreur MQTT : {err}")

Monitor.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import mysql.connector
 from datetime import datetime, timedelta
 import time

domo91.py

@@ -533,11 +533,10 @@ if st.session_state["authenticated"]:
         except Exception as e:
             st.error(f"Erreur chargement des connexions : {e}")
 
-<<<<<<< HEAD
-        except Exception as err:  # petit bug dans ton except ici (tu avais écrit "except exception")
+
+        except Exception as err:
             st.error(f"Erreur MySQL : {err}")
 
-=======
-        except exception as err:
+        except Exception as err:
             st.error(f"Erreur MySQL : {err}")
->>>>>>> product
+

requirements.txt

@@ -8,3 +8,4 @@ paho-mqtt~=2.1.0
 requests~=2.32.3
 schedule~=1.2.2
 paramiko~=3.5.1
+dotenv