gavindiaz/PolyWeather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: comprehensive safe_float for all numeric fields to prevent str-int errors

Browse Source
This commit is contained in:
2569718930@qq.com
2026-03-01 19:04:59 +08:00
parent 3ed775816b
commit 0a9c997049
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bot_listener.py
+15 -9
View File
@@ -29,9 +29,15 @@ def analyze_weather_trend(weather_data, temp_symbol, city_name=None):
if not metar or not open_meteo: if not metar or not open_meteo:
return "", "" return "", ""
# 数值归一化：防止 JSON 反序列化后的 str 类型炸数学运算
def _sf(v):
"""safe float"""
if v is None: return None
try: return float(v)
except: return None
curr_temp = metar.get("current", {}).get("temp") curr_temp = _sf(metar.get("current", {}).get("temp"))
max_so_far = metar.get("current", {}).get("max_temp_so_far") # 今日实测最高 max_so_far = _sf(metar.get("current", {}).get("max_temp_so_far"))
daily = open_meteo.get("daily", {}) daily = open_meteo.get("daily", {})
hourly = open_meteo.get("hourly", {}) hourly = open_meteo.get("hourly", {})
times = hourly.get("time", []) times = hourly.get("time", [])
@@ -41,16 +47,16 @@ def analyze_weather_trend(weather_data, temp_symbol, city_name=None):
# 抽取各个确定性预报值构成的字典 # 抽取各个确定性预报值构成的字典
current_forecasts = {} current_forecasts = {}
if daily.get("temperature_2m_max"): if daily.get("temperature_2m_max"):
current_forecasts["Open-Meteo"] = daily.get("temperature_2m_max")[0] current_forecasts["Open-Meteo"] = _sf(daily.get("temperature_2m_max")[0])
if mb.get("today_high") is not None: if mb.get("today_high") is not None:
current_forecasts["Meteoblue"] = mb.get("today_high") current_forecasts["Meteoblue"] = _sf(mb.get("today_high"))
if nws.get("today_high") is not None: if nws.get("today_high") is not None:
current_forecasts["NWS"] = nws.get("today_high") current_forecasts["NWS"] = _sf(nws.get("today_high"))
mm_forecasts = weather_data.get("multi_model", {}).get("forecasts", {}) mm_forecasts = weather_data.get("multi_model", {}).get("forecasts", {})
for m_name, m_val in mm_forecasts.items(): for m_name, m_val in mm_forecasts.items():
if m_val is not None: if m_val is not None:
current_forecasts[m_name] = m_val current_forecasts[m_name] = _sf(m_val)
# 从 URL/入参里我们暂时拿不到城名，为了 DEB 追溯我们在后方的总控那里提取。这里的 analyze_weather_trend 主要计算最高预留。 # 从 URL/入参里我们暂时拿不到城名，为了 DEB 追溯我们在后方的总控那里提取。这里的 analyze_weather_trend 主要计算最高预留。
forecast_highs = [h for h in current_forecasts.values() if h is not None] forecast_highs = [h for h in current_forecasts.values() if h is not None]
@@ -129,9 +135,9 @@ def analyze_weather_trend(weather_data, temp_symbol, city_name=None):
# === 集合预报区间 === # === 集合预报区间 ===
ensemble = weather_data.get("ensemble", {}) ensemble = weather_data.get("ensemble", {})
ens_p10 = ensemble.get("p10") ens_p10 = _sf(ensemble.get("p10"))
ens_p90 = ensemble.get("p90") ens_p90 = _sf(ensemble.get("p90"))
ens_median = ensemble.get("median") ens_median = _sf(ensemble.get("median"))
if ens_p10 is not None and ens_p90 is not None and ens_median is not None: if ens_p10 is not None and ens_p90 is not None and ens_median is not None:
msg1 = f"📊 <b>集合预报</b>：中位数 {ens_median}{temp_symbol}，90% 区间 [{ens_p10}{temp_symbol} - {ens_p90}{temp_symbol}]。" msg1 = f"📊 <b>集合预报</b>：中位数 {ens_median}{temp_symbol}，90% 区间 [{ens_p10}{temp_symbol} - {ens_p90}{temp_symbol}]。"
if not is_cooling: insights.append(msg1) if not is_cooling: insights.append(msg1)