Données réelles WeatherLink (Bruyères, Méaudre, Gêve) ; collecteur : option --fichier-cles
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Cette révision appartient à :
1 Parent
a608fad84a
révision
956d08ffd7
3 fichiers modifiés
+20
-3
Aucun fichier ne correspond à votre recherche
@@ -233,7 +233,20 @@ def meta_station(c):
|
||||
return m
|
||||
|
||||
|
||||
def collecter(config, ancien, jours):
|
||||
def cles_depuis_fichier(chemin):
|
||||
"""Lit (cle, secret) dans un JSON a plat. Ne retourne que des valeurs ; en cas d'echec, ne cite que des NOMS de champs."""
|
||||
try:
|
||||
with open(chemin, encoding="utf-8") as f:
|
||||
d = json.load(f)
|
||||
except (OSError, ValueError):
|
||||
return "", ""
|
||||
plat = {k: v for k, v in d.items() if isinstance(v, str)} if isinstance(d, dict) else {}
|
||||
secret = next((v for k, v in plat.items() if "secret" in k.lower()), "")
|
||||
cle = next((v for k, v in plat.items() if "secret" not in k.lower() and ("key" in k.lower() or "cle" in k.lower())), "")
|
||||
return cle, secret
|
||||
|
||||
|
||||
def collecter(config, ancien, jours, fichier_cles=None):
|
||||
"""Appels reels. Une station sans cle / sans station_id / en erreur : hors ligne, historique conserve."""
|
||||
fin = maintenant()
|
||||
stations, meta, journal = {}, {}, []
|
||||
@@ -241,6 +254,8 @@ def collecter(config, ancien, jours):
|
||||
for nom_compte, compte in config["comptes"].items():
|
||||
cle = os.environ.get(compte["var_cle"], "")
|
||||
secret = os.environ.get(compte["var_secret"], "")
|
||||
if (not cle or not secret) and fichier_cles and compte.get("fichier_cles_ok"):
|
||||
cle, secret = cles_depuis_fichier(fichier_cles)
|
||||
for sid, c in compte["stations"].items():
|
||||
meta[sid] = meta_station(c)
|
||||
hist = anciennes.get(sid, {}).get("releves", [])
|
||||
@@ -269,6 +284,7 @@ def main(argv=None):
|
||||
ap.add_argument("--exemple", action="store_true")
|
||||
ap.add_argument("--sortie", default=SORTIE_DEFAUT)
|
||||
ap.add_argument("--config", default=CONFIG_DEFAUT)
|
||||
ap.add_argument("--fichier-cles", default=None, help="JSON de cles (utilise si les variables MC_WL_* sont absentes ; comptes marques fichier_cles_ok)")
|
||||
ap.add_argument("--jours-historique", type=float, default=1.0)
|
||||
a = ap.parse_args(argv)
|
||||
with open(a.config, encoding="utf-8") as f:
|
||||
@@ -276,7 +292,7 @@ def main(argv=None):
|
||||
if a.exemple:
|
||||
obj, journal = construire_exemple(config), ["mode exemple"]
|
||||
else:
|
||||
obj, journal = collecter(config, charger_json(a.sortie), a.jours_historique)
|
||||
obj, journal = collecter(config, charger_json(a.sortie), a.jours_historique, a.fichier_cles)
|
||||
verifier_public(obj)
|
||||
ecrire_atomique(a.sortie, obj)
|
||||
print("ecrit : %s (%d stations)" % (os.path.basename(a.sortie), len(obj["stations"])))
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
"bruyeres-meaudre": {
|
||||
"var_cle": "MC_WL_BRUYERES_CLE",
|
||||
"var_secret": "MC_WL_BRUYERES_SECRET",
|
||||
"fichier_cles_ok": true,
|
||||
"stations": {
|
||||
"bruyeres": {"station_id": "41723", "nom": "Lans-en-Vercors – Les Bruyères", "altitude": 990, "lat": 45.10, "lon": 5.57},
|
||||
"meaudre": {"station_id": "208771", "nom": "Méaudre", "altitude": 976, "lat": 45.13, "lon": 5.53},
|
||||
|
||||
@@ -1 +1 @@
|
||||
{"source":"Donnees d'exemple (pas de mesure reelle)","exemple":true,"mis_a_jour_utc":"2026-10-28T22:58:08Z","metadonnees":{"bruyeres":{"lat":45.1,"lon":5.57,"licence":"donnees de l'exploitant de la station","altitude":990},"meaudre":{"lat":45.13,"lon":5.53,"licence":"donnees de l'exploitant de la station","altitude":976},"geve":{"lat":45.21,"lon":5.56,"licence":"donnees de l'exploitant de la station","altitude":1353},"allieres":{"lat":45.1,"lon":5.6,"licence":"donnees de l'exploitant de la station","altitude":1449},"vp2-lans":{"lat":45.13,"lon":5.6,"licence":"donnees de l'exploitant de la station"}},"stations":{"bruyeres":{"nom":"Lans-en-Vercors – Les Bruyères","source":"WeatherLink (Davis Instruments)","exemple":true,"hors_ligne":false,"releves":[{"dh_utc":"2026-10-27 22:58:08","temperature":1.3,"humidite":79,"pression":1019.7,"pluie_cumul_0h":0.0,"pluie_1h":0.0,"point_de_rosee":-2.9,"vent_moyen":9.4,"vent_rafales":15.0,"vent_direction":233},{"dh_utc":"2026-10-27 23:08:08","temperature":1.2,"humidite":80,"pression":1019.7,"pluie_cumul_0h":0.0,"pluie_1h":0.0,"point_de_rosee":-2.8,"vent_moyen":9.6,"vent_rafales":15.4,"vent_direction":235},{"dh_utc":"2026-10-27 23:18:08","temperature":1.0,"humidite":81,"pression":1019.7,"pluie_cumul_0h":0.0,"pluie_1h":0.0,"point_de_rosee":-2.8,"vent_moyen":9.8,"vent_rafales":15.7,"vent_direction":237},{"dh_utc":"2026-10-27 23:28:08","temperature":0.9,"humidite":82,"pression":1019.8,"pluie_cumul_0h":0.0,"pluie_1h":0.0,"point_de_rosee":-2.7,"vent_moyen":10.0,"vent_rafales":16.0,"vent_direction":238},{"dh_utc":"2026-10-27 23:38:08","temperature":0.7,"humidite":82,"pression":1019.8,"pluie_cumul_0h":0.0,"pluie_1h":0.0,"point_de_rosee":-2.9,"vent_moyen":10.0,"vent_rafales":16.0,"vent_direction":239},{"dh_utc":"2026-10-27 23:48:08","temperature":0.5,"humidite":82,"pression":1019.8,"pluie_cumul_0h":0.0,"pluie_1h":0.0,"point_de_rosee":-3.1,"vent_moyen":10.0,"vent_rafales":16.0,"vent_direction":239},{"dh_utc":"2026-10-27 23:58:08","temperature":0.2,"humidite":82,"pression":1019.8,"pluie_cumul_0h":0.0,"pluie_1h":0.0,"point_de_rosee":-3.4,"vent_moyen":9.8,"vent_rafales":15.7,"vent_direction":239},{"dh_utc":"2026-10-28 00:08:08","temperature":0.0,"humidite":82,"pression":1019.8,"pluie_cumul_0h":0.0,"pluie_1h":0.0,"point_de_rosee":-3.6,"vent_moyen":9.6,"vent_rafales":15.4,"vent_direction":239},{"dh_utc":"2026-10-28 00:18:08","temperature":-0.2,"humidite":82,"pression":1019.9,"pluie_cumul_0h":0.0,"pluie_1h":0.0,"point_de_rosee":-3.8,"vent_moyen":9.4,"vent_rafales":15.0,"vent_direction":239},{"dh_utc":"2026-10-28 00:28:08","temperature":-0.4,"humidite":82,"pression":1019.9,"pluie_cumul_0h":0.0,"pluie_1h":0.0,"point_de_rosee":-4.0,"vent_moyen":9.0,"vent_rafales":14.4,"vent_direction":238},{"dh_utc":"2026-10-28 00:38:08","temperature":-0.5,"humidite":82,"pression":1019.9,"pluie_cumul_0h":0.0,"pluie_1h":0.0,"point_de_rosee":-4.1,"vent_moyen":8.6,"vent_rafales":13.8,"vent_direction":237},{"dh_utc":"2026-10-28 00:48:08","temperature":-0.7,"humidite":82,"pression":1019.9,"pluie_cumul_0h":0.0,"pluie_1h":0.0,"point_de_rosee":-4.3,"vent_moyen":8.2,"vent_rafales":13.1,"vent_direction":236},{"dh_utc":"2026-10-28 00:58:08","temperature":-0.7,"humidite":82,"pression":1019.9,"pluie_cumul_0h":0.0,"pluie_1h":0.0,"point_de_rosee":-4.3,"vent_moyen":7.7,"vent_rafales":12.3,"vent_direction":234},{"dh_utc":"2026-10-28 01:08:08","temperature":-0.8,"humidite":81,"pression":1019.9,"pluie_cumul_0h":0.0,"pluie_1h":0.0,"point_de_rosee":-4.6,"vent_moyen":7.1,"vent_rafales":11.4,"vent_direction":232},{"dh_utc":"2026-10-28 01:18:08","temperature":-0.8,"humidite":81,"pression":1020.0,"pluie_cumul_0h":0.0,"pluie_1h":0.0,"point_de_rosee":-4.6,"vent_moyen":6.6,"vent_rafales":10.6,"vent_direction":230},{"dh_utc":"2026-10-28 01:28:08","temperature":-0.8,"humidite":81,"pression":1020.0,"pluie_cumul_0h":0.0,"pluie_1h":0.0,"point_de_rosee":-4.6,"vent_moyen":6.0,"vent_rafales":9.6,"vent_direction":228},{"dh_utc":"2026-10-28 01:38:08","temperature":-0.7,"humidite":81,"pression":1020.0,"pluie_cumul_0h":0.0,"pluie_1h":0.0,"point_de_rosee":-4.5,"vent_moyen":6.6,"vent_rafales":10.6,"vent_direction":225},{"dh_utc":"2026-10-28 01:48:08","temperature":-0.7,"humidite":81,"pression":1020.0,"pluie_cumul_0h":0.0,"pluie_1h":0.0,"point_de_rosee":-4.5,"vent_moyen":7.1,"vent_rafales":11.4,"vent_direction":222},{"dh_utc":"2026-10-28 01:58:08","temperature":-0.7,"humidite":81,"pression":1020.0,"pluie_cumul_0h":0.0,"pluie_1h":0.0,"point_de_rosee":-4.5,"vent_moyen":7.7,"vent_rafales":12.3,"vent_direction":219},{"dh_utc":"2026-10-28 02:08:08","temperature":-0.6,"humidite":81,"pression":1020.0,"pluie_cumul_0h":0.0,"pluie_1h":0.0,"point_de_rosee":-4.4,"vent_moyen":8.2,"vent_rafales":13.1,"vent_direction":216},{"dh_utc":"2026-10-28 02:18:08","temperature":-0.6,"humidite":81,"pression":1020.0,"pluie_cumul_0h":0.0,"pluie_1h":0.0,"point_de_rosee":-4.4,"vent_moyen":8.6,"vent_rafales":13.8,"vent_direction":212},{"dh_utc":"2026-10-28 02:28:08","temperatureLigne tronquée
|
||||
{"source":"WeatherLink (Davis Instruments) ; Les Allieres et VP2 Lans : exemple","exemple":false,"mis_a_jour_utc":"2026-10-28T23:15:40Z","metadonnees":{"bruyeres":{"lat":45.1,"lon":5.57,"licence":"donnees de l'exploitant de la station","altitude":990},"meaudre":{"lat":45.13,"lon":5.53,"licence":"donnees de l'exploitant de la station","altitude":976},"geve":{"lat":45.21,"lon":5.56,"licence":"donnees de l'exploitant de la station","altitude":1353},"allieres":{"lat":45.1,"lon":5.6,"licence":"donnees de l'exploitant de la station","altitude":1449},"vp2-lans":{"lat":45.13,"lon":5.6,"licence":"donnees de l'exploitant de la station"}},"stations":{"bruyeres":{"nom":"Lans-en-Vercors – Les Bruyères","source":"WeatherLink (Davis Instruments)","hors_ligne":false,"releves":[{"temperature":3.9,"humidite":1.0,"point_de_rosee":-47.8,"pression":1023.7,"dh_utc":"2026-10-28 23:00:41","temperature_min":3.9,"temperature_max":3.9}]},"meaudre":{"nom":"Méaudre","source":"WeatherLink (Davis Instruments)","hors_ligne":false,"releves":[{"temperature":1.7,"humidite":95.0,"point_de_rosee":1.1,"pression":1024.6,"dh_utc":"2026-10-28 23:15:28","temperature_min":1.7,"temperature_max":1.7}]},"geve":{"nom":"Autrans – Gêve nordique","source":"WeatherLink (Davis Instruments)","hors_ligne":false,"releves":[{"temperature":2.7,"humidite":100.0,"point_de_rosee":2.8,"pression":1023.7,"dh_utc":"2026-10-28 23:15:01","temperature_min":2.7,"temperature_max":2.7}]},"allieres":{"nom":"Lans-en-Vercors – Les Allières","source":"WeatherLink (Davis Instruments)","exemple":true,"hors_ligne":false,"releves":[{"dh_utc":"2026-10-27 22:58:08","temperature":-2.7,"humidite":75,"pression":1016.5,"pluie_cumul_0h":0.0,"pluie_1h":0.0,"point_de_rosee":-7.7,"vent_moyen":9.0,"vent_rafales":14.4,"vent_direction":169},{"dh_utc":"2026-10-27 23:08:08","temperature":-2.9,"humidite":75,"pression":1016.5,"pluie_cumul_0h":0.0,"pluie_1h":0.0,"point_de_rosee":-7.9,"vent_moyen":9.4,"vent_rafales":15.0,"vent_direction":167},{"dh_utc":"2026-10-27 23:18:08","temperature":-3.1,"humidite":75,"pression":1016.4,"pluie_cumul_0h":0.0,"pluie_1h":0.0,"point_de_rosee":-8.1,"vent_moyen":9.6,"vent_rafales":15.4,"vent_direction":165},{"dh_utc":"2026-10-27 23:28:08","temperature":-3.2,"humidite":76,"pression":1016.4,"pluie_cumul_0h":0.0,"pluie_1h":0.0,"point_de_rosee":-8.0,"vent_moyen":9.8,"vent_rafales":15.7,"vent_direction":163},{"dh_utc":"2026-10-27 23:38:08","temperature":-3.3,"humidite":76,"pression":1016.4,"pluie_cumul_0h":0.0,"pluie_1h":0.0,"point_de_rosee":-8.1,"vent_moyen":10.0,"vent_rafales":16.0,"vent_direction":162},{"dh_utc":"2026-10-27 23:48:08","temperature":-3.3,"humidite":77,"pression":1016.3,"pluie_cumul_0h":0.0,"pluie_1h":0.0,"point_de_rosee":-7.9,"vent_moyen":10.0,"vent_rafales":16.0,"vent_direction":161},{"dh_utc":"2026-10-27 23:58:08","temperature":-3.4,"humidite":77,"pression":1016.3,"pluie_cumul_0h":0.0,"pluie_1h":0.0,"point_de_rosee":-8.0,"vent_moyen":10.0,"vent_rafales":16.0,"vent_direction":160},{"dh_utc":"2026-10-28 00:08:08","temperature":-3.4,"humidite":78,"pression":1016.3,"pluie_cumul_0h":0.0,"pluie_1h":0.0,"point_de_rosee":-7.8,"vent_moyen":9.8,"vent_rafales":15.7,"vent_direction":160},{"dh_utc":"2026-10-28 00:18:08","temperature":-3.4,"humidite":79,"pression":1016.3,"pluie_cumul_0h":0.0,"pluie_1h":0.0,"point_de_rosee":-7.6,"vent_moyen":9.6,"vent_rafales":15.4,"vent_direction":160},{"dh_utc":"2026-10-28 00:28:08","temperature":-3.5,"humidite":80,"pression":1016.2,"pluie_cumul_0h":0.0,"pluie_1h":0.0,"point_de_rosee":-7.5,"vent_moyen":9.4,"vent_rafales":15.0,"vent_direction":160},{"dh_utc":"2026-10-28 00:38:08","temperature":-3.5,"humidite":81,"pression":1016.2,"pluie_cumul_0h":0.0,"pluie_1h":0.0,"point_de_rosee":-7.3,"vent_moyen":9.0,"vent_rafales":14.4,"vent_direction":160},{"dh_utc":"2026-10-28 00:48:08","temperature":-3.6,"humidite":82,"pression":1016.2,"pluie_cumul_0h":0.0,"pluie_1h":0.0,"point_de_rosee":-7.2,"vent_moyen":8.6,"vent_rafales":13.8,"vent_direction":161},{"dh_utc":"2026-10-28 00:58:08","temperature":-3.6,"humidite":83,"pression":1016.2,"pluie_cumul_0h":0.0,"pluie_1h":0.0,"point_de_rosee":-7.0,"vent_moyen":8.2,"vent_rafales":13.1,"vent_direction":162},{"dh_utc":"2026-10-28 01:08:08","temperature":-3.8,"humidite":84,"pression":1016.1,"pluie_cumul_0h":0.0,"pluie_1h":0.0,"point_de_rosee":-7.0,"vent_moyen":7.7,"vent_rafales":12.3,"vent_direction":164},{"dh_utc":"2026-10-28 01:18:08","temperature":-3.9,"humidite":85,"pression":1016.1,"pluie_cumul_0h":0.0,"pluie_1h":0.0,"point_de_rosee":-6.9,"vent_moyen":7.1,"vent_rafales":11.4,"vent_direction":166},{"dh_utc":"2026-10-28 01:28:08","temperature":-4.1,"humidite":85,"pression":1016.1,"pluie_cumul_0h":0.0,"pluie_1h":0.0,"point_de_rosee":-7.1,"vent_moyen":6.6,"vent_rafales":10.6,"vent_direction":168},{"dh_utc":"2026-10-28 01:38:08","temperature":-4.2,"humidite":86,"pression":1016.1,"pluie_cumul_0h":0.0,"pluie_1h":0.0,"point_de_rosee":-7.0,"vent_moyen":6.0,"vent_rafales":9.6,"vent_direction":170},{"dh_Ligne tronquée
|
||||
Référencer dans un nouveau ticket
Bloquer un utilisateur