Add CI and shadow calibration reporting
This commit is contained in:
@@ -2,7 +2,7 @@ import os
|
||||
import json
|
||||
from datetime import datetime, timedelta
|
||||
import requests
|
||||
from src.analysis.settlement_rounding import wu_round, apply_city_settlement, is_exact_settlement_city
|
||||
from src.analysis.settlement_rounding import apply_city_settlement
|
||||
|
||||
# Cross-platform file locking
|
||||
import sys
|
||||
@@ -38,6 +38,15 @@ _history_cache = {}
|
||||
_history_mtime = 0
|
||||
|
||||
|
||||
def _sf(value):
|
||||
if value is None:
|
||||
return None
|
||||
try:
|
||||
return float(value)
|
||||
except Exception:
|
||||
return None
|
||||
|
||||
|
||||
def _is_excluded_model_name(model_name: str) -> bool:
|
||||
normalized = str(model_name or "").strip().lower().replace(" ", "").replace("_", "").replace("-", "")
|
||||
return "meteoblue" in normalized
|
||||
@@ -217,8 +226,16 @@ def reconcile_recent_actual_highs(city_name: str, lookback_days: int = 7):
|
||||
|
||||
|
||||
def update_daily_record(
|
||||
city_name, date_str, forecasts, actual_high, deb_prediction=None,
|
||||
mu=None, probabilities=None
|
||||
city_name,
|
||||
date_str,
|
||||
forecasts,
|
||||
actual_high,
|
||||
deb_prediction=None,
|
||||
mu=None,
|
||||
probabilities=None,
|
||||
probability_features=None,
|
||||
shadow_probabilities=None,
|
||||
calibration_summary=None,
|
||||
):
|
||||
"""
|
||||
保存/更新某城市某天的各个模型预报与最终实测值
|
||||
@@ -253,6 +270,36 @@ def update_daily_record(
|
||||
{"v": p["value"], "p": p["probability"]}
|
||||
for p in probabilities[:4]
|
||||
]
|
||||
compact_features = None
|
||||
if isinstance(probability_features, dict) and probability_features:
|
||||
compact_features = {
|
||||
"raw_mu": _sf(probability_features.get("raw_mu")),
|
||||
"raw_sigma": _sf(probability_features.get("raw_sigma")),
|
||||
"deb_prediction": _sf(probability_features.get("deb_prediction")),
|
||||
"ens_median": _sf(probability_features.get("ens_median")),
|
||||
"ensemble_spread": _sf(probability_features.get("ensemble_spread")),
|
||||
"max_so_far": _sf(probability_features.get("max_so_far")),
|
||||
"max_so_far_gap": _sf(probability_features.get("max_so_far_gap")),
|
||||
"peak_status": probability_features.get("peak_status"),
|
||||
}
|
||||
compact_shadow_probs = None
|
||||
if shadow_probabilities is not None:
|
||||
compact_shadow_probs = [
|
||||
{"v": p["value"], "p": p["probability"]}
|
||||
for p in shadow_probabilities[:4]
|
||||
]
|
||||
compact_calibration = None
|
||||
if isinstance(calibration_summary, dict) and calibration_summary:
|
||||
compact_calibration = {
|
||||
"mode": calibration_summary.get("mode"),
|
||||
"engine": calibration_summary.get("engine"),
|
||||
"version": calibration_summary.get("calibration_version"),
|
||||
"source": calibration_summary.get("calibration_source"),
|
||||
"raw_mu": _sf(calibration_summary.get("raw_mu")),
|
||||
"raw_sigma": _sf(calibration_summary.get("raw_sigma")),
|
||||
"calibrated_mu": _sf(calibration_summary.get("calibrated_mu")),
|
||||
"calibrated_sigma": _sf(calibration_summary.get("calibrated_sigma")),
|
||||
}
|
||||
|
||||
# 避免无意义的频繁磁盘写入
|
||||
existing = data[city_name][date_str]
|
||||
@@ -260,6 +307,7 @@ def update_daily_record(
|
||||
old_deb = existing.get("deb_prediction")
|
||||
old_mu = existing.get("mu")
|
||||
old_probs = existing.get("prob_snapshot")
|
||||
old_shadow_probs = existing.get("shadow_prob_snapshot")
|
||||
next_mu = round(mu, 2) if mu is not None else None
|
||||
if (
|
||||
old_actual == actual_high
|
||||
@@ -267,6 +315,18 @@ def update_daily_record(
|
||||
and (deb_prediction is None or old_deb == deb_prediction)
|
||||
and (mu is None or old_mu == next_mu)
|
||||
and (compact_probs is None or old_probs == compact_probs)
|
||||
and (
|
||||
compact_shadow_probs is None
|
||||
or old_shadow_probs == compact_shadow_probs
|
||||
)
|
||||
and (
|
||||
compact_features is None
|
||||
or existing.get("probability_features") == compact_features
|
||||
)
|
||||
and (
|
||||
compact_calibration is None
|
||||
or existing.get("probability_calibration") == compact_calibration
|
||||
)
|
||||
):
|
||||
return
|
||||
|
||||
@@ -285,6 +345,12 @@ def update_daily_record(
|
||||
existing["mu"] = next_mu
|
||||
if probabilities is not None:
|
||||
existing["prob_snapshot"] = compact_probs
|
||||
if compact_features is not None:
|
||||
existing["probability_features"] = compact_features
|
||||
if shadow_probabilities is not None:
|
||||
existing["shadow_prob_snapshot"] = compact_shadow_probs
|
||||
if compact_calibration is not None:
|
||||
existing["probability_calibration"] = compact_calibration
|
||||
|
||||
# 自动清理:只保留最近 14 天的记录(DEB 只用 7 天,14 天留足余量)
|
||||
cutoff = (datetime.now() - timedelta(days=14)).strftime("%Y-%m-%d")
|
||||
|
||||
@@ -9,7 +9,7 @@ import re
|
||||
from datetime import datetime, timezone
|
||||
from typing import Any, Dict, List, Optional, Tuple
|
||||
|
||||
from src.analysis.settlement_rounding import wu_round, apply_city_settlement, is_exact_settlement_city
|
||||
from src.analysis.settlement_rounding import apply_city_settlement
|
||||
|
||||
|
||||
def _sf(v: Any) -> Optional[float]:
|
||||
@@ -652,6 +652,7 @@ def _pick_bucket_for_forecast(
|
||||
|
||||
def _extract_market_snapshot(city_weather: Dict[str, Any]) -> Dict[str, Any]:
|
||||
scan = city_weather.get("market_scan") or {}
|
||||
city = str(city_weather.get("name") or "").strip().lower()
|
||||
if not isinstance(scan, dict):
|
||||
return {"available": False}
|
||||
if not scan.get("available"):
|
||||
|
||||
@@ -0,0 +1,643 @@
|
||||
from __future__ import annotations
|
||||
|
||||
import json
|
||||
import math
|
||||
import os
|
||||
from datetime import datetime, timezone
|
||||
from typing import Any, Dict, Iterable, List, Optional, Tuple
|
||||
|
||||
import numpy as np
|
||||
|
||||
from src.analysis.settlement_rounding import apply_city_settlement, is_exact_settlement_city
|
||||
|
||||
ENGINE_MODE_LEGACY = "legacy"
|
||||
ENGINE_MODE_EMOS_SHADOW = "emos_shadow"
|
||||
ENGINE_MODE_EMOS_PRIMARY = "emos_primary"
|
||||
VALID_ENGINE_MODES = {
|
||||
ENGINE_MODE_LEGACY,
|
||||
ENGINE_MODE_EMOS_SHADOW,
|
||||
ENGINE_MODE_EMOS_PRIMARY,
|
||||
}
|
||||
|
||||
DEFAULT_CALIBRATION_FILE = os.path.join(
|
||||
os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))),
|
||||
"artifacts",
|
||||
"probability_calibration",
|
||||
"default.json",
|
||||
)
|
||||
|
||||
_CALIBRATION_CACHE: Dict[str, Dict[str, Any]] = {}
|
||||
_CALIBRATION_MTIME: Dict[str, float] = {}
|
||||
|
||||
|
||||
def _sf(value: Any) -> Optional[float]:
|
||||
if value is None:
|
||||
return None
|
||||
try:
|
||||
return float(value)
|
||||
except Exception:
|
||||
return None
|
||||
|
||||
|
||||
def _coalesce_float(value: Any, default: float) -> float:
|
||||
parsed = _sf(value)
|
||||
return default if parsed is None else parsed
|
||||
|
||||
|
||||
def _mean(values: Iterable[float]) -> Optional[float]:
|
||||
values = list(values)
|
||||
return (sum(values) / len(values)) if values else None
|
||||
|
||||
|
||||
def resolve_probability_engine_mode(explicit_mode: Optional[str] = None) -> str:
|
||||
mode = str(
|
||||
explicit_mode
|
||||
or os.getenv("POLYWEATHER_PROBABILITY_ENGINE")
|
||||
or ENGINE_MODE_EMOS_SHADOW
|
||||
).strip().lower()
|
||||
if mode not in VALID_ENGINE_MODES:
|
||||
return ENGINE_MODE_EMOS_SHADOW
|
||||
return mode
|
||||
|
||||
|
||||
def load_calibration(calibration_path: Optional[str] = None) -> Dict[str, Any]:
|
||||
path = str(
|
||||
calibration_path
|
||||
or os.getenv("POLYWEATHER_PROBABILITY_CALIBRATION_FILE")
|
||||
or DEFAULT_CALIBRATION_FILE
|
||||
).strip()
|
||||
if not path:
|
||||
return {}
|
||||
if not os.path.exists(path):
|
||||
return {}
|
||||
|
||||
try:
|
||||
mtime = os.path.getmtime(path)
|
||||
cached = _CALIBRATION_CACHE.get(path)
|
||||
if cached and _CALIBRATION_MTIME.get(path) == mtime:
|
||||
return cached
|
||||
|
||||
with open(path, "r", encoding="utf-8") as fh:
|
||||
data = json.load(fh)
|
||||
if not isinstance(data, dict):
|
||||
return {}
|
||||
|
||||
_CALIBRATION_CACHE[path] = data
|
||||
_CALIBRATION_MTIME[path] = mtime
|
||||
return data
|
||||
except Exception:
|
||||
return {}
|
||||
|
||||
|
||||
def build_probability_features(
|
||||
city_name: str,
|
||||
raw_mu: Optional[float],
|
||||
raw_sigma: Optional[float],
|
||||
deb_prediction: Optional[float],
|
||||
ens_data: Optional[Dict[str, Any]],
|
||||
current_forecasts: Optional[Dict[str, Any]],
|
||||
max_so_far: Optional[float],
|
||||
peak_status: str,
|
||||
local_hour_frac: Optional[float],
|
||||
) -> Dict[str, Any]:
|
||||
ens_data = ens_data or {}
|
||||
current_forecasts = current_forecasts or {}
|
||||
forecast_values = [
|
||||
v for v in (_sf(val) for val in current_forecasts.values()) if v is not None
|
||||
]
|
||||
forecast_values.sort()
|
||||
forecast_median = None
|
||||
if forecast_values:
|
||||
forecast_median = forecast_values[len(forecast_values) // 2]
|
||||
|
||||
ens_median = _sf(ens_data.get("median"))
|
||||
ens_p10 = _sf(ens_data.get("p10"))
|
||||
ens_p90 = _sf(ens_data.get("p90"))
|
||||
|
||||
ensemble_spread = None
|
||||
if ens_p10 is not None and ens_p90 is not None and ens_p90 >= ens_p10:
|
||||
ensemble_spread = max(0.1, (ens_p90 - ens_p10) / 2.56)
|
||||
elif len(forecast_values) >= 2:
|
||||
ensemble_spread = max(0.6, (forecast_values[-1] - forecast_values[0]) / 2.0)
|
||||
elif raw_sigma is not None:
|
||||
ensemble_spread = max(0.1, raw_sigma)
|
||||
|
||||
baseline = deb_prediction if deb_prediction is not None else raw_mu
|
||||
max_so_far_gap = None
|
||||
if baseline is not None and max_so_far is not None:
|
||||
max_so_far_gap = baseline - max_so_far
|
||||
|
||||
peak_flag = 0.0
|
||||
if peak_status == "in_window":
|
||||
peak_flag = 0.5
|
||||
elif peak_status == "past":
|
||||
peak_flag = 1.0
|
||||
|
||||
return {
|
||||
"city": str(city_name or "").strip().lower(),
|
||||
"raw_mu": raw_mu,
|
||||
"raw_sigma": raw_sigma,
|
||||
"deb_prediction": deb_prediction,
|
||||
"ens_median": ens_median,
|
||||
"ens_p10": ens_p10,
|
||||
"ens_p90": ens_p90,
|
||||
"forecast_median": forecast_median,
|
||||
"forecast_spread": forecast_values[-1] - forecast_values[0]
|
||||
if len(forecast_values) >= 2
|
||||
else None,
|
||||
"ensemble_spread": ensemble_spread,
|
||||
"max_so_far": max_so_far,
|
||||
"max_so_far_gap": max_so_far_gap,
|
||||
"peak_status": peak_status,
|
||||
"peak_flag": peak_flag,
|
||||
"local_hour_frac": local_hour_frac,
|
||||
"model_count": len(forecast_values),
|
||||
}
|
||||
|
||||
|
||||
def _normal_cdf(x: float, mean: float, sigma: float) -> float:
|
||||
return 0.5 * (1.0 + math.erf((x - mean) / (sigma * math.sqrt(2.0))))
|
||||
|
||||
|
||||
def _normal_pdf(x: float) -> float:
|
||||
return math.exp(-(x ** 2) / 2.0) / math.sqrt(2.0 * math.pi)
|
||||
|
||||
|
||||
def _bucket_probabilities(
|
||||
mu: float,
|
||||
sigma: float,
|
||||
max_so_far: Optional[float],
|
||||
city_name: str,
|
||||
) -> Tuple[List[Dict[str, Any]], List[Tuple[int, float]]]:
|
||||
sigma = max(0.1, float(sigma))
|
||||
min_possible = (
|
||||
apply_city_settlement(city_name, max_so_far) if max_so_far is not None else -999
|
||||
)
|
||||
probs: Dict[int, float] = {}
|
||||
search_range = max(2, int(sigma * 2.5))
|
||||
is_exact = is_exact_settlement_city(city_name)
|
||||
target_mu = apply_city_settlement(city_name, mu)
|
||||
if is_exact:
|
||||
target_mu = int(math.floor(mu))
|
||||
|
||||
for value in range(target_mu - search_range, target_mu + search_range + 1):
|
||||
if value < min_possible:
|
||||
continue
|
||||
if is_exact:
|
||||
prob = _normal_cdf(value + 1.0, mu, sigma) - _normal_cdf(value, mu, sigma)
|
||||
else:
|
||||
prob = _normal_cdf(value + 0.5, mu, sigma) - _normal_cdf(value - 0.5, mu, sigma)
|
||||
if prob > 0.01:
|
||||
probs[value] = prob
|
||||
|
||||
total = sum(probs.values())
|
||||
if total <= 0:
|
||||
return [], []
|
||||
|
||||
normalized = {key: val / total for key, val in probs.items()}
|
||||
sorted_probs = sorted(normalized.items(), key=lambda item: item[1], reverse=True)
|
||||
distribution = []
|
||||
for value, prob in sorted_probs[:4]:
|
||||
if is_exact:
|
||||
bucket_range = "[{0}.0~{1}.0)".format(value, value + 1)
|
||||
else:
|
||||
bucket_range = "[{0}~{1})".format(value - 0.5, value + 0.5)
|
||||
distribution.append(
|
||||
{
|
||||
"value": int(value),
|
||||
"range": bucket_range,
|
||||
"probability": round(prob, 3),
|
||||
}
|
||||
)
|
||||
return distribution, sorted_probs
|
||||
|
||||
|
||||
def _top_bucket_value(distribution: Optional[List[Dict[str, Any]]]) -> Optional[int]:
|
||||
if not distribution:
|
||||
return None
|
||||
top = max(
|
||||
(row for row in distribution if isinstance(row, dict)),
|
||||
key=lambda row: float(row.get("probability") or 0.0),
|
||||
default=None,
|
||||
)
|
||||
if not top:
|
||||
return None
|
||||
value = top.get("value")
|
||||
return int(value) if value is not None else None
|
||||
|
||||
|
||||
def _composite_score(mean_crps: float, mean_mae: float, bucket_hit_rate: float) -> float:
|
||||
return mean_crps + 0.1 * mean_mae + 2.0 * (1.0 - bucket_hit_rate)
|
||||
|
||||
|
||||
def _blend_value(raw_value: float, calibrated_value: float, alpha: float) -> float:
|
||||
return (1.0 - alpha) * raw_value + alpha * calibrated_value
|
||||
|
||||
|
||||
def apply_probability_calibration(
|
||||
city_name: str,
|
||||
temp_symbol: str,
|
||||
raw_mu: Optional[float],
|
||||
raw_sigma: Optional[float],
|
||||
max_so_far: Optional[float],
|
||||
legacy_distribution: Optional[List[Dict[str, Any]]],
|
||||
features: Optional[Dict[str, Any]] = None,
|
||||
calibration_path: Optional[str] = None,
|
||||
mode: Optional[str] = None,
|
||||
) -> Dict[str, Any]:
|
||||
selected_mode = resolve_probability_engine_mode(mode)
|
||||
if raw_mu is None or raw_sigma is None:
|
||||
return {
|
||||
"mode": selected_mode,
|
||||
"engine": ENGINE_MODE_LEGACY,
|
||||
"distribution": legacy_distribution or [],
|
||||
"shadow_distribution": [],
|
||||
"raw_mu": raw_mu,
|
||||
"raw_sigma": raw_sigma,
|
||||
"calibrated_mu": None,
|
||||
"calibrated_sigma": None,
|
||||
"calibration_version": None,
|
||||
"calibration_source": None,
|
||||
}
|
||||
|
||||
calibration = load_calibration(calibration_path)
|
||||
if not calibration:
|
||||
return {
|
||||
"mode": selected_mode,
|
||||
"engine": ENGINE_MODE_LEGACY,
|
||||
"distribution": legacy_distribution or [],
|
||||
"shadow_distribution": [],
|
||||
"raw_mu": raw_mu,
|
||||
"raw_sigma": raw_sigma,
|
||||
"calibrated_mu": None,
|
||||
"calibrated_sigma": None,
|
||||
"calibration_version": None,
|
||||
"calibration_source": None,
|
||||
}
|
||||
|
||||
features = features or {}
|
||||
city_key = str(city_name or "").strip().lower()
|
||||
global_params = calibration.get("global", {}) or {}
|
||||
city_params = (calibration.get("cities", {}) or {}).get(city_key, {}) or {}
|
||||
blending_cfg = calibration.get("blending", {}) or {}
|
||||
|
||||
mu_cfg = global_params.get("mu", {}) or {}
|
||||
sigma_cfg = global_params.get("sigma", {}) or {}
|
||||
city_confidence = max(0.0, min(1.0, _coalesce_float(city_params.get("confidence"), 1.0)))
|
||||
city_mu_bias = _coalesce_float(city_params.get("mu_bias"), 0.0) * city_confidence
|
||||
city_sigma_scale = 1.0 + (
|
||||
(_coalesce_float(city_params.get("sigma_scale"), 1.0) - 1.0) * city_confidence
|
||||
)
|
||||
|
||||
deb_prediction = _sf(features.get("deb_prediction"))
|
||||
ens_median = _sf(features.get("ens_median"))
|
||||
max_so_far_gap = _sf(features.get("max_so_far_gap"))
|
||||
peak_flag = _sf(features.get("peak_flag")) or 0.0
|
||||
ensemble_spread = _sf(features.get("ensemble_spread"))
|
||||
|
||||
mu_intercept = _coalesce_float(mu_cfg.get("intercept"), 0.0)
|
||||
mu_raw_coef = _coalesce_float(mu_cfg.get("raw_mu_coef"), 1.0)
|
||||
mu_deb_coef = _coalesce_float(mu_cfg.get("deb_coef"), 0.0)
|
||||
mu_ens_coef = _coalesce_float(mu_cfg.get("ens_median_coef"), 0.0)
|
||||
mu_gap_coef = _coalesce_float(mu_cfg.get("max_so_far_gap_coef"), 0.0)
|
||||
|
||||
sigma_intercept = _coalesce_float(
|
||||
sigma_cfg.get("intercept"),
|
||||
math.log(max(raw_sigma, 0.1)),
|
||||
)
|
||||
sigma_raw_coef = _coalesce_float(sigma_cfg.get("raw_sigma_coef"), 1.0)
|
||||
sigma_spread_coef = _coalesce_float(sigma_cfg.get("spread_coef"), 0.0)
|
||||
sigma_peak_coef = _coalesce_float(sigma_cfg.get("peak_flag_coef"), 0.0)
|
||||
sigma_gap_coef = _coalesce_float(sigma_cfg.get("max_so_far_gap_coef"), 0.0)
|
||||
|
||||
calibrated_mu = (
|
||||
mu_intercept
|
||||
+ mu_raw_coef * raw_mu
|
||||
+ mu_deb_coef * (deb_prediction if deb_prediction is not None else raw_mu)
|
||||
+ mu_ens_coef * (ens_median if ens_median is not None else raw_mu)
|
||||
+ mu_gap_coef * (max_so_far_gap if max_so_far_gap is not None else 0.0)
|
||||
+ city_mu_bias
|
||||
)
|
||||
sigma_log = (
|
||||
sigma_intercept
|
||||
+ sigma_raw_coef * math.log(max(raw_sigma, 0.1))
|
||||
+ sigma_spread_coef * math.log(max(ensemble_spread or raw_sigma, 0.1))
|
||||
+ sigma_peak_coef * peak_flag
|
||||
+ sigma_gap_coef * (max_so_far_gap if max_so_far_gap is not None else 0.0)
|
||||
)
|
||||
calibrated_sigma = max(0.1, math.exp(sigma_log) * city_sigma_scale)
|
||||
blend_alpha_mu = max(0.0, min(1.0, _coalesce_float(blending_cfg.get("alpha_mu"), 1.0)))
|
||||
blend_alpha_sigma = max(0.0, min(1.0, _coalesce_float(blending_cfg.get("alpha_sigma"), 1.0)))
|
||||
calibrated_mu = _blend_value(raw_mu, calibrated_mu, blend_alpha_mu)
|
||||
calibrated_sigma = max(0.1, _blend_value(raw_sigma, calibrated_sigma, blend_alpha_sigma))
|
||||
calibrated_distribution, calibrated_sorted = _bucket_probabilities(
|
||||
calibrated_mu,
|
||||
calibrated_sigma,
|
||||
max_so_far=max_so_far,
|
||||
city_name=city_key,
|
||||
)
|
||||
|
||||
engine = ENGINE_MODE_LEGACY
|
||||
selected_distribution = legacy_distribution or []
|
||||
selected_sorted: List[Tuple[int, float]] = []
|
||||
shadow_distribution: List[Dict[str, Any]] = []
|
||||
shadow_sorted: List[Tuple[int, float]] = []
|
||||
if selected_mode == ENGINE_MODE_EMOS_PRIMARY:
|
||||
engine = "emos"
|
||||
selected_distribution = calibrated_distribution
|
||||
selected_sorted = calibrated_sorted
|
||||
elif selected_mode == ENGINE_MODE_EMOS_SHADOW:
|
||||
shadow_distribution = calibrated_distribution
|
||||
shadow_sorted = calibrated_sorted
|
||||
|
||||
return {
|
||||
"mode": selected_mode,
|
||||
"engine": engine,
|
||||
"distribution": selected_distribution,
|
||||
"selected_sorted_probs": selected_sorted,
|
||||
"shadow_distribution": shadow_distribution,
|
||||
"shadow_sorted_probs": shadow_sorted,
|
||||
"raw_mu": raw_mu,
|
||||
"raw_sigma": raw_sigma,
|
||||
"calibrated_mu": calibrated_mu,
|
||||
"calibrated_sigma": calibrated_sigma,
|
||||
"blend_alpha_mu": blend_alpha_mu,
|
||||
"blend_alpha_sigma": blend_alpha_sigma,
|
||||
"calibration_version": calibration.get("version"),
|
||||
"calibration_source": calibration.get("source")
|
||||
or os.path.relpath(
|
||||
calibration_path or DEFAULT_CALIBRATION_FILE,
|
||||
os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))),
|
||||
),
|
||||
}
|
||||
|
||||
|
||||
def _gaussian_crps(observation: float, mean: float, sigma: float) -> float:
|
||||
sigma = max(0.1, float(sigma))
|
||||
z = (observation - mean) / sigma
|
||||
return sigma * (
|
||||
z * (2.0 * _normal_cdf(z, 0.0, 1.0) - 1.0)
|
||||
+ 2.0 * _normal_pdf(z)
|
||||
- 1.0 / math.sqrt(math.pi)
|
||||
)
|
||||
|
||||
|
||||
def _fit_linear(xs: np.ndarray, ys: np.ndarray) -> np.ndarray:
|
||||
if len(xs) == 0:
|
||||
return np.zeros(xs.shape[1], dtype=float)
|
||||
coeffs, _, _, _ = np.linalg.lstsq(xs, ys, rcond=None)
|
||||
return coeffs
|
||||
|
||||
|
||||
def fit_calibration(
|
||||
samples: Iterable[Dict[str, Any]],
|
||||
version: Optional[str] = None,
|
||||
) -> Dict[str, Any]:
|
||||
normalized_samples: List[Dict[str, Any]] = []
|
||||
city_residuals: Dict[str, List[float]] = {}
|
||||
city_sigma_ratios: Dict[str, List[float]] = {}
|
||||
|
||||
for raw_sample in samples:
|
||||
actual = _sf(raw_sample.get("actual_high"))
|
||||
raw_mu = _sf(raw_sample.get("raw_mu"))
|
||||
raw_sigma = _sf(raw_sample.get("raw_sigma"))
|
||||
if actual is None or raw_mu is None or raw_sigma is None:
|
||||
continue
|
||||
feature_row = {
|
||||
"city": str(raw_sample.get("city") or "").strip().lower(),
|
||||
"actual_high": actual,
|
||||
"raw_mu": raw_mu,
|
||||
"raw_sigma": max(0.1, raw_sigma),
|
||||
"deb_prediction": _sf(raw_sample.get("deb_prediction")),
|
||||
"ens_median": _sf(raw_sample.get("ens_median")),
|
||||
"ensemble_spread": _sf(raw_sample.get("ensemble_spread")),
|
||||
"max_so_far_gap": _sf(raw_sample.get("max_so_far_gap")),
|
||||
"peak_flag": _sf(raw_sample.get("peak_flag")) or 0.0,
|
||||
}
|
||||
normalized_samples.append(feature_row)
|
||||
|
||||
if len(normalized_samples) < 3:
|
||||
return default_calibration_payload(version=version, reason="insufficient_samples")
|
||||
|
||||
mu_rows = []
|
||||
mu_targets = []
|
||||
for sample in normalized_samples:
|
||||
deb = sample["deb_prediction"] if sample["deb_prediction"] is not None else sample["raw_mu"]
|
||||
ens_median = sample["ens_median"] if sample["ens_median"] is not None else sample["raw_mu"]
|
||||
gap = sample["max_so_far_gap"] if sample["max_so_far_gap"] is not None else 0.0
|
||||
mu_rows.append([1.0, sample["raw_mu"], deb, ens_median, gap])
|
||||
mu_targets.append(sample["actual_high"])
|
||||
|
||||
mu_coeffs = _fit_linear(np.array(mu_rows, dtype=float), np.array(mu_targets, dtype=float))
|
||||
|
||||
sigma_rows = []
|
||||
sigma_targets = []
|
||||
mu_predictions = []
|
||||
for idx, sample in enumerate(normalized_samples):
|
||||
predicted_mu = float(np.dot(mu_coeffs, np.array(mu_rows[idx], dtype=float)))
|
||||
mu_predictions.append(predicted_mu)
|
||||
residual = max(abs(sample["actual_high"] - predicted_mu), 0.1)
|
||||
spread = max(sample["ensemble_spread"] or sample["raw_sigma"], 0.1)
|
||||
gap = sample["max_so_far_gap"] if sample["max_so_far_gap"] is not None else 0.0
|
||||
sigma_rows.append([1.0, math.log(sample["raw_sigma"]), math.log(spread), sample["peak_flag"], gap])
|
||||
sigma_targets.append(math.log(residual))
|
||||
city_residuals.setdefault(sample["city"], []).append(sample["actual_high"] - predicted_mu)
|
||||
city_sigma_ratios.setdefault(sample["city"], []).append(residual / max(sample["raw_sigma"], 0.1))
|
||||
|
||||
sigma_coeffs = _fit_linear(np.array(sigma_rows, dtype=float), np.array(sigma_targets, dtype=float))
|
||||
|
||||
crps_values = []
|
||||
for idx, sample in enumerate(normalized_samples):
|
||||
predicted_mu = mu_predictions[idx]
|
||||
sigma_log = float(np.dot(sigma_coeffs, np.array(sigma_rows[idx], dtype=float)))
|
||||
predicted_sigma = max(0.1, math.exp(sigma_log))
|
||||
crps_values.append(_gaussian_crps(sample["actual_high"], predicted_mu, predicted_sigma))
|
||||
|
||||
city_params: Dict[str, Dict[str, Any]] = {}
|
||||
for city, residuals in city_residuals.items():
|
||||
if len(residuals) < 3:
|
||||
continue
|
||||
sigma_ratios = city_sigma_ratios.get(city) or [1.0]
|
||||
confidence = max(0.25, min(1.0, len(residuals) / 8.0))
|
||||
city_params[city] = {
|
||||
"samples": len(residuals),
|
||||
"mu_bias": round(sum(residuals) / len(residuals), 6),
|
||||
"sigma_scale": round(
|
||||
max(0.5, min(2.0, sum(sigma_ratios) / len(sigma_ratios))),
|
||||
6,
|
||||
),
|
||||
"confidence": round(confidence, 6),
|
||||
}
|
||||
|
||||
legacy_crps_values = []
|
||||
legacy_mae_values = []
|
||||
legacy_bucket_hits = []
|
||||
candidate_predictions = []
|
||||
for idx, sample in enumerate(normalized_samples):
|
||||
city = sample["city"]
|
||||
city_meta = city_params.get(city, {})
|
||||
city_confidence = max(
|
||||
0.0,
|
||||
min(1.0, _coalesce_float(city_meta.get("confidence"), 1.0)),
|
||||
)
|
||||
city_mu_bias = _coalesce_float(city_meta.get("mu_bias"), 0.0) * city_confidence
|
||||
city_sigma_scale = 1.0 + (
|
||||
(_coalesce_float(city_meta.get("sigma_scale"), 1.0) - 1.0) * city_confidence
|
||||
)
|
||||
|
||||
legacy_mu = sample["raw_mu"]
|
||||
legacy_sigma = sample["raw_sigma"]
|
||||
actual_high = sample["actual_high"]
|
||||
legacy_crps_values.append(_gaussian_crps(actual_high, legacy_mu, legacy_sigma))
|
||||
legacy_mae_values.append(abs(legacy_mu - actual_high))
|
||||
legacy_bucket_hits.append(
|
||||
1.0
|
||||
if apply_city_settlement(city, legacy_mu)
|
||||
== apply_city_settlement(city, actual_high)
|
||||
else 0.0
|
||||
)
|
||||
|
||||
calibrated_mu = mu_predictions[idx] + city_mu_bias
|
||||
sigma_log = float(np.dot(sigma_coeffs, np.array(sigma_rows[idx], dtype=float)))
|
||||
calibrated_sigma = max(0.1, math.exp(sigma_log) * city_sigma_scale)
|
||||
candidate_predictions.append(
|
||||
{
|
||||
"city": city,
|
||||
"actual_high": actual_high,
|
||||
"raw_mu": legacy_mu,
|
||||
"raw_sigma": legacy_sigma,
|
||||
"calibrated_mu": calibrated_mu,
|
||||
"calibrated_sigma": calibrated_sigma,
|
||||
}
|
||||
)
|
||||
|
||||
legacy_mean_crps = _mean(legacy_crps_values) or 0.0
|
||||
legacy_mean_mae = _mean(legacy_mae_values) or 0.0
|
||||
legacy_bucket_hit_rate = _mean(legacy_bucket_hits) or 0.0
|
||||
legacy_score = _composite_score(
|
||||
legacy_mean_crps,
|
||||
legacy_mean_mae,
|
||||
legacy_bucket_hit_rate,
|
||||
)
|
||||
|
||||
best_alpha_mu = 0.0
|
||||
best_alpha_sigma = 0.0
|
||||
best_score = legacy_score
|
||||
best_metrics = {
|
||||
"mean_crps": legacy_mean_crps,
|
||||
"mean_mae": legacy_mean_mae,
|
||||
"bucket_hit_rate": legacy_bucket_hit_rate,
|
||||
}
|
||||
alpha_grid = [step / 20.0 for step in range(21)]
|
||||
for alpha_mu in alpha_grid:
|
||||
for alpha_sigma in alpha_grid:
|
||||
crps_values = []
|
||||
mae_values = []
|
||||
bucket_hits = []
|
||||
for row in candidate_predictions:
|
||||
mu_hat = _blend_value(row["raw_mu"], row["calibrated_mu"], alpha_mu)
|
||||
sigma_hat = max(
|
||||
0.1,
|
||||
_blend_value(row["raw_sigma"], row["calibrated_sigma"], alpha_sigma),
|
||||
)
|
||||
actual_high = row["actual_high"]
|
||||
city = row["city"]
|
||||
crps_values.append(_gaussian_crps(actual_high, mu_hat, sigma_hat))
|
||||
mae_values.append(abs(mu_hat - actual_high))
|
||||
distribution, _ = _bucket_probabilities(
|
||||
mu_hat,
|
||||
sigma_hat,
|
||||
max_so_far=None,
|
||||
city_name=city,
|
||||
)
|
||||
predicted_bucket = _top_bucket_value(distribution)
|
||||
actual_bucket = apply_city_settlement(city, actual_high)
|
||||
bucket_hits.append(1.0 if predicted_bucket == actual_bucket else 0.0)
|
||||
|
||||
mean_crps = _mean(crps_values) or 0.0
|
||||
mean_mae = _mean(mae_values) or 0.0
|
||||
bucket_hit_rate = _mean(bucket_hits) or 0.0
|
||||
score = _composite_score(mean_crps, mean_mae, bucket_hit_rate)
|
||||
if score + 1e-9 < best_score:
|
||||
best_score = score
|
||||
best_alpha_mu = alpha_mu
|
||||
best_alpha_sigma = alpha_sigma
|
||||
best_metrics = {
|
||||
"mean_crps": mean_crps,
|
||||
"mean_mae": mean_mae,
|
||||
"bucket_hit_rate": bucket_hit_rate,
|
||||
}
|
||||
|
||||
return {
|
||||
"version": version or datetime.now(timezone.utc).strftime("emos-%Y%m%d%H%M%S"),
|
||||
"trained_at": datetime.now(timezone.utc).isoformat(),
|
||||
"global": {
|
||||
"mu": {
|
||||
"intercept": round(float(mu_coeffs[0]), 8),
|
||||
"raw_mu_coef": round(float(mu_coeffs[1]), 8),
|
||||
"deb_coef": round(float(mu_coeffs[2]), 8),
|
||||
"ens_median_coef": round(float(mu_coeffs[3]), 8),
|
||||
"max_so_far_gap_coef": round(float(mu_coeffs[4]), 8),
|
||||
},
|
||||
"sigma": {
|
||||
"intercept": round(float(sigma_coeffs[0]), 8),
|
||||
"raw_sigma_coef": round(float(sigma_coeffs[1]), 8),
|
||||
"spread_coef": round(float(sigma_coeffs[2]), 8),
|
||||
"peak_flag_coef": round(float(sigma_coeffs[3]), 8),
|
||||
"max_so_far_gap_coef": round(float(sigma_coeffs[4]), 8),
|
||||
},
|
||||
},
|
||||
"blending": {
|
||||
"alpha_mu": round(best_alpha_mu, 6),
|
||||
"alpha_sigma": round(best_alpha_sigma, 6),
|
||||
},
|
||||
"cities": city_params,
|
||||
"metrics": {
|
||||
"sample_count": len(normalized_samples),
|
||||
"mean_crps": round(sum(crps_values) / len(crps_values), 6),
|
||||
"legacy_mean_crps": round(legacy_mean_crps, 6),
|
||||
"legacy_mean_mae": round(legacy_mean_mae, 6),
|
||||
"legacy_bucket_hit_rate": round(legacy_bucket_hit_rate, 6),
|
||||
"selected_mean_crps": round(best_metrics["mean_crps"], 6),
|
||||
"selected_mean_mae": round(best_metrics["mean_mae"], 6),
|
||||
"selected_bucket_hit_rate": round(best_metrics["bucket_hit_rate"], 6),
|
||||
"selected_score": round(best_score, 6),
|
||||
"legacy_score": round(legacy_score, 6),
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
def default_calibration_payload(
|
||||
version: Optional[str] = None,
|
||||
reason: str = "bootstrap",
|
||||
) -> Dict[str, Any]:
|
||||
return {
|
||||
"version": version or "emos-bootstrap-v1",
|
||||
"trained_at": datetime.now(timezone.utc).isoformat(),
|
||||
"global": {
|
||||
"mu": {
|
||||
"intercept": 0.0,
|
||||
"raw_mu_coef": 1.0,
|
||||
"deb_coef": 0.0,
|
||||
"ens_median_coef": 0.0,
|
||||
"max_so_far_gap_coef": 0.0,
|
||||
},
|
||||
"sigma": {
|
||||
"intercept": 0.0,
|
||||
"raw_sigma_coef": 1.0,
|
||||
"spread_coef": 0.0,
|
||||
"peak_flag_coef": 0.0,
|
||||
"max_so_far_gap_coef": 0.0,
|
||||
},
|
||||
},
|
||||
"blending": {
|
||||
"alpha_mu": 1.0,
|
||||
"alpha_sigma": 1.0,
|
||||
},
|
||||
"cities": {},
|
||||
"metrics": {
|
||||
"sample_count": 0,
|
||||
"mean_crps": None,
|
||||
"reason": reason,
|
||||
},
|
||||
}
|
||||
@@ -15,7 +15,11 @@ from src.analysis.deb_algorithm import (
|
||||
update_daily_record,
|
||||
_is_excluded_model_name,
|
||||
)
|
||||
from src.analysis.settlement_rounding import wu_round, apply_city_settlement, is_exact_settlement_city
|
||||
from src.analysis.probability_calibration import (
|
||||
apply_probability_calibration,
|
||||
build_probability_features,
|
||||
)
|
||||
from src.analysis.settlement_rounding import apply_city_settlement, is_exact_settlement_city
|
||||
from src.data_collection.city_registry import CITY_REGISTRY
|
||||
from src.data_collection.city_risk_profiles import get_city_risk_profile
|
||||
|
||||
@@ -431,7 +435,19 @@ def analyze_weather_trend(
|
||||
|
||||
# === Probability Engine ===
|
||||
probabilities: List[Dict[str, Any]] = []
|
||||
shadow_probabilities: List[Dict[str, Any]] = []
|
||||
forecast_miss_deg = 0.0
|
||||
probability_features = None
|
||||
calibration_summary = {
|
||||
"mode": "legacy",
|
||||
"engine": "legacy",
|
||||
"raw_mu": None,
|
||||
"raw_sigma": sigma,
|
||||
"calibrated_mu": None,
|
||||
"calibrated_sigma": None,
|
||||
"calibration_version": None,
|
||||
"calibration_source": None,
|
||||
}
|
||||
|
||||
if is_dead_market:
|
||||
settled_wu = apply_city_settlement(city_name, max_so_far) if max_so_far is not None else 0
|
||||
@@ -492,6 +508,43 @@ def analyze_weather_trend(
|
||||
probabilities = probs_result.get("probabilities", [])
|
||||
sorted_probs = probs_result.get("sorted_probs", [])
|
||||
|
||||
probability_features = build_probability_features(
|
||||
city_name=city_name or "",
|
||||
raw_mu=mu,
|
||||
raw_sigma=sigma,
|
||||
deb_prediction=deb_prediction,
|
||||
ens_data=ens_data,
|
||||
current_forecasts=current_forecasts,
|
||||
max_so_far=max_so_far,
|
||||
peak_status=peak_status,
|
||||
local_hour_frac=local_hour_frac,
|
||||
)
|
||||
calibration_result = apply_probability_calibration(
|
||||
city_name=city_name or "",
|
||||
temp_symbol=temp_symbol,
|
||||
raw_mu=mu,
|
||||
raw_sigma=sigma,
|
||||
max_so_far=max_so_far,
|
||||
legacy_distribution=probabilities,
|
||||
features=probability_features,
|
||||
)
|
||||
calibration_summary = {
|
||||
"mode": calibration_result.get("mode", "legacy"),
|
||||
"engine": calibration_result.get("engine", "legacy"),
|
||||
"raw_mu": calibration_result.get("raw_mu"),
|
||||
"raw_sigma": calibration_result.get("raw_sigma"),
|
||||
"calibrated_mu": calibration_result.get("calibrated_mu"),
|
||||
"calibrated_sigma": calibration_result.get("calibrated_sigma"),
|
||||
"calibration_version": calibration_result.get("calibration_version"),
|
||||
"calibration_source": calibration_result.get("calibration_source"),
|
||||
}
|
||||
shadow_probabilities = calibration_result.get("shadow_distribution") or []
|
||||
if calibration_result.get("engine") == "emos":
|
||||
mu = calibration_result.get("calibrated_mu", mu)
|
||||
sigma = calibration_result.get("calibrated_sigma", sigma)
|
||||
probabilities = calibration_result.get("distribution") or probabilities
|
||||
sorted_probs = calibration_result.get("selected_sorted_probs") or sorted_probs
|
||||
|
||||
if sorted_probs:
|
||||
prob_parts = [
|
||||
f"{int(t)}{temp_symbol} [{t - 0.5}~{t + 0.5}) {p * 100:.0f}%"
|
||||
@@ -650,6 +703,7 @@ def analyze_weather_trend(
|
||||
# === Save daily record (with μ + prob snapshot) ===
|
||||
try:
|
||||
_prob_list = None
|
||||
_shadow_prob_list = None
|
||||
if sorted_probs:
|
||||
_prob_list = [
|
||||
{"value": int(t), "probability": round(p, 3)}
|
||||
@@ -657,6 +711,12 @@ def analyze_weather_trend(
|
||||
]
|
||||
elif is_dead_market and max_so_far is not None:
|
||||
_prob_list = [{"value": apply_city_settlement(city_name, max_so_far), "probability": 1.0}]
|
||||
if shadow_probabilities:
|
||||
_shadow_prob_list = [
|
||||
{"value": int(row.get("value")), "probability": round(float(row.get("probability") or 0.0), 3)}
|
||||
for row in shadow_probabilities[:4]
|
||||
if row.get("value") is not None
|
||||
]
|
||||
|
||||
update_daily_record(
|
||||
city_name,
|
||||
@@ -666,6 +726,9 @@ def analyze_weather_trend(
|
||||
deb_prediction=_deb_to_save,
|
||||
mu=mu,
|
||||
probabilities=_prob_list,
|
||||
probability_features=probability_features,
|
||||
shadow_probabilities=_shadow_prob_list,
|
||||
calibration_summary=calibration_summary,
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
@@ -679,6 +742,15 @@ def analyze_weather_trend(
|
||||
structured = {
|
||||
"mu": mu,
|
||||
"probabilities": probabilities,
|
||||
"shadow_probabilities": shadow_probabilities,
|
||||
"probability_engine": calibration_summary["engine"],
|
||||
"probability_calibration_mode": calibration_summary["mode"],
|
||||
"probability_calibration_version": calibration_summary["calibration_version"],
|
||||
"probability_calibration_source": calibration_summary["calibration_source"],
|
||||
"probability_raw_mu": calibration_summary["raw_mu"],
|
||||
"probability_raw_sigma": calibration_summary["raw_sigma"],
|
||||
"probability_calibrated_mu": calibration_summary["calibrated_mu"],
|
||||
"probability_calibrated_sigma": calibration_summary["calibrated_sigma"],
|
||||
"trend_info": {
|
||||
"direction": trend_direction if 'trend_direction' in dir() else "unknown",
|
||||
"recent": recent_list,
|
||||
@@ -711,7 +783,7 @@ def calculate_prob_distribution(
|
||||
|
||||
def _norm_cdf(x, m, s):
|
||||
# 0.5 * (1 + erf( (x-m)/(s*sqrt(2)) ))
|
||||
return 0.5 * (1 + math.erf((x - m) / (sigma * math.sqrt(2))))
|
||||
return 0.5 * (1 + math.erf((x - m) / (s * math.sqrt(2))))
|
||||
|
||||
min_possible_wu = apply_city_settlement(city_name, max_so_far) if max_so_far is not None else -999
|
||||
probs = {}
|
||||
|
||||
@@ -0,0 +1,268 @@
|
||||
from __future__ import annotations
|
||||
|
||||
import re
|
||||
import time
|
||||
from datetime import datetime, timedelta, timezone
|
||||
from typing import Dict, List, Optional
|
||||
|
||||
import requests
|
||||
from loguru import logger
|
||||
|
||||
|
||||
class MetarSourceMixin:
|
||||
def get_icao_code(self, city: str) -> Optional[str]:
|
||||
"""根据城市名获取对应的 ICAO 机场代码"""
|
||||
normalized = city.lower().strip()
|
||||
if normalized in self.CITY_TO_ICAO:
|
||||
return self.CITY_TO_ICAO[normalized]
|
||||
for key, icao in self.CITY_TO_ICAO.items():
|
||||
if key in normalized or normalized in key:
|
||||
return icao
|
||||
return None
|
||||
|
||||
def fetch_metar(
|
||||
self, city: str, use_fahrenheit: bool = False, utc_offset: int = 0
|
||||
) -> Optional[Dict]:
|
||||
"""从 NOAA Aviation Weather Center 获取 METAR 航空气象数据。"""
|
||||
icao = self.get_icao_code(city)
|
||||
if not icao:
|
||||
logger.warning(f"未找到城市 {city} 对应的 ICAO 代码")
|
||||
return None
|
||||
|
||||
cache_key = f"{icao}:{utc_offset}:{use_fahrenheit}"
|
||||
now_ts = time.time()
|
||||
with self._metar_cache_lock:
|
||||
cached = self._metar_cache.get(cache_key)
|
||||
if cached and now_ts - cached["t"] < self.metar_cache_ttl_sec:
|
||||
logger.debug(f"METAR cache hit {icao} age={int(now_ts - cached['t'])}s")
|
||||
return cached["d"]
|
||||
|
||||
try:
|
||||
url = "https://aviationweather.gov/api/data/metar"
|
||||
params = {
|
||||
"ids": icao,
|
||||
"format": "json",
|
||||
"hours": 24,
|
||||
"_t": int(time.time()),
|
||||
}
|
||||
response = self.session.get(url, params=params, timeout=self.timeout)
|
||||
response.raise_for_status()
|
||||
|
||||
data = response.json()
|
||||
if not data:
|
||||
return None
|
||||
|
||||
latest = data[0]
|
||||
temp_c = latest.get("temp")
|
||||
dewp_c = latest.get("dewp")
|
||||
|
||||
def _parse_rawob_time(obs):
|
||||
raw = obs.get("rawOb", "")
|
||||
match = re.search(r"(\d{2})(\d{2})(\d{2})Z", raw)
|
||||
if match:
|
||||
_day, hour, minute = (
|
||||
int(match.group(1)),
|
||||
int(match.group(2)),
|
||||
int(match.group(3)),
|
||||
)
|
||||
fallback = obs.get("reportTime", "")
|
||||
try:
|
||||
clean = fallback.replace(" ", "T")
|
||||
if not clean.endswith("Z"):
|
||||
clean += "Z"
|
||||
base_dt = datetime.fromisoformat(clean.replace("Z", "+00:00"))
|
||||
result = base_dt.replace(hour=hour, minute=minute, second=0)
|
||||
if result > base_dt + timedelta(hours=2):
|
||||
result -= timedelta(days=1)
|
||||
return result
|
||||
except Exception:
|
||||
pass
|
||||
fallback = obs.get("reportTime", "")
|
||||
try:
|
||||
clean = fallback.replace(" ", "T")
|
||||
if not clean.endswith("Z"):
|
||||
clean += "Z"
|
||||
return datetime.fromisoformat(clean.replace("Z", "+00:00"))
|
||||
except Exception:
|
||||
return None
|
||||
|
||||
obs_dt = _parse_rawob_time(latest)
|
||||
obs_time = (
|
||||
obs_dt.strftime("%Y-%m-%dT%H:%M:%S.000Z")
|
||||
if obs_dt
|
||||
else latest.get("reportTime", "")
|
||||
)
|
||||
|
||||
now_utc = datetime.now(timezone.utc)
|
||||
local_now = now_utc + timedelta(seconds=utc_offset)
|
||||
local_midnight = local_now.replace(hour=0, minute=0, second=0, microsecond=0)
|
||||
utc_midnight = local_midnight - timedelta(seconds=utc_offset)
|
||||
|
||||
max_so_far_c = -999
|
||||
max_temp_time = None
|
||||
for obs in data:
|
||||
obs_dt_iter = _parse_rawob_time(obs)
|
||||
if obs_dt_iter is None:
|
||||
continue
|
||||
try:
|
||||
if obs_dt_iter >= utc_midnight:
|
||||
temp_value = obs.get("temp")
|
||||
if temp_value is not None and temp_value > max_so_far_c:
|
||||
max_so_far_c = temp_value
|
||||
local_report = obs_dt_iter + timedelta(seconds=utc_offset)
|
||||
max_temp_time = local_report.strftime("%H:%M")
|
||||
except Exception:
|
||||
continue
|
||||
|
||||
recent_temps_raw = []
|
||||
recent_obs_raw = []
|
||||
today_obs_raw = []
|
||||
cloud_rank_map = {
|
||||
"CLR": 0,
|
||||
"SKC": 0,
|
||||
"FEW": 1,
|
||||
"SCT": 2,
|
||||
"BKN": 3,
|
||||
"OVC": 4,
|
||||
}
|
||||
for index, obs in enumerate(data):
|
||||
obs_temp = obs.get("temp")
|
||||
obs_dt_iter = _parse_rawob_time(obs)
|
||||
if obs_temp is not None and obs_dt_iter:
|
||||
local_rt = obs_dt_iter + timedelta(seconds=utc_offset)
|
||||
time_str = local_rt.strftime("%H:%M")
|
||||
if obs_dt_iter >= utc_midnight:
|
||||
today_obs_raw.append((time_str, obs_temp))
|
||||
if index < 4:
|
||||
recent_temps_raw.append((time_str, obs_temp))
|
||||
clouds = obs.get("clouds", [])
|
||||
max_cloud_rank = 0
|
||||
for cloud in clouds:
|
||||
rank = cloud_rank_map.get(cloud.get("cover", ""), 0)
|
||||
if rank > max_cloud_rank:
|
||||
max_cloud_rank = rank
|
||||
recent_obs_raw.append(
|
||||
{
|
||||
"time": time_str,
|
||||
"temp": obs_temp,
|
||||
"wdir": obs.get("wdir"),
|
||||
"wspd": obs.get("wspd"),
|
||||
"cloud_rank": max_cloud_rank,
|
||||
"altim": obs.get("altim"),
|
||||
}
|
||||
)
|
||||
|
||||
if use_fahrenheit:
|
||||
temp = temp_c * 9 / 5 + 32 if temp_c is not None else None
|
||||
max_so_far = max_so_far_c * 9 / 5 + 32 if max_so_far_c > -900 else None
|
||||
dewp = dewp_c * 9 / 5 + 32 if dewp_c is not None else None
|
||||
unit = "fahrenheit"
|
||||
recent_temps = [(t, round(v * 9 / 5 + 32, 1)) for t, v in recent_temps_raw]
|
||||
today_obs = [(t, round(v * 9 / 5 + 32, 1)) for t, v in today_obs_raw]
|
||||
else:
|
||||
temp = temp_c
|
||||
max_so_far = max_so_far_c if max_so_far_c > -900 else None
|
||||
dewp = dewp_c
|
||||
unit = "celsius"
|
||||
recent_temps = [(t, v) for t, v in recent_temps_raw]
|
||||
today_obs = [(t, v) for t, v in today_obs_raw]
|
||||
|
||||
result = {
|
||||
"source": "metar",
|
||||
"icao": icao,
|
||||
"station_name": latest.get("name", icao),
|
||||
"timestamp": datetime.utcnow().isoformat(),
|
||||
"observation_time": obs_time,
|
||||
"report_time": latest.get("reportTime"),
|
||||
"receipt_time": latest.get("receiptTime"),
|
||||
"obs_time_epoch": latest.get("obsTime"),
|
||||
"current": {
|
||||
"temp": round(temp, 1) if temp is not None else None,
|
||||
"max_temp_so_far": round(max_so_far, 1) if max_so_far is not None else None,
|
||||
"max_temp_time": max_temp_time,
|
||||
"dewpoint": round(dewp, 1) if dewp is not None else None,
|
||||
"humidity": latest.get("rh"),
|
||||
"wind_speed_kt": latest.get("wspd"),
|
||||
"wind_dir": latest.get("wdir"),
|
||||
"visibility_mi": latest.get("visib"),
|
||||
"wx_desc": latest.get("wxString"),
|
||||
"altimeter": latest.get("altim"),
|
||||
"raw_metar": latest.get("rawOb"),
|
||||
"clouds": latest.get("clouds", []),
|
||||
},
|
||||
"recent_temps": recent_temps,
|
||||
"today_obs": today_obs,
|
||||
"recent_obs": recent_obs_raw,
|
||||
"unit": unit,
|
||||
}
|
||||
|
||||
logger.info(
|
||||
f"✈️ METAR {icao}: {temp:.1f}°{'F' if use_fahrenheit else 'C'} (obs: {obs_time})"
|
||||
)
|
||||
with self._metar_cache_lock:
|
||||
self._metar_cache[cache_key] = {"d": result, "t": now_ts}
|
||||
return result
|
||||
|
||||
except requests.exceptions.RequestException as exc:
|
||||
logger.error(f"METAR 请求失败 ({icao}): {exc}")
|
||||
with self._metar_cache_lock:
|
||||
stale = self._metar_cache.get(cache_key)
|
||||
if stale:
|
||||
logger.warning(f"METAR {icao} 请求失败,使用缓存回退")
|
||||
return stale["d"]
|
||||
return None
|
||||
except (KeyError, IndexError, TypeError) as exc:
|
||||
logger.error(f"METAR 数据解析失败 ({icao}): {exc}")
|
||||
return None
|
||||
|
||||
def fetch_metar_nearby_cluster(self, icaos: List[str], use_fahrenheit: bool = False) -> list:
|
||||
"""批量获取一组 ICAO 站点的 METAR 数据,用于地图周边显示。"""
|
||||
if not icaos:
|
||||
return []
|
||||
|
||||
results = []
|
||||
try:
|
||||
ids_str = ",".join(icaos)
|
||||
url = f"https://aviationweather.gov/api/data/metar?ids={ids_str}&format=json"
|
||||
headers = {
|
||||
"User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36",
|
||||
}
|
||||
resp = self.session.get(url, headers=headers, timeout=self.timeout)
|
||||
if resp.status_code != 200:
|
||||
logger.warning(f"METAR cluster fetch HTTP {resp.status_code} for {icaos}")
|
||||
return []
|
||||
|
||||
data = resp.json()
|
||||
if not isinstance(data, list):
|
||||
return []
|
||||
|
||||
for obs in data:
|
||||
icao = obs.get("icaoId")
|
||||
lat = obs.get("lat")
|
||||
lon = obs.get("lon")
|
||||
temp_c = obs.get("temp")
|
||||
if icao and lat and lon and temp_c is not None:
|
||||
display_temp = (temp_c * 9 / 5) + 32 if use_fahrenheit else temp_c
|
||||
name = obs.get("name") or icao
|
||||
name = name.split(" Airport")[0].split(" Intl")[0].split(" International")[0].split(" Arpt")[0].split(",")[0].strip()
|
||||
results.append(
|
||||
{
|
||||
"name": name,
|
||||
"lat": lat,
|
||||
"lon": lon,
|
||||
"temp": round(display_temp, 1),
|
||||
"istNo": icao,
|
||||
"icao": icao,
|
||||
"wind_dir": obs.get("wdir"),
|
||||
"wind_speed": obs.get("wspd"),
|
||||
"wind_speed_kt": obs.get("wspd"),
|
||||
"raw_metar": obs.get("rawOb"),
|
||||
}
|
||||
)
|
||||
|
||||
if results:
|
||||
logger.info(f"📍 METAR 集群: 成功抓取 {len(results)} 个参考站数据")
|
||||
return results
|
||||
except Exception as exc:
|
||||
logger.error(f"Failed to fetch METAR cluster {icaos}: {exc}")
|
||||
return []
|
||||
@@ -0,0 +1,318 @@
|
||||
from __future__ import annotations
|
||||
|
||||
from datetime import datetime, timedelta
|
||||
from typing import Dict, Optional
|
||||
|
||||
from loguru import logger
|
||||
|
||||
|
||||
class MgmSourceMixin:
|
||||
def fetch_from_mgm(self, istno: str) -> Optional[Dict]:
|
||||
"""
|
||||
从土耳其气象局 (MGM) 获取实时数据和预测 (由用户提供其内部 API)
|
||||
"""
|
||||
base_url = "https://servis.mgm.gov.tr/web"
|
||||
# 必须带 Origin,否则会被反爬拦截
|
||||
headers = {
|
||||
"Origin": "https://www.mgm.gov.tr",
|
||||
"User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36",
|
||||
}
|
||||
results = {}
|
||||
|
||||
try:
|
||||
# 1. 实时数据 (添加时间戳防止 CDN 缓存)
|
||||
import time
|
||||
|
||||
obs_resp = self.session.get(
|
||||
f"{base_url}/sondurumlar?istno={istno}&_={int(time.time() * 1000)}",
|
||||
headers=headers,
|
||||
timeout=self.timeout,
|
||||
)
|
||||
if obs_resp.status_code == 200:
|
||||
data = obs_resp.json()
|
||||
if data:
|
||||
latest = data[0] if isinstance(data, list) else data
|
||||
# MGM 数据字段映射
|
||||
# ruzgarHiz 实测为 km/h,转为 m/s 需要除以 3.6
|
||||
ruz_hiz_kmh = latest.get("ruzgarHiz", 0)
|
||||
|
||||
# MGM 返回 -9999 表示数据缺失,需要过滤
|
||||
def _valid(v):
|
||||
return v is not None and v > -9000
|
||||
|
||||
results["current"] = {
|
||||
"temp": latest.get("sicaklik")
|
||||
if _valid(latest.get("sicaklik"))
|
||||
else None,
|
||||
"feels_like": latest.get("hissedilenSicaklik")
|
||||
if _valid(latest.get("hissedilenSicaklik"))
|
||||
else None,
|
||||
"humidity": latest.get("nem")
|
||||
if _valid(latest.get("nem"))
|
||||
else None,
|
||||
"wind_speed_ms": round(ruz_hiz_kmh / 3.6, 1)
|
||||
if _valid(ruz_hiz_kmh)
|
||||
else None,
|
||||
"wind_speed_kt": round(ruz_hiz_kmh / 1.852, 1)
|
||||
if _valid(ruz_hiz_kmh)
|
||||
else None,
|
||||
"wind_dir": latest.get("ruzgarYon")
|
||||
if _valid(latest.get("ruzgarYon"))
|
||||
else None,
|
||||
"rain_24h": latest.get("toplamYagis")
|
||||
if _valid(latest.get("toplamYagis"))
|
||||
else None,
|
||||
"pressure": latest.get("aktuelBasinc")
|
||||
if _valid(latest.get("aktuelBasinc"))
|
||||
else None,
|
||||
"cloud_cover": latest.get("kapalilik"), # 0-8 八分位云量
|
||||
"mgm_max_temp": latest.get("maxSicaklik")
|
||||
if _valid(latest.get("maxSicaklik"))
|
||||
else None,
|
||||
"time": latest.get("veriZamani"),
|
||||
"station_name": latest.get("istasyonAd")
|
||||
or latest.get("adi")
|
||||
or latest.get("merkezAd")
|
||||
or "Ankara Bölge",
|
||||
}
|
||||
|
||||
# 2. 每日预报(尝试两个可能的 API 路径)
|
||||
forecast_urls = [
|
||||
f"{base_url}/tahminler/gunluk?istno={istno}",
|
||||
f"https://servis.mgm.gov.tr/api/tahminler/gunluk?istno={istno}",
|
||||
]
|
||||
for forecast_url in forecast_urls:
|
||||
try:
|
||||
daily_resp = self.session.get(
|
||||
forecast_url, headers=headers, timeout=self.timeout
|
||||
)
|
||||
if daily_resp.status_code == 200:
|
||||
forecasts = daily_resp.json()
|
||||
if forecasts and isinstance(forecasts, list):
|
||||
# Store today extra clearly
|
||||
today = forecasts[0]
|
||||
high_val = today.get("enYuksekGun1")
|
||||
low_val = today.get("enDusukGun1")
|
||||
if high_val is not None:
|
||||
results["today_high"] = high_val
|
||||
results["today_low"] = low_val
|
||||
logger.info(f"📋 MGM 每日预报: 今天的最高温 {high_val}°C")
|
||||
|
||||
# Store all 5 days for multi_model_daily
|
||||
results["daily_forecasts"] = {}
|
||||
for i, day in enumerate(forecasts[:5]):
|
||||
d_high = day.get("enYuksekGun1")
|
||||
if d_high is not None:
|
||||
# Calculate date (today + offset)
|
||||
target_date = (datetime.now() + timedelta(days=i)).strftime("%Y-%m-%d")
|
||||
results["daily_forecasts"][target_date] = d_high
|
||||
break
|
||||
else:
|
||||
logger.debug(
|
||||
f"MGM forecast URL {forecast_url} returned {daily_resp.status_code}"
|
||||
)
|
||||
except Exception as e:
|
||||
logger.debug(f"MGM forecast URL {forecast_url} failed: {e}")
|
||||
|
||||
# 3. 小时预报
|
||||
try:
|
||||
hourly_resp = self.session.get(
|
||||
f"{base_url}/tahminler/saatlik?istno={istno}",
|
||||
headers=headers,
|
||||
timeout=self.timeout
|
||||
)
|
||||
if hourly_resp.status_code == 200:
|
||||
h_data = hourly_resp.json()
|
||||
if h_data and isinstance(h_data, list):
|
||||
tahmin_list = h_data[0].get("tahmin", [])
|
||||
results["hourly"] = []
|
||||
for t_data in tahmin_list:
|
||||
if "tarih" in t_data and "sicaklik" in t_data:
|
||||
results["hourly"].append({
|
||||
"time": t_data["tarih"],
|
||||
"temp": t_data["sicaklik"]
|
||||
})
|
||||
except Exception as e:
|
||||
logger.debug(f"MGM hourly failed: {e}")
|
||||
|
||||
# 4. Fallback for today_high (if daily forecast is missing it)
|
||||
if "today_high" not in results:
|
||||
# Try from current max
|
||||
cur_max = results.get("current", {}).get("mgm_max_temp")
|
||||
if cur_max is not None:
|
||||
results["today_high"] = cur_max
|
||||
logger.info(f"📋 MGM 每日预报: 使用当前测站最高温作为今日预报回退: {cur_max}°C")
|
||||
elif "hourly" in results and results["hourly"]:
|
||||
# Try from hourly
|
||||
h_max = max((h["temp"] for h in results["hourly"] if h["temp"] is not None), default=None)
|
||||
if h_max is not None:
|
||||
results["today_high"] = h_max
|
||||
logger.info(f"📋 MGM 每日预报: 使用小时预报最高温作为今日预报回退: {h_max}°C")
|
||||
|
||||
# 5. Fallback for daily_forecasts from hourly data
|
||||
if not results.get("daily_forecasts") and results.get("hourly"):
|
||||
# Guardrail: avoid treating short intraday snippets as full-day highs.
|
||||
hourly_rows = results.get("hourly") or []
|
||||
parsed_times = []
|
||||
for h in hourly_rows:
|
||||
t = str(h.get("time") or "")
|
||||
if "T" not in t:
|
||||
continue
|
||||
try:
|
||||
parsed_times.append(datetime.fromisoformat(t.replace("Z", "+00:00")))
|
||||
except Exception:
|
||||
continue
|
||||
|
||||
horizon_hours = 0.0
|
||||
if len(parsed_times) >= 2:
|
||||
parsed_times.sort()
|
||||
horizon_hours = (
|
||||
parsed_times[-1] - parsed_times[0]
|
||||
).total_seconds() / 3600.0
|
||||
|
||||
if len(hourly_rows) >= 24 or horizon_hours >= 30:
|
||||
from collections import defaultdict
|
||||
|
||||
daily_max = defaultdict(list)
|
||||
for h in hourly_rows:
|
||||
t = h.get("time", "")
|
||||
temp = h.get("temp")
|
||||
if t and temp is not None:
|
||||
# Extract date from ISO timestamp like "2026-03-05T12:00:00.000Z"
|
||||
date_str = t[:10]
|
||||
daily_max[date_str].append(temp)
|
||||
if daily_max:
|
||||
results["daily_forecasts"] = {}
|
||||
for d, temps in sorted(daily_max.items()):
|
||||
results["daily_forecasts"][d] = max(temps)
|
||||
logger.info(
|
||||
f"📋 MGM daily_forecasts (from hourly fallback): "
|
||||
f"{dict(results['daily_forecasts'])}"
|
||||
)
|
||||
else:
|
||||
logger.info(
|
||||
"📋 Skip MGM daily_forecasts hourly fallback: "
|
||||
f"hourly points={len(hourly_rows)}, horizon={horizon_hours:.1f}h"
|
||||
)
|
||||
|
||||
return results if "current" in results else None
|
||||
except Exception as e:
|
||||
logger.error(f"MGM API 请求失败 ({istno}): {e}")
|
||||
return None
|
||||
|
||||
def fetch_mgm_nearby_stations(self, province: str, root_ist_no: str = None) -> list:
|
||||
"""
|
||||
获取一个土耳其省份内所有气象站的当前温度及经纬度
|
||||
使用多线程辅助抓取,因为直接通过 il={province} 往往只返回 1 个站。
|
||||
"""
|
||||
base_url = "https://servis.mgm.gov.tr/web"
|
||||
headers = {
|
||||
"Origin": "https://www.mgm.gov.tr",
|
||||
"User-Agent": "Mozilla/5.0",
|
||||
}
|
||||
import time
|
||||
from concurrent.futures import ThreadPoolExecutor
|
||||
|
||||
results = []
|
||||
try:
|
||||
# 1. 加载测站元数据 (缓存到实例中),用于过滤属于该省份的站点
|
||||
if not getattr(self, "mgm_stations_meta", None):
|
||||
meta_resp = self.session.get(f"{base_url}/istasyonlar", headers=headers, timeout=self.timeout)
|
||||
if meta_resp.status_code == 200:
|
||||
meta_json = meta_resp.json()
|
||||
if isinstance(meta_json, list):
|
||||
self.mgm_stations_meta = {s["istNo"]: s for s in meta_json if "istNo" in s}
|
||||
else:
|
||||
self.mgm_stations_meta = {}
|
||||
|
||||
metadata = getattr(self, "mgm_stations_meta", {})
|
||||
|
||||
# 2. 找出属于该省份的所有站点 istNo
|
||||
province_upper = province.upper()
|
||||
province_ist_nos = [
|
||||
ist_no for ist_no, s in metadata.items()
|
||||
if (s.get("il") or "").upper() == province_upper
|
||||
]
|
||||
|
||||
if not province_ist_nos:
|
||||
logger.warning(f"MGM 找不到省份 {province} 的站点元数据")
|
||||
return []
|
||||
|
||||
# 同时确保我们关心的几个核心站一定在里面
|
||||
target_ist_nos = [str(i) for i in province_ist_nos[:25]]
|
||||
# 17130: 安卡拉总站 (市区核心)
|
||||
if 17130 in province_ist_nos or "17130" in province_ist_nos:
|
||||
if "17130" not in target_ist_nos:
|
||||
target_ist_nos.append("17130")
|
||||
# 17128: 机场官方站
|
||||
if 17128 in province_ist_nos or "17128" in province_ist_nos:
|
||||
if "17128" not in target_ist_nos:
|
||||
target_ist_nos.append("17128")
|
||||
if root_ist_no:
|
||||
rs = str(root_ist_no)
|
||||
if rs not in target_ist_nos:
|
||||
target_ist_nos.append(rs)
|
||||
|
||||
# 3. 多线程获取每个站点的最新观测 (sondurumlar)
|
||||
def fetch_single_station(ist_no):
|
||||
try:
|
||||
# sondurumlar?istno={ist_no} 是目前最稳的获取多站数据的办法
|
||||
url = f"{base_url}/sondurumlar?istno={ist_no}&_={int(time.time() * 1000)}"
|
||||
resp = self.session.get(url, headers=headers, timeout=5)
|
||||
if resp.status_code == 200:
|
||||
obs_list = resp.json()
|
||||
if obs_list:
|
||||
obs = obs_list[0] if isinstance(obs_list, list) else obs_list
|
||||
temp = obs.get("sicaklik")
|
||||
wind_speed = obs.get("ruzgarHiz")
|
||||
wind_dir = obs.get("ruzgarYon")
|
||||
if temp is not None and temp > -9000:
|
||||
return ist_no, {"temp": temp, "wind_speed": wind_speed, "wind_dir": wind_dir}
|
||||
except Exception:
|
||||
pass
|
||||
return None, None
|
||||
|
||||
# 并发抓取
|
||||
station_temps = {}
|
||||
with ThreadPoolExecutor(max_workers=10) as executor:
|
||||
fetch_results = list(executor.map(fetch_single_station, target_ist_nos))
|
||||
for ist_no, data in fetch_results:
|
||||
if ist_no is not None:
|
||||
station_temps[ist_no] = data
|
||||
|
||||
# 4. 组装最终结果
|
||||
for ist_no, temp in station_temps.items():
|
||||
sid = str(ist_no)
|
||||
# metadata 可能使用 int 或 str 作为 key
|
||||
meta = metadata.get(sid) or metadata.get(int(sid))
|
||||
if not meta:
|
||||
continue
|
||||
|
||||
lat = meta.get("enlem")
|
||||
lon = meta.get("boylam")
|
||||
# 优先显示区县名,地图更清晰
|
||||
display_name = (meta.get("ilce") or meta.get("istAd") or f"Station {ist_no}").title()
|
||||
|
||||
# 特殊处理核心站点的显示名称
|
||||
sid = str(ist_no)
|
||||
if sid == "17130":
|
||||
display_name = "Ankara (Bölge/Center)"
|
||||
elif sid == "17128":
|
||||
display_name = "Airport (MGM/17128)"
|
||||
|
||||
results.append({
|
||||
"name": display_name,
|
||||
"lat": lat,
|
||||
"lon": lon,
|
||||
"temp": temp.get("temp") if isinstance(temp, dict) else temp,
|
||||
"wind_speed": temp.get("wind_speed") if isinstance(temp, dict) else None,
|
||||
"wind_dir": temp.get("wind_dir") if isinstance(temp, dict) else None,
|
||||
"istNo": ist_no
|
||||
})
|
||||
|
||||
logger.info(f"📍 MGM 周边测站: 成功并发抓取 {len(results)} 个 {province} 站点的实时气温")
|
||||
return results
|
||||
except Exception as e:
|
||||
logger.error(f"Failed to fetch MGM nearby stations for {province}: {e}")
|
||||
return []
|
||||
|
||||
@@ -0,0 +1,578 @@
|
||||
from __future__ import annotations
|
||||
|
||||
import time
|
||||
from datetime import datetime, timedelta
|
||||
from typing import Dict, Optional
|
||||
|
||||
from loguru import logger
|
||||
|
||||
|
||||
class NwsOpenMeteoSourceMixin:
|
||||
def fetch_nws(self, lat: float, lon: float) -> Optional[Dict]:
|
||||
"""
|
||||
从 NWS (美国国家气象局) 获取高精度预报
|
||||
仅适用于美国城市,全球 VPS 均可访问
|
||||
"""
|
||||
try:
|
||||
# 1. 获取网格点
|
||||
points_url = f"https://api.weather.gov/points/{lat},{lon}"
|
||||
headers = {"User-Agent": "PolyWeather/1.0 (weather-bot)"}
|
||||
|
||||
points_resp = self.session.get(
|
||||
points_url, headers=headers, timeout=self.timeout
|
||||
)
|
||||
points_resp.raise_for_status()
|
||||
points_data = points_resp.json()
|
||||
|
||||
properties = points_data.get("properties", {})
|
||||
forecast_url = properties.get("forecast")
|
||||
hourly_url = properties.get("forecastHourly")
|
||||
if not forecast_url:
|
||||
return None
|
||||
|
||||
# 2. 获取预报
|
||||
forecast_resp = self.session.get(
|
||||
forecast_url, headers=headers, timeout=self.timeout
|
||||
)
|
||||
forecast_resp.raise_for_status()
|
||||
forecast_data = forecast_resp.json()
|
||||
|
||||
periods = forecast_data.get("properties", {}).get("periods", [])
|
||||
if not periods:
|
||||
return None
|
||||
|
||||
hourly_periods = []
|
||||
if hourly_url:
|
||||
hourly_resp = self.session.get(
|
||||
hourly_url, headers=headers, timeout=self.timeout
|
||||
)
|
||||
hourly_resp.raise_for_status()
|
||||
hourly_data = hourly_resp.json()
|
||||
hourly_periods = hourly_data.get("properties", {}).get("periods", [])[:48]
|
||||
|
||||
active_alerts = []
|
||||
try:
|
||||
alerts_resp = self.session.get(
|
||||
"https://api.weather.gov/alerts/active",
|
||||
params={"point": f"{lat},{lon}"},
|
||||
headers=headers,
|
||||
timeout=self.timeout,
|
||||
)
|
||||
alerts_resp.raise_for_status()
|
||||
alerts_data = alerts_resp.json()
|
||||
for feature in alerts_data.get("features", [])[:8]:
|
||||
ap = feature.get("properties", {})
|
||||
active_alerts.append(
|
||||
{
|
||||
"event": ap.get("event"),
|
||||
"headline": ap.get("headline"),
|
||||
"severity": ap.get("severity"),
|
||||
"certainty": ap.get("certainty"),
|
||||
"urgency": ap.get("urgency"),
|
||||
"effective": ap.get("effective"),
|
||||
"ends": ap.get("ends"),
|
||||
}
|
||||
)
|
||||
except Exception:
|
||||
active_alerts = []
|
||||
|
||||
# 3. 提取今日最高温(找 isDaytime=True 的第一个)
|
||||
today_high = None
|
||||
for p in periods:
|
||||
if p.get("isDaytime") and "High" in p.get("name", ""):
|
||||
today_high = p.get("temperature")
|
||||
break
|
||||
# 如果没有明确的 High,取第一个 daytime 的温度
|
||||
if today_high is None:
|
||||
for p in periods:
|
||||
if p.get("isDaytime"):
|
||||
today_high = p.get("temperature")
|
||||
break
|
||||
|
||||
return {
|
||||
"source": "nws",
|
||||
"today_high": today_high,
|
||||
"unit": "fahrenheit",
|
||||
"forecast_periods": [
|
||||
{
|
||||
"name": p.get("name"),
|
||||
"start_time": p.get("startTime"),
|
||||
"end_time": p.get("endTime"),
|
||||
"is_daytime": p.get("isDaytime"),
|
||||
"temperature": p.get("temperature"),
|
||||
"temperature_trend": p.get("temperatureTrend"),
|
||||
"wind_speed": p.get("windSpeed"),
|
||||
"wind_direction": p.get("windDirection"),
|
||||
"short_forecast": p.get("shortForecast"),
|
||||
"detailed_forecast": p.get("detailedForecast"),
|
||||
"precipitation_probability": (p.get("probabilityOfPrecipitation") or {}).get("value"),
|
||||
}
|
||||
for p in periods[:14]
|
||||
],
|
||||
"hourly_periods": [
|
||||
{
|
||||
"start_time": p.get("startTime"),
|
||||
"end_time": p.get("endTime"),
|
||||
"temperature": p.get("temperature"),
|
||||
"temperature_unit": p.get("temperatureUnit"),
|
||||
"wind_speed": p.get("windSpeed"),
|
||||
"wind_direction": p.get("windDirection"),
|
||||
"short_forecast": p.get("shortForecast"),
|
||||
"precipitation_probability": (p.get("probabilityOfPrecipitation") or {}).get("value"),
|
||||
}
|
||||
for p in hourly_periods
|
||||
],
|
||||
"active_alerts": active_alerts,
|
||||
}
|
||||
except Exception as e:
|
||||
logger.warning(f"NWS 请求失败: {e}")
|
||||
return None
|
||||
|
||||
def fetch_from_open_meteo(
|
||||
self,
|
||||
lat: float,
|
||||
lon: float,
|
||||
forecast_days: int = 14,
|
||||
use_fahrenheit: bool = False,
|
||||
) -> Optional[Dict]:
|
||||
"""
|
||||
Fetch weather from Open-Meteo with forecast data
|
||||
|
||||
Args:
|
||||
lat: Latitude
|
||||
lon: Longitude
|
||||
forecast_days: Number of forecast days to fetch (default 14 to cover all market dates)
|
||||
use_fahrenheit: Whether to return temperatures in Fahrenheit (for US markets)
|
||||
"""
|
||||
cache_key = (
|
||||
f"{round(float(lat), 4)}:{round(float(lon), 4)}:"
|
||||
f"{forecast_days}:{'f' if use_fahrenheit else 'c'}"
|
||||
)
|
||||
self._maybe_reload_open_meteo_disk_cache()
|
||||
now_ts = time.time()
|
||||
# ── 429 冷却期检查(所有 Open-Meteo 端点共享)─────────────────
|
||||
with self._open_meteo_rl_lock:
|
||||
if now_ts < self._open_meteo_rate_limit_until:
|
||||
remaining = int(self._open_meteo_rate_limit_until - now_ts)
|
||||
logger.debug(f"Open-Meteo 冷却期中,跳过请求,还需 {remaining}s")
|
||||
with self._open_meteo_cache_lock:
|
||||
stale = self._open_meteo_cache.get(cache_key)
|
||||
if stale and isinstance(stale.get("data"), dict):
|
||||
return dict(stale["data"])
|
||||
return None
|
||||
with self._open_meteo_cache_lock:
|
||||
cached = self._open_meteo_cache.get(cache_key)
|
||||
if (
|
||||
cached
|
||||
and now_ts - float(cached.get("t", 0)) < self.open_meteo_cache_ttl_sec
|
||||
):
|
||||
cached_data = cached.get("data")
|
||||
if isinstance(cached_data, dict):
|
||||
return dict(cached_data)
|
||||
try:
|
||||
url = "https://api.open-meteo.com/v1/forecast"
|
||||
params = {
|
||||
"latitude": lat,
|
||||
"longitude": lon,
|
||||
"current_weather": "true",
|
||||
"hourly": "temperature_2m,shortwave_radiation,dew_point_2m,pressure_msl,wind_speed_10m,wind_direction_10m,precipitation_probability,cloud_cover",
|
||||
"daily": "temperature_2m_max,apparent_temperature_max,sunrise,sunset,sunshine_duration",
|
||||
"timezone": "auto",
|
||||
"forecast_days": forecast_days,
|
||||
}
|
||||
|
||||
# 显式指定单位,防止 API 默认行为漂移
|
||||
if use_fahrenheit:
|
||||
params["temperature_unit"] = "fahrenheit"
|
||||
else:
|
||||
params["temperature_unit"] = "celsius"
|
||||
|
||||
self._wait_open_meteo_slot("forecast")
|
||||
response = self.session.get(
|
||||
url,
|
||||
params=params,
|
||||
timeout=self.timeout,
|
||||
)
|
||||
response.raise_for_status()
|
||||
data = response.json()
|
||||
|
||||
current = data.get("current_weather", {})
|
||||
utc_offset = data.get("utc_offset_seconds", 0)
|
||||
timezone_name = data.get("timezone", "UTC")
|
||||
|
||||
# 处理多模型数据 (如果请求了 models 参数,返回结构会变化)
|
||||
daily_data = data.get("daily", {})
|
||||
if "temperature_2m_max_ecmwf_ifs04" in daily_data:
|
||||
ecmwf_max = daily_data.get("temperature_2m_max_ecmwf_ifs04", [])
|
||||
hrrr_max = daily_data.get("temperature_2m_max_ncep_hrrr_conus", [])
|
||||
|
||||
# 记录今日模型分歧
|
||||
daily_data["model_split"] = {
|
||||
"ecmwf": ecmwf_max[0] if ecmwf_max else None,
|
||||
"hrrr": hrrr_max[0] if hrrr_max else None,
|
||||
}
|
||||
|
||||
# 智能合并:HRRR 仅覆盖 48 小时,远期用 ECMWF 补全
|
||||
merged_max = []
|
||||
for i in range(len(ecmwf_max)):
|
||||
hrrr_val = hrrr_max[i] if i < len(hrrr_max) else None
|
||||
ecmwf_val = ecmwf_max[i] if i < len(ecmwf_max) else None
|
||||
|
||||
# 优先 HRRR,其次 ECMWF,都没有就跳过
|
||||
if hrrr_val is not None:
|
||||
merged_max.append(hrrr_val)
|
||||
elif ecmwf_val is not None:
|
||||
merged_max.append(ecmwf_val)
|
||||
else:
|
||||
# 两个都没有,用占位符 (理论上不应该发生)
|
||||
merged_max.append(ecmwf_val) # None
|
||||
daily_data["temperature_2m_max"] = merged_max
|
||||
|
||||
# 映射逐小时数据
|
||||
hourly_data = data.get("hourly", {})
|
||||
if "temperature_2m_ncep_hrrr_conus" in hourly_data:
|
||||
hourly_data["temperature_2m"] = hourly_data[
|
||||
"temperature_2m_ncep_hrrr_conus"
|
||||
]
|
||||
|
||||
# 计算精确的当地时间
|
||||
now_utc = datetime.utcnow()
|
||||
local_now = now_utc + timedelta(seconds=utc_offset)
|
||||
local_time_str = local_now.strftime("%Y-%m-%d %H:%M")
|
||||
|
||||
result = {
|
||||
"source": "open-meteo",
|
||||
"timestamp": now_utc.isoformat(),
|
||||
"timezone": timezone_name,
|
||||
"utc_offset": utc_offset,
|
||||
"current": {
|
||||
"temp": current.get("temperature"),
|
||||
"local_time": local_time_str,
|
||||
},
|
||||
"hourly": hourly_data,
|
||||
"daily": daily_data,
|
||||
"unit": "fahrenheit" if use_fahrenheit else "celsius",
|
||||
}
|
||||
with self._open_meteo_cache_lock:
|
||||
self._open_meteo_cache[cache_key] = {
|
||||
"t": time.time(),
|
||||
"data": dict(result),
|
||||
}
|
||||
self._flush_open_meteo_disk_cache()
|
||||
return result
|
||||
except Exception as e:
|
||||
status_code = getattr(getattr(e, "response", None), "status_code", None)
|
||||
if status_code == 429:
|
||||
retry_after_str = getattr(e.response, "headers", {}).get("Retry-After")
|
||||
cooldown_to_use = self._open_meteo_rl_cooldown
|
||||
if retry_after_str:
|
||||
try:
|
||||
parsed = int(retry_after_str)
|
||||
if parsed > 0:
|
||||
cooldown_to_use = min(parsed + 60, 3600) # Add 60s buffer, max 1 hour
|
||||
logger.info(f"Open-Meteo 响应包含 Retry-After: {retry_after_str}s")
|
||||
except ValueError:
|
||||
pass
|
||||
logger.warning(
|
||||
f"Open-Meteo rate limited (429), fallback to cache if available: lat={lat}, lon={lon}"
|
||||
)
|
||||
# 设置全局冷却期,避免短时内重复触发 429
|
||||
with self._open_meteo_rl_lock:
|
||||
self._open_meteo_rate_limit_until = time.time() + cooldown_to_use
|
||||
logger.warning(f"Open-Meteo 触发限流,设置 {cooldown_to_use}s 冷却期")
|
||||
else:
|
||||
logger.error(f"Open-Meteo forecast failed: {e}")
|
||||
with self._open_meteo_cache_lock:
|
||||
stale = self._open_meteo_cache.get(cache_key)
|
||||
if stale and isinstance(stale.get("data"), dict):
|
||||
fallback = dict(stale["data"])
|
||||
fallback["stale_cache"] = True
|
||||
return fallback
|
||||
return None
|
||||
|
||||
def fetch_ensemble(
|
||||
self,
|
||||
lat: float,
|
||||
lon: float,
|
||||
use_fahrenheit: bool = False,
|
||||
) -> Optional[Dict]:
|
||||
"""
|
||||
从 Open-Meteo Ensemble API 获取 51 成员集合预报
|
||||
用于计算预报不确定性范围(散度)
|
||||
"""
|
||||
cache_key = (
|
||||
f"{round(float(lat), 4)}:{round(float(lon), 4)}:"
|
||||
f"{'f' if use_fahrenheit else 'c'}"
|
||||
)
|
||||
self._maybe_reload_open_meteo_disk_cache()
|
||||
now_ts = time.time()
|
||||
# ── 429 冷却期检查(所有 Open-Meteo 端点共享)─────────────────
|
||||
with self._open_meteo_rl_lock:
|
||||
if now_ts < self._open_meteo_rate_limit_until:
|
||||
remaining = int(self._open_meteo_rate_limit_until - now_ts)
|
||||
logger.debug(f"Open-Meteo Ensemble 冷却期中,跳过请求,还需 {remaining}s")
|
||||
with self._ensemble_cache_lock:
|
||||
stale = self._ensemble_cache.get(cache_key)
|
||||
if stale and isinstance(stale.get("data"), dict):
|
||||
return dict(stale["data"])
|
||||
return None
|
||||
|
||||
with self._ensemble_cache_lock:
|
||||
cached = self._ensemble_cache.get(cache_key)
|
||||
if (
|
||||
cached
|
||||
and now_ts - float(cached.get("t", 0))
|
||||
< self.open_meteo_ensemble_cache_ttl_sec
|
||||
):
|
||||
cached_data = cached.get("data")
|
||||
if isinstance(cached_data, dict):
|
||||
return dict(cached_data)
|
||||
try:
|
||||
url = "https://ensemble-api.open-meteo.com/v1/ensemble"
|
||||
params = {
|
||||
"latitude": lat,
|
||||
"longitude": lon,
|
||||
"daily": "temperature_2m_max",
|
||||
"timezone": "auto",
|
||||
"forecast_days": 3,
|
||||
}
|
||||
if use_fahrenheit:
|
||||
params["temperature_unit"] = "fahrenheit"
|
||||
else:
|
||||
params["temperature_unit"] = "celsius"
|
||||
|
||||
self._wait_open_meteo_slot("ensemble")
|
||||
response = self.session.get(
|
||||
url,
|
||||
params=params,
|
||||
timeout=self.timeout,
|
||||
)
|
||||
response.raise_for_status()
|
||||
data = response.json()
|
||||
|
||||
daily = data.get("daily", {})
|
||||
# 每个成员都会返回一组 temperature_2m_max
|
||||
# 格式: {"time": [...], "temperature_2m_max_member01": [...], ...}
|
||||
today_highs = []
|
||||
for key, values in daily.items():
|
||||
if key.startswith("temperature_2m_max") and key != "temperature_2m_max":
|
||||
if values and values[0] is not None:
|
||||
today_highs.append(values[0])
|
||||
|
||||
# 也检查非成员键(有些返回格式不同)
|
||||
if not today_highs:
|
||||
raw_max = daily.get("temperature_2m_max", [])
|
||||
if isinstance(raw_max, list) and raw_max:
|
||||
if isinstance(raw_max[0], list):
|
||||
# 嵌套列表格式: [[member1_day1, member1_day2], [member2_day1, ...]]
|
||||
today_highs = [m[0] for m in raw_max if m and m[0] is not None]
|
||||
elif raw_max[0] is not None:
|
||||
today_highs = [raw_max[0]]
|
||||
|
||||
if len(today_highs) < 3:
|
||||
logger.warning(f"Ensemble 数据不足: 仅获取 {len(today_highs)} 个成员")
|
||||
return None
|
||||
|
||||
today_highs.sort()
|
||||
n = len(today_highs)
|
||||
median = today_highs[n // 2]
|
||||
p10 = today_highs[max(0, int(n * 0.1))]
|
||||
p90 = today_highs[min(n - 1, int(n * 0.9))]
|
||||
|
||||
result = {
|
||||
"source": "ensemble",
|
||||
"members": n,
|
||||
"median": round(median, 1),
|
||||
"p10": round(p10, 1),
|
||||
"p90": round(p90, 1),
|
||||
"min": round(today_highs[0], 1),
|
||||
"max": round(today_highs[-1], 1),
|
||||
"unit": "fahrenheit" if use_fahrenheit else "celsius",
|
||||
}
|
||||
|
||||
logger.info(
|
||||
f"📊 Ensemble ({n} members): median={median:.1f}, "
|
||||
f"p10={p10:.1f}, p90={p90:.1f}"
|
||||
)
|
||||
with self._ensemble_cache_lock:
|
||||
self._ensemble_cache[cache_key] = {
|
||||
"t": time.time(),
|
||||
"data": dict(result),
|
||||
}
|
||||
self._flush_open_meteo_disk_cache()
|
||||
return result
|
||||
except Exception as e:
|
||||
status_code = getattr(getattr(e, "response", None), "status_code", None)
|
||||
if status_code == 429:
|
||||
retry_after_str = getattr(e.response, "headers", {}).get("Retry-After")
|
||||
cooldown_to_use = self._open_meteo_rl_cooldown
|
||||
if retry_after_str:
|
||||
try:
|
||||
parsed = int(retry_after_str)
|
||||
if parsed > 0:
|
||||
cooldown_to_use = min(parsed + 60, 3600)
|
||||
except ValueError:
|
||||
pass
|
||||
logger.warning(
|
||||
f"Ensemble API rate limited (429), fallback to cache if available: lat={lat}, lon={lon}"
|
||||
)
|
||||
with self._open_meteo_rl_lock:
|
||||
self._open_meteo_rate_limit_until = time.time() + cooldown_to_use
|
||||
else:
|
||||
logger.warning(f"Ensemble API 请求失败: {e}")
|
||||
with self._ensemble_cache_lock:
|
||||
stale = self._ensemble_cache.get(cache_key)
|
||||
if stale and isinstance(stale.get("data"), dict):
|
||||
fallback = dict(stale["data"])
|
||||
fallback["stale_cache"] = True
|
||||
return fallback
|
||||
return None
|
||||
|
||||
def fetch_multi_model(
|
||||
self,
|
||||
lat: float,
|
||||
lon: float,
|
||||
city: str = "",
|
||||
use_fahrenheit: bool = False,
|
||||
) -> Optional[Dict]:
|
||||
"""
|
||||
从 Open-Meteo 获取多个独立 NWP 模型的预报
|
||||
用于真正的多模型共识评分
|
||||
|
||||
模型列表:
|
||||
- ECMWF IFS (欧洲中期天气预报中心)
|
||||
- GFS (美国 NOAA)
|
||||
- ICON (德国气象局 DWD)
|
||||
- GEM (加拿大气象局)
|
||||
- JMA (日本气象厅)
|
||||
|
||||
返回 3 天的预报数据,支持今日+明日共识分析
|
||||
"""
|
||||
cache_city = str(city or "").strip().lower()
|
||||
cache_key = (
|
||||
f"{round(float(lat), 4)}:{round(float(lon), 4)}:{cache_city}:"
|
||||
f"{'f' if use_fahrenheit else 'c'}:{self.multi_model_cache_version}"
|
||||
)
|
||||
self._maybe_reload_open_meteo_disk_cache()
|
||||
now_ts = time.time()
|
||||
# ── 429 冷却期检查(所有 Open-Meteo 端点共享)─────────────────
|
||||
with self._open_meteo_rl_lock:
|
||||
if now_ts < self._open_meteo_rate_limit_until:
|
||||
remaining = int(self._open_meteo_rate_limit_until - now_ts)
|
||||
logger.debug(f"Open-Meteo Multi-model 冷却期中,跳过请求,还需 {remaining}s")
|
||||
with self._multi_model_cache_lock:
|
||||
stale = self._multi_model_cache.get(cache_key)
|
||||
if stale and isinstance(stale.get("data"), dict):
|
||||
return dict(stale["data"])
|
||||
return None
|
||||
|
||||
with self._multi_model_cache_lock:
|
||||
cached = self._multi_model_cache.get(cache_key)
|
||||
if (
|
||||
cached
|
||||
and now_ts - float(cached.get("t", 0))
|
||||
< self.open_meteo_multi_model_cache_ttl_sec
|
||||
):
|
||||
cached_data = cached.get("data")
|
||||
if isinstance(cached_data, dict):
|
||||
return dict(cached_data)
|
||||
try:
|
||||
url = "https://api.open-meteo.com/v1/forecast"
|
||||
models = "ecmwf_ifs025,gfs_seamless,icon_seamless,gem_seamless,jma_seamless"
|
||||
params = {
|
||||
"latitude": lat,
|
||||
"longitude": lon,
|
||||
"daily": "temperature_2m_max",
|
||||
"models": models,
|
||||
"timezone": "auto",
|
||||
"forecast_days": 3,
|
||||
}
|
||||
if use_fahrenheit:
|
||||
params["temperature_unit"] = "fahrenheit"
|
||||
|
||||
self._wait_open_meteo_slot("multi-model")
|
||||
response = self.session.get(
|
||||
url,
|
||||
params=params,
|
||||
timeout=self.timeout,
|
||||
)
|
||||
response.raise_for_status()
|
||||
data = response.json()
|
||||
|
||||
daily = data.get("daily", {})
|
||||
dates = daily.get("time", [])
|
||||
|
||||
model_labels = {
|
||||
"ecmwf_ifs025": "ECMWF",
|
||||
"gfs_seamless": "GFS",
|
||||
"icon_seamless": "ICON",
|
||||
"gem_seamless": "GEM",
|
||||
"jma_seamless": "JMA",
|
||||
}
|
||||
|
||||
# 按天提取每个模型的预报
|
||||
daily_forecasts = {} # {"2026-02-23": {"ECMWF": 7.9, "GFS": 6.5, ...}, ...}
|
||||
for day_idx, date_str in enumerate(dates):
|
||||
day_data = {}
|
||||
for model_key, label in model_labels.items():
|
||||
key = f"temperature_2m_max_{model_key}"
|
||||
values = daily.get(key, [])
|
||||
if day_idx < len(values) and values[day_idx] is not None:
|
||||
day_data[label] = round(values[day_idx], 1)
|
||||
if day_data:
|
||||
daily_forecasts[date_str] = day_data
|
||||
|
||||
if not daily_forecasts:
|
||||
logger.warning("Multi-model: 无有效模型数据")
|
||||
return None
|
||||
|
||||
# 今天的预报 (向后兼容)
|
||||
today_date = dates[0] if dates else None
|
||||
forecasts = daily_forecasts.get(today_date, {})
|
||||
|
||||
labels_str = ", ".join([f"{k}={v}" for k, v in forecasts.items()])
|
||||
logger.info(
|
||||
f"🔬 Multi-model ({len(forecasts)}个, {len(daily_forecasts)}天): {labels_str}"
|
||||
)
|
||||
|
||||
result = {
|
||||
"source": "multi_model",
|
||||
"forecasts": forecasts, # 今天 {"ECMWF": 12.3, "GFS": 11.8, ...} (向后兼容)
|
||||
"daily_forecasts": daily_forecasts, # 按天 {"2026-02-23": {...}, "2026-02-24": {...}}
|
||||
"dates": dates,
|
||||
"unit": "fahrenheit" if use_fahrenheit else "celsius",
|
||||
}
|
||||
with self._multi_model_cache_lock:
|
||||
self._multi_model_cache[cache_key] = {
|
||||
"t": time.time(),
|
||||
"data": dict(result),
|
||||
}
|
||||
self._flush_open_meteo_disk_cache()
|
||||
return result
|
||||
except Exception as e:
|
||||
status_code = getattr(getattr(e, "response", None), "status_code", None)
|
||||
if status_code == 429:
|
||||
retry_after_str = getattr(e.response, "headers", {}).get("Retry-After")
|
||||
cooldown_to_use = self._open_meteo_rl_cooldown
|
||||
if retry_after_str:
|
||||
try:
|
||||
parsed = int(retry_after_str)
|
||||
if parsed > 0:
|
||||
cooldown_to_use = min(parsed + 60, 3600)
|
||||
except ValueError:
|
||||
pass
|
||||
logger.warning(
|
||||
f"Multi-model API rate limited (429), fallback to cache if available: lat={lat}, lon={lon}"
|
||||
)
|
||||
with self._open_meteo_rl_lock:
|
||||
self._open_meteo_rate_limit_until = time.time() + cooldown_to_use
|
||||
else:
|
||||
logger.warning(f"Multi-model API 请求失败: {e}")
|
||||
with self._multi_model_cache_lock:
|
||||
stale = self._multi_model_cache.get(cache_key)
|
||||
if stale and isinstance(stale.get("data"), dict):
|
||||
fallback = dict(stale["data"])
|
||||
fallback["stale_cache"] = True
|
||||
return fallback
|
||||
return None
|
||||
|
||||
@@ -0,0 +1,116 @@
|
||||
from __future__ import annotations
|
||||
|
||||
import json
|
||||
import os
|
||||
import time
|
||||
|
||||
from loguru import logger
|
||||
|
||||
|
||||
class OpenMeteoCacheMixin:
|
||||
def _load_open_meteo_disk_cache(self) -> None:
|
||||
"""启动时从磁盘加载 Open-Meteo 三类缓存,避免重启后冷启动打爆 API"""
|
||||
try:
|
||||
path = self._disk_cache_path
|
||||
if not os.path.exists(path):
|
||||
os.makedirs(os.path.dirname(path), exist_ok=True)
|
||||
with open(path, "w", encoding="utf-8") as f:
|
||||
json.dump(
|
||||
{
|
||||
"forecast": {},
|
||||
"ensemble": {},
|
||||
"multi_model": {},
|
||||
"saved_at": time.time(),
|
||||
},
|
||||
f,
|
||||
)
|
||||
self._disk_cache_last_mtime = os.path.getmtime(path)
|
||||
return
|
||||
current_mtime = os.path.getmtime(path)
|
||||
if current_mtime <= self._disk_cache_last_mtime:
|
||||
return
|
||||
with open(path, "r", encoding="utf-8") as f:
|
||||
saved = json.load(f)
|
||||
now = time.time()
|
||||
max_age = max(600, self._disk_cache_max_age_sec)
|
||||
loaded = 0
|
||||
with self._open_meteo_cache_lock:
|
||||
for key, entry in saved.get("forecast", {}).items():
|
||||
if now - float(entry.get("t", 0)) < max_age:
|
||||
old = self._open_meteo_cache.get(key)
|
||||
if old is None or float(entry.get("t", 0)) >= float(old.get("t", 0)):
|
||||
self._open_meteo_cache[key] = entry
|
||||
loaded += 1
|
||||
with self._ensemble_cache_lock:
|
||||
for key, entry in saved.get("ensemble", {}).items():
|
||||
if now - float(entry.get("t", 0)) < max_age:
|
||||
old = self._ensemble_cache.get(key)
|
||||
if old is None or float(entry.get("t", 0)) >= float(old.get("t", 0)):
|
||||
self._ensemble_cache[key] = entry
|
||||
loaded += 1
|
||||
with self._multi_model_cache_lock:
|
||||
for key, entry in saved.get("multi_model", {}).items():
|
||||
if now - float(entry.get("t", 0)) < max_age:
|
||||
old = self._multi_model_cache.get(key)
|
||||
if old is None or float(entry.get("t", 0)) >= float(old.get("t", 0)):
|
||||
self._multi_model_cache[key] = entry
|
||||
loaded += 1
|
||||
self._disk_cache_last_mtime = current_mtime
|
||||
if loaded:
|
||||
logger.info(f"✅ 从磁盘加载 Open-Meteo 缓存 {loaded} 条 ({self._disk_cache_path})")
|
||||
except Exception as exc:
|
||||
logger.warning(f"磁盘缓存加载失败(首次启动不影响运行): {exc}")
|
||||
|
||||
def _maybe_reload_open_meteo_disk_cache(self) -> None:
|
||||
"""跨进程共享缓存:当缓存文件有更新时增量重载到当前进程内存"""
|
||||
try:
|
||||
path = self._disk_cache_path
|
||||
if not os.path.exists(path):
|
||||
return
|
||||
current_mtime = os.path.getmtime(path)
|
||||
if current_mtime <= self._disk_cache_last_mtime:
|
||||
return
|
||||
self._load_open_meteo_disk_cache()
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
def _flush_open_meteo_disk_cache(self) -> None:
|
||||
"""将三类 Open-Meteo 内存缓存持久化到磁盘"""
|
||||
try:
|
||||
os.makedirs(os.path.dirname(self._disk_cache_path), exist_ok=True)
|
||||
with self._open_meteo_cache_lock:
|
||||
forecast_snapshot = dict(self._open_meteo_cache)
|
||||
with self._ensemble_cache_lock:
|
||||
ensemble_snapshot = dict(self._ensemble_cache)
|
||||
with self._multi_model_cache_lock:
|
||||
multi_model_snapshot = dict(self._multi_model_cache)
|
||||
payload = {
|
||||
"forecast": forecast_snapshot,
|
||||
"ensemble": ensemble_snapshot,
|
||||
"multi_model": multi_model_snapshot,
|
||||
"saved_at": time.time(),
|
||||
}
|
||||
with self._disk_cache_lock:
|
||||
tmp_path = self._disk_cache_path + ".tmp"
|
||||
with open(tmp_path, "w", encoding="utf-8") as f:
|
||||
json.dump(payload, f)
|
||||
os.replace(tmp_path, self._disk_cache_path)
|
||||
self._disk_cache_last_mtime = os.path.getmtime(self._disk_cache_path)
|
||||
except Exception as exc:
|
||||
logger.warning(f"磁盘缓存写入失败: {exc}")
|
||||
|
||||
def _wait_open_meteo_slot(self, endpoint: str) -> None:
|
||||
"""Simple per-process rate gate for Open-Meteo endpoints."""
|
||||
min_interval = self._open_meteo_min_interval_sec
|
||||
if min_interval <= 0:
|
||||
return
|
||||
with self._open_meteo_call_lock:
|
||||
now_ts = time.time()
|
||||
wait_for = min_interval - (now_ts - self._open_meteo_last_call_ts)
|
||||
if wait_for > 0:
|
||||
logger.debug(
|
||||
f"Open-Meteo {endpoint} 限流保护:sleep {wait_for:.2f}s (min_interval={min_interval:.2f}s)"
|
||||
)
|
||||
time.sleep(wait_for)
|
||||
now_ts = time.time()
|
||||
self._open_meteo_last_call_ts = now_ts
|
||||
@@ -0,0 +1,269 @@
|
||||
from __future__ import annotations
|
||||
|
||||
import csv
|
||||
import time
|
||||
from datetime import datetime, timedelta, timezone
|
||||
from typing import Any, Dict, List, Optional
|
||||
|
||||
from loguru import logger
|
||||
|
||||
|
||||
class SettlementSourceMixin:
|
||||
def _get_settlement_cache(self, key: str) -> Optional[Dict[str, Any]]:
|
||||
now_ts = time.time()
|
||||
with self._settlement_cache_lock:
|
||||
cached = self._settlement_cache.get(key)
|
||||
if cached and now_ts - float(cached.get("t", 0)) < self.settlement_cache_ttl_sec:
|
||||
return cached.get("d")
|
||||
return None
|
||||
|
||||
def _set_settlement_cache(self, key: str, payload: Dict[str, Any]) -> None:
|
||||
with self._settlement_cache_lock:
|
||||
self._settlement_cache[key] = {"t": time.time(), "d": payload}
|
||||
|
||||
@staticmethod
|
||||
def _csv_rows(text: str) -> List[Dict[str, str]]:
|
||||
normalized = str(text or "").lstrip("")
|
||||
if not normalized.strip():
|
||||
return []
|
||||
return [row for row in csv.DictReader(normalized.splitlines()) if isinstance(row, dict)]
|
||||
|
||||
@staticmethod
|
||||
def _hko_parse_local_iso(raw_yyyymmddhhmm: Optional[str]) -> Optional[str]:
|
||||
raw = str(raw_yyyymmddhhmm or "").strip()
|
||||
if len(raw) != 12 or not raw.isdigit():
|
||||
return None
|
||||
try:
|
||||
dt = datetime.strptime(raw, "%Y%m%d%H%M").replace(
|
||||
tzinfo=timezone(timedelta(hours=8))
|
||||
)
|
||||
return dt.isoformat()
|
||||
except Exception:
|
||||
return None
|
||||
|
||||
@staticmethod
|
||||
def _hko_compass_to_deg(compass: Optional[str]) -> Optional[float]:
|
||||
value = str(compass or "").strip().upper()
|
||||
if not value:
|
||||
return None
|
||||
mapping = {
|
||||
"N": 0.0,
|
||||
"NNE": 22.5,
|
||||
"NE": 45.0,
|
||||
"ENE": 67.5,
|
||||
"E": 90.0,
|
||||
"ESE": 112.5,
|
||||
"SE": 135.0,
|
||||
"SSE": 157.5,
|
||||
"S": 180.0,
|
||||
"SSW": 202.5,
|
||||
"SW": 225.0,
|
||||
"WSW": 247.5,
|
||||
"W": 270.0,
|
||||
"WNW": 292.5,
|
||||
"NW": 315.0,
|
||||
"NNW": 337.5,
|
||||
}
|
||||
return mapping.get(value)
|
||||
|
||||
@staticmethod
|
||||
def _safe_float(value: Any) -> Optional[float]:
|
||||
if value is None:
|
||||
return None
|
||||
text = str(value).strip()
|
||||
if not text or text in {"***", "N/A", "NA"}:
|
||||
return None
|
||||
try:
|
||||
return float(text)
|
||||
except Exception:
|
||||
return None
|
||||
|
||||
@staticmethod
|
||||
def _pick_station_row(
|
||||
rows: List[Dict[str, str]], candidates: List[str]
|
||||
) -> Optional[Dict[str, str]]:
|
||||
if not rows:
|
||||
return None
|
||||
normalized_map = {
|
||||
str(name).strip().lower(): row
|
||||
for row in rows
|
||||
for name in [row.get("Automatic Weather Station")]
|
||||
if isinstance(row, dict) and name
|
||||
}
|
||||
for name in candidates:
|
||||
hit = normalized_map.get(str(name).strip().lower())
|
||||
if hit:
|
||||
return hit
|
||||
for row in rows:
|
||||
station = str(row.get("Automatic Weather Station") or "").strip().lower()
|
||||
if "observatory" in station:
|
||||
return row
|
||||
return rows[0] if rows else None
|
||||
|
||||
def fetch_hko_settlement_current(self) -> Optional[Dict[str, Any]]:
|
||||
cache_key = "hko:hong_kong"
|
||||
cached = self._get_settlement_cache(cache_key)
|
||||
if cached:
|
||||
return cached
|
||||
|
||||
try:
|
||||
base = "https://data.weather.gov.hk/weatherAPI/hko_data/regional-weather"
|
||||
temp_csv = self.session.get(f"{base}/latest_1min_temperature.csv", timeout=self.timeout)
|
||||
temp_csv.raise_for_status()
|
||||
maxmin_csv = self.session.get(f"{base}/latest_since_midnight_maxmin.csv", timeout=self.timeout)
|
||||
maxmin_csv.raise_for_status()
|
||||
humidity_csv = self.session.get(f"{base}/latest_1min_humidity.csv", timeout=self.timeout)
|
||||
humidity_csv.raise_for_status()
|
||||
wind_csv = self.session.get(f"{base}/latest_10min_wind.csv", timeout=self.timeout)
|
||||
wind_csv.raise_for_status()
|
||||
|
||||
temp_rows = self._csv_rows(temp_csv.text)
|
||||
maxmin_rows = self._csv_rows(maxmin_csv.text)
|
||||
humidity_rows = self._csv_rows(humidity_csv.text)
|
||||
wind_rows = self._csv_rows(wind_csv.text)
|
||||
|
||||
station_candidates = ["HK Observatory", "Hong Kong Observatory"]
|
||||
temp_row = self._pick_station_row(temp_rows, station_candidates)
|
||||
maxmin_row = self._pick_station_row(maxmin_rows, station_candidates)
|
||||
humidity_row = self._pick_station_row(humidity_rows, station_candidates)
|
||||
wind_row = self._pick_station_row(wind_rows, station_candidates)
|
||||
if not temp_row or not maxmin_row:
|
||||
return None
|
||||
|
||||
obs_raw = temp_row.get("Date time") or maxmin_row.get("Date time")
|
||||
obs_iso = self._hko_parse_local_iso(obs_raw)
|
||||
current_temp = self._safe_float(temp_row.get("Air Temperature(degree Celsius)"))
|
||||
max_so_far = self._safe_float(maxmin_row.get("Maximum Air Temperature Since Midnight(degree Celsius)"))
|
||||
min_so_far = self._safe_float(maxmin_row.get("Minimum Air Temperature Since Midnight(degree Celsius)"))
|
||||
humidity = self._safe_float(humidity_row.get("Relative Humidity(percent)")) if humidity_row else None
|
||||
wind_speed_kmh = self._safe_float(wind_row.get("10-Minute Mean Speed(km/hour)")) if wind_row else None
|
||||
wind_speed_kt = round(float(wind_speed_kmh) / 1.852, 1) if wind_speed_kmh is not None else None
|
||||
wind_dir = self._hko_compass_to_deg(
|
||||
wind_row.get("10-Minute Mean Wind Direction(Compass points)") if wind_row else None
|
||||
)
|
||||
|
||||
payload: Dict[str, Any] = {
|
||||
"source": "hko",
|
||||
"source_label": "HKO",
|
||||
"station_code": "HKO",
|
||||
"station_name": "HK Observatory",
|
||||
"observation_time": obs_iso,
|
||||
"current": {
|
||||
"temp": round(current_temp, 1) if current_temp is not None else None,
|
||||
"max_temp_so_far": round(max_so_far, 1) if max_so_far is not None else None,
|
||||
"max_temp_time": None,
|
||||
"today_low": round(min_so_far, 1) if min_so_far is not None else None,
|
||||
"humidity": round(humidity, 1) if humidity is not None else None,
|
||||
"wind_speed_kt": wind_speed_kt,
|
||||
"wind_dir": wind_dir,
|
||||
},
|
||||
"unit": "celsius",
|
||||
}
|
||||
self._set_settlement_cache(cache_key, payload)
|
||||
return payload
|
||||
except Exception as exc:
|
||||
logger.warning(f"HKO settlement fetch failed: {exc}")
|
||||
return None
|
||||
|
||||
def fetch_cwa_taipei_settlement_current(self) -> Optional[Dict[str, Any]]:
|
||||
cache_key = "cwa:taipei:466920"
|
||||
cached = self._get_settlement_cache(cache_key)
|
||||
if cached:
|
||||
return cached
|
||||
|
||||
try:
|
||||
url = "https://opendata.cwa.gov.tw/api/v1/rest/datastore/O-A0003-001"
|
||||
response = self.session.get(
|
||||
url,
|
||||
params={"Authorization": self.cwa_open_data_auth, "format": "JSON", "StationId": "466920"},
|
||||
timeout=self.timeout,
|
||||
)
|
||||
response.raise_for_status()
|
||||
data = response.json() if response.content else {}
|
||||
stations = (data.get("records") or {}).get("Station") or []
|
||||
if isinstance(stations, dict):
|
||||
station = stations
|
||||
elif isinstance(stations, list) and stations:
|
||||
station = stations[0]
|
||||
else:
|
||||
station = None
|
||||
if not isinstance(station, dict):
|
||||
return None
|
||||
|
||||
wx = station.get("WeatherElement") or {}
|
||||
if not isinstance(wx, dict):
|
||||
wx = {}
|
||||
daily_extreme = wx.get("DailyExtreme") or {}
|
||||
high_info = (((daily_extreme.get("DailyHigh") or {}).get("TemperatureInfo") or {}))
|
||||
low_info = (((daily_extreme.get("DailyLow") or {}).get("TemperatureInfo") or {}))
|
||||
high_time_raw = (((high_info.get("Occurred_at") or {}).get("DateTime")))
|
||||
high_hhmm = None
|
||||
if high_time_raw and "T" in str(high_time_raw):
|
||||
try:
|
||||
high_hhmm = datetime.fromisoformat(str(high_time_raw)).strftime("%H:%M")
|
||||
except Exception:
|
||||
high_hhmm = str(high_time_raw).split("T")[1][:5]
|
||||
|
||||
obs_time_raw = (station.get("ObsTime") or {}).get("DateTime")
|
||||
wind_speed_ms = self._safe_float(wx.get("WindSpeed"))
|
||||
payload: Dict[str, Any] = {
|
||||
"source": "cwa",
|
||||
"source_label": "CWA",
|
||||
"station_code": str(station.get("StationId") or "466920"),
|
||||
"station_name": str(station.get("StationName") or "臺北"),
|
||||
"observation_time": str(obs_time_raw or "").strip() or None,
|
||||
"current": {
|
||||
"temp": self._safe_float(wx.get("AirTemperature")),
|
||||
"max_temp_so_far": self._safe_float(high_info.get("AirTemperature")),
|
||||
"max_temp_time": high_hhmm,
|
||||
"today_low": self._safe_float(low_info.get("AirTemperature")),
|
||||
"humidity": self._safe_float(wx.get("RelativeHumidity")),
|
||||
"wind_speed_kt": round(float(wind_speed_ms) * 1.943844, 1) if wind_speed_ms is not None else None,
|
||||
"wind_dir": self._safe_float(wx.get("WindDirection")),
|
||||
},
|
||||
"unit": "celsius",
|
||||
}
|
||||
self._set_settlement_cache(cache_key, payload)
|
||||
return payload
|
||||
except Exception as exc:
|
||||
logger.warning(f"CWA settlement fetch failed: {exc}")
|
||||
return None
|
||||
|
||||
def fetch_hko_forecast(self) -> Optional[float]:
|
||||
try:
|
||||
url = "https://data.weather.gov.hk/weatherAPI/opendata/weather.php?dataType=fnd&lang=tc"
|
||||
res = self.session.get(url, timeout=self.timeout).json()
|
||||
return float(res["weatherForecast"][0]["forecastMaxtemp"]["value"])
|
||||
except Exception as exc:
|
||||
logger.warning(f"HKO Forecast request failed: {exc}")
|
||||
return None
|
||||
|
||||
def fetch_cwa_taipei_forecast(self) -> Optional[float]:
|
||||
try:
|
||||
if not self.cwa_open_data_auth:
|
||||
return None
|
||||
url = "https://opendata.cwa.gov.tw/api/v1/rest/datastore/F-D0047-061"
|
||||
res = self.session.get(
|
||||
url,
|
||||
params={"Authorization": self.cwa_open_data_auth, "format": "JSON", "elementName": "MaxT"},
|
||||
timeout=self.timeout,
|
||||
).json()
|
||||
locs = res.get("records", {}).get("Locations", [])[0].get("Location", [])
|
||||
if not locs:
|
||||
return None
|
||||
loc = locs[0]
|
||||
for weather_element in loc.get("WeatherElement", []):
|
||||
if weather_element.get("ElementName") == "MaxT":
|
||||
return float(weather_element["Time"][0]["ElementValue"][0]["Temperature"])
|
||||
return None
|
||||
except Exception as exc:
|
||||
logger.warning(f"CWA Forecast request failed: {exc}")
|
||||
return None
|
||||
|
||||
def fetch_settlement_current(self, city: str) -> Optional[Dict[str, Any]]:
|
||||
normalized = str(city or "").strip().lower()
|
||||
if normalized == "hong kong":
|
||||
return self.fetch_hko_settlement_current()
|
||||
if normalized == "taipei":
|
||||
return self.fetch_cwa_taipei_settlement_current()
|
||||
return None
|
||||
+122
-1739
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user