From 98586ba0e1424d93acc43336726dc1da6400c321 Mon Sep 17 00:00:00 2001 From: Michel Date: Wed, 23 Apr 2025 09:23:20 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=84=20Mise=20=C3=A0=20jour=20des=20fic?= =?UTF-8?q?hiers=20modifi=C3=A9s=20depuis=20develop?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cuisine_meudon.py | 13 ++++++++----- Cuisine_saclay.py | 13 ++++++++----- Monitor.py | 2 +- domo91.py | 25 ++++++++++++++----------- 4 files changed, 31 insertions(+), 22 deletions(-) diff --git a/Cuisine_meudon.py b/Cuisine_meudon.py index 90213ac..9b26b4a 100644 --- a/Cuisine_meudon.py +++ b/Cuisine_meudon.py @@ -3,7 +3,10 @@ import mysql.connector import sys import os import logging -from datetime import datetime +from dotenv import load_dotenv + +# Charger les variables d'environnement +load_dotenv() # 📁 CrĂ©ation du dossier de logs s'il n'existe pas dossier_logs = "/var/log/Cuisine_Meudon" @@ -28,10 +31,10 @@ logging.getLogger('').addHandler(console) try: sys.path.insert(0, "/myenv/lib/python3.11.2/site-packages") mydb = mysql.connector.connect( - host="54.36.188.119", - user="michel", - password="#SO2&1nf%mZ@jfh", - database="Sondes" + host=os.getenv("DB_HOST"), + user=os.getenv("DB_USER"), + password=os.getenv("DB_PASSWORD"), + database=os.getenv("DB_NAME") ) logging.info("Connexion MySQL rĂ©ussie.") except mysql.connector.Error as err: diff --git a/Cuisine_saclay.py b/Cuisine_saclay.py index c194121..20cdbb8 100644 --- a/Cuisine_saclay.py +++ b/Cuisine_saclay.py @@ -3,7 +3,10 @@ import mysql.connector import sys import os import logging -from datetime import datetime +from dotenv import load_dotenv + +# Charger les variables d'environnement +load_dotenv() # 📁 CrĂ©ation du dossier de logs s'il n'existe pas dossier_logs = "/var/log/Cuisine_Saclay" @@ -28,10 +31,10 @@ logging.getLogger('').addHandler(console) try: sys.path.insert(0, "/myenv/lib/python3.11.2/site-packages") mydb = mysql.connector.connect( - host="54.36.188.119", - user="michel", - password="#SO2&1nf%mZ@jfh", - database="Sondes" + host=os.getenv("DB_HOST"), + user=os.getenv("DB_USER"), + password=os.getenv("DB_PASSWORD"), + database=os.getenv("DB_NAME") ) logging.info("Connexion MySQL rĂ©ussie.") except mysql.connector.Error as err: diff --git a/Monitor.py b/Monitor.py index 99a5aed..2bc9325 100644 --- a/Monitor.py +++ b/Monitor.py @@ -19,7 +19,7 @@ config = { } # --- Destinataires email --- -destinataires = ['services@domo91.fr'] +destinataires = ['services@domo91.fr,cuisine@bw-paris-saclay.com>'] # --- Fonction d'envoi de mail --- def envoyer_mail(sujet, message, destinataires): diff --git a/domo91.py b/domo91.py index 484cfe7..f243e91 100644 --- a/domo91.py +++ b/domo91.py @@ -1,4 +1,5 @@ # Application Gestion de sondes +# -*- coding: utf-8 -*- import streamlit as st import mysql.connector import pandas as pd @@ -9,6 +10,10 @@ from fpdf import FPDF import os import random import datetime +from dotenv import load_dotenv + +# Charger les variables d'environnement +load_dotenv() st.set_page_config(page_title="Domo91 - Surveillance", layout="wide") if "authenticated" not in st.session_state: @@ -18,21 +23,19 @@ if "authenticated" not in st.session_state: st.title("📡 Supervision TempĂ©ratures") -# --- Configuration base de donnĂ©es --- -db_config = { - "host": "54.36.188.119", - "user": "michel", - "password": "#SO2&1nf%mZ@jfh", - "database": "Sondes" +db_config ={ + "host": os.getenv("DB_HOST"), + "user": os.getenv("DB_USER"), + "password": os.getenv("DB_PASSWORD"), + "database": os.getenv("DB_NAME") } - # --- Fonction de gĂ©nĂ©ration PDF --- def generer_pdf(site, date_str): st.info(f"GĂ©nĂ©ration du rapport PDF pour {site} Ă  la date {date_str}") try: conn = mysql.connector.connect(**db_config) - cursor = conn.cursor(dictionary=True) + pdf_cursor = conn.cursor(dictionary=True) cursor.execute(f"SELECT Sonde, Date, Temperature FROM `{site}` WHERE DATE(Date) = %s ORDER BY Sonde, Date", (date_str,)) @@ -105,8 +108,8 @@ def generer_pdf(site, date_str): mime="application/pdf" ) - except Exception as e: - st.error(f"Erreur lors de la gĂ©nĂ©ration du PDF : {e}") + except Exception as err1: + st.error(f"Erreur lors de la gĂ©nĂ©ration du PDF : {err1}") # --- Initialisation des variables de session --- @@ -401,7 +404,7 @@ if st.session_state["authenticated"]: except Exception as e: st.error(f"Erreur lors de la rĂ©cupĂ©ration des alertes : {e}") - except Exception as e: + except Exception as err: st.error(f"Erreur MySQL : {e}") if st.session_state["role"] == "superviseur": with st.expander("+ Ajouter une nouvelle chambre froide", expanded=False):