Fix HK historical data provider routing

Author: ZhuLinsen

.env.example

@@ -622,6 +622,9 @@ ADMIN_AUTH_ENABLED=false
 # Lower number = higher priority (tried first)
 # Default priorities: efinance(0) > akshare(1) > tushare/pytdx(2) > baostock(3) > yfinance(4)
 # For US stocks, set YFINANCE_PRIORITY=0 to use Yahoo Finance first
+# To temporarily remove a historical data provider from failover, use comma-separated ids:
+# DISABLED_DATA_PROVIDERS=efinance
+# Supported ids: efinance, akshare, tushare, pytdx, baostock, yfinance, longbridge
 
 # EFINANCE_PRIORITY=0      # EastMoney (China) - default: 0
 # EFINANCE_CALL_TIMEOUT=30 # Timeout (seconds) for efinance API calls; prevents indefinite hangs

data_provider/base.py

@@ -16,6 +16,7 @@
 
 import logging
 import random
+import re
 import time
 from threading import BoundedSemaphore, RLock, Thread
 from abc import ABC, abstractmethod
@@ -36,6 +37,23 @@
 STANDARD_COLUMNS = ['date', 'open', 'high', 'low', 'close', 'volume', 'amount', 'pct_chg']
 
 
+_DATA_PROVIDER_ALIASES = {
+    "eastmoney": "efinance",
+    "em": "efinance",
+    "yahoo": "yfinance",
+    "yahoofinance": "yfinance",
+    "longbridgeopenapi": "longbridge",
+}
+
+
+def normalize_data_provider_id(value: str) -> str:
+    """Normalize user-facing provider names to stable fetcher ids."""
+    normalized = re.sub(r"[^a-z0-9]", "", (value or "").strip().lower())
+    if normalized.endswith("fetcher"):
+        normalized = normalized[:-7]
+    return _DATA_PROVIDER_ALIASES.get(normalized, normalized)
+
+
 def unwrap_exception(exc: Exception) -> Exception:
     """
     Follow chained exceptions and return the deepest non-cyclic cause.
@@ -546,6 +564,40 @@ def _call_fetcher_method(self, fetcher: BaseFetcher, method_name: str, *args, **
         with self._get_fetcher_call_lock(fetcher):
             return method(*args, **kwargs)
 
+    @staticmethod
+    def _filter_disabled_fetchers(
+        fetchers: List[BaseFetcher],
+        disabled_provider_ids: Optional[List[str]],
+    ) -> List[BaseFetcher]:
+        """Remove fetchers disabled through DISABLED_DATA_PROVIDERS."""
+        disabled = {
+            normalize_data_provider_id(provider)
+            for provider in (disabled_provider_ids or [])
+            if normalize_data_provider_id(provider)
+        }
+        if not disabled:
+            return fetchers
+
+        kept: List[BaseFetcher] = []
+        skipped: List[str] = []
+        known = set()
+        for fetcher in fetchers:
+            provider_id = normalize_data_provider_id(fetcher.name)
+            known.add(provider_id)
+            if provider_id in disabled:
+                skipped.append(fetcher.name)
+                continue
+            kept.append(fetcher)
+
+        unknown = sorted(disabled - known)
+        if skipped:
+            logger.info("已禁用数据源: %s", ", ".join(skipped))
+        if unknown:
+            logger.warning("DISABLED_DATA_PROVIDERS 包含未知数据源: %s", ", ".join(unknown))
+        if not kept:
+            logger.warning("所有默认数据源均已被禁用，后续数据请求将失败")
+        return kept
+
     def _get_cached_stock_name(self, stock_code: str) -> Optional[str]:
         self._ensure_concurrency_guards()
         with self._stock_name_cache_lock:
@@ -863,6 +915,7 @@ def _init_default_fetchers(self) -> None:
         from .baostock_fetcher import BaostockFetcher
         from .yfinance_fetcher import YfinanceFetcher
         from .longbridge_fetcher import LongbridgeFetcher
+        from src.config import get_config
         # 创建所有数据源实例（优先级在各 Fetcher 的 __init__ 中确定）
         efinance = EfinanceFetcher()
         akshare = AkshareFetcher()
@@ -871,11 +924,12 @@ def _init_default_fetchers(self) -> None:
         baostock = BaostockFetcher()
         yfinance = YfinanceFetcher()
         longbridge = LongbridgeFetcher()  # 长桥（美股/港股兜底，懒加载）
+        disabled_data_providers = getattr(get_config(), "disabled_data_providers", [])
 
         # 初始化数据源列表
         self._ensure_concurrency_guards()
         with self._fetchers_lock:
-            self._fetchers = [
+            fetchers = [
                 efinance,
                 akshare,
                 tushare,
@@ -884,6 +938,10 @@ def _init_default_fetchers(self) -> None:
                 yfinance,
                 longbridge,
             ]
+            self._fetchers = self._filter_disabled_fetchers(
+                fetchers,
+                disabled_data_providers,
+            )
 
             # 按优先级排序（Tushare 如果配置了 Token 且初始化成功，优先级为 0）
             self._fetchers.sort(key=lambda f: f.priority)

data_provider/efinance_fetcher.py

@@ -53,7 +53,7 @@
 
 from patch.eastmoney_patch import eastmoney_patch
 from src.config import get_config
-from .base import BaseFetcher, DataFetchError, RateLimitError, STANDARD_COLUMNS,is_bse_code, is_st_stock, is_kc_cy_stock, normalize_stock_code
+from .base import BaseFetcher, DataFetchError, RateLimitError, STANDARD_COLUMNS,is_bse_code, is_st_stock, is_kc_cy_stock, normalize_stock_code, _is_hk_market
 from .realtime_types import (
     UnifiedRealtimeQuote, RealtimeSource,
     get_realtime_circuit_breaker,
@@ -354,6 +354,11 @@ def _fetch_raw_data(self, stock_code: str, start_date: str, end_date: str) -> pd
         # 美股不支持，抛出异常让 DataFetcherManager 切换到 AkshareFetcher/YfinanceFetcher
         if _is_us_code(stock_code):
             raise DataFetchError(f"EfinanceFetcher 不支持美股 {stock_code}，请使用 AkshareFetcher 或 YfinanceFetcher")
+
+        # efinance 的历史 K 线接口在港股代码上可能返回非预期市场数据，
+        # 明确跳过并交给 AkShare/Tushare/YFinance/Longbridge 等港股路径兜底。
+        if _is_hk_market(stock_code):
+            raise DataFetchError(f"EfinanceFetcher 不支持港股日线 {stock_code}，请使用 AkshareFetcher 或其他港股数据源")
 
         # 根据代码类型选择不同的获取方法
         if _is_etf_code(stock_code):

docs/CHANGELOG.md

@@ -22,6 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
 - [改进] 设置项帮助窗口支持键盘焦点限制、Esc 关闭和关闭后焦点恢复，并移除短描述重复 hover tooltip。
 - [文档] 新增设置页配置帮助维护说明，明确帮助元数据字段、首批覆盖范围、事实源和多语言文案同步规则。
 - [测试] 补充设置项帮助元数据、API schema、前端弹窗交互测试，并修复 Bot 名称路由与调度时间 provider 测试的离线 CI 稳定性问题。
+- [修复] 港股日线跳过 efinance 东财历史 K 线接口，并新增 `DISABLED_DATA_PROVIDERS` 以便临时禁用异常历史数据源。
 
 ## [3.15.0] - 2026-05-05
 

docs/full-guide.md

@@ -893,6 +893,14 @@ PUSHOVER_API_TOKEN=your_api_token
 2. 将 `MAX_WORKERS=1` 降低并发
 3. 若已配置 Tushare，可优先使用 Tushare 数据源
 
+如某个历史数据源持续返回错误或疑似错配市场，可用 `DISABLED_DATA_PROVIDERS` 临时禁用：
+
+```bash
+DISABLED_DATA_PROVIDERS=efinance
+```
+
+可选值包括 `efinance`、`akshare`、`tushare`、`pytdx`、`baostock`、`yfinance`、`longbridge`，多个值用英文逗号分隔。该配置只影响日线/历史数据源管理器，不替代实时行情的 `REALTIME_SOURCE_PRIORITY`。
+
 ---
 
 ## 高级功能
@@ -905,6 +913,8 @@ PUSHOVER_API_TOKEN=your_api_token
 STOCK_LIST=600519,hk00700,hk01810
 ```
 
+港股日线会跳过 efinance 东财历史 K 线接口，避免把港股代码错配到非港股市场；默认改由 AkShare/Tushare/YFinance/Longbridge 等港股路径继续兜底。
+
 ### ETF 与指数分析
 
 针对指数跟踪型 ETF 和美股指数（如 VOO、QQQ、SPY、510050、SPX、DJI、IXIC），分析仅关注**指数走势、跟踪误差、市场流动性**，不纳入基金管理人/发行方的公司层面风险（诉讼、声誉、高管变动等）。风险警报与业绩预期均基于指数成分股整体表现，避免将基金公司新闻误判为标的本身利空。详见 Issue #274。

docs/full-guide_EN.md

@@ -758,6 +758,14 @@ System defaults to AkShare (free), also supports other data sources:
 - Supports US/HK stock data
 - US stock historical and real-time data both use YFinance exclusively to avoid technical indicator errors from akshare's US stock adjustment issues
 
+If a historical data provider keeps returning bad data or mismatched markets, temporarily disable it with:
+
+```bash
+DISABLED_DATA_PROVIDERS=efinance
+```
+
+Supported ids: `efinance`, `akshare`, `tushare`, `pytdx`, `baostock`, `yfinance`, `longbridge`. Multiple ids are comma-separated. This only affects the historical/daily data manager; realtime quotes still use `REALTIME_SOURCE_PRIORITY`.
+
 ---
 
 ## Advanced Features
@@ -770,6 +778,8 @@ Use `hk` prefix for HK stock codes:
 STOCK_LIST=600519,hk00700,hk01810
 ```
 
+HK daily history skips the efinance Eastmoney historical K-line API to avoid mismatching HK symbols to non-HK market data. AkShare/Tushare/YFinance/Longbridge continue to provide HK fallback paths.
+
 ### Multi-Model Switching
 
 Configure multiple models, system auto-switches:

src/config.py

@@ -600,6 +600,7 @@ class Config:
     longbridge_app_key: Optional[str] = None
     longbridge_app_secret: Optional[str] = None
     longbridge_access_token: Optional[str] = None
+    disabled_data_providers: List[str] = field(default_factory=list)
 
     # === AI 分析配置 ===
     # LiteLLM unified model config (provider/model format, e.g. gemini/gemini-3.1-pro-preview)
@@ -1319,6 +1320,11 @@ def _load_from_env(cls) -> 'Config':
             longbridge_app_key=os.getenv('LONGBRIDGE_APP_KEY') or None,
             longbridge_app_secret=os.getenv('LONGBRIDGE_APP_SECRET') or None,
             longbridge_access_token=os.getenv('LONGBRIDGE_ACCESS_TOKEN') or None,
+            disabled_data_providers=[
+                provider.strip()
+                for provider in os.getenv('DISABLED_DATA_PROVIDERS', '').split(',')
+                if provider.strip()
+            ],
             litellm_model=litellm_model,
             litellm_fallback_models=litellm_fallback_models,
             llm_temperature=resolve_unified_llm_temperature(litellm_model),

tests/test_config_env_compat.py

@@ -31,6 +31,23 @@ def test_load_from_env_reads_tickflow_api_key(
 
         self.assertEqual(config.tickflow_api_key, "tf-secret")
 
+    @patch("src.config.setup_env")
+    @patch.object(Config, "_parse_litellm_yaml", return_value=[])
+    def test_load_from_env_reads_disabled_data_providers(
+        self, _mock_parse_litellm_yaml, _mock_setup_env
+    ):
+        with patch.dict(
+            os.environ,
+            {
+                "STOCK_LIST": "600519",
+                "DISABLED_DATA_PROVIDERS": "efinance, YFinanceFetcher ,",
+            },
+            clear=True,
+        ):
+            config = Config._load_from_env()
+
+        self.assertEqual(config.disabled_data_providers, ["efinance", "YFinanceFetcher"])
+
     @patch("src.config.setup_env")
     @patch.object(Config, "_parse_litellm_yaml", return_value=[])
     def test_load_from_env_keeps_default_behavior_without_tickflow_api_key(

tests/test_fetcher_logging.py

@@ -82,6 +82,33 @@ def test_manager_logs_fallback_and_final_success(self):
         self.assertIn("[数据源切换] 601006: [FailureFetcher] -> [SuccessFetcher]", log_text)
         self.assertIn("[数据源完成] 601006 使用 [SuccessFetcher] 获取成功:", log_text)
 
+    def test_manager_filters_disabled_fetchers_by_config_name_or_alias(self):
+        efinance = _SuccessFetcher()
+        efinance.name = "EfinanceFetcher"
+        akshare = _SuccessFetcher()
+        akshare.name = "AkshareFetcher"
+        yfinance = _SuccessFetcher()
+        yfinance.name = "YfinanceFetcher"
+
+        filtered = DataFetcherManager._filter_disabled_fetchers(
+            [efinance, akshare, yfinance],
+            ["eastmoney", "YFinanceFetcher"],
+        )
+
+        self.assertEqual([fetcher.name for fetcher in filtered], ["AkshareFetcher"])
+
+    @patch("data_provider.efinance_fetcher.get_config")
+    def test_efinance_rejects_hk_daily_without_calling_eastmoney(self, mock_get_config):
+        mock_get_config.return_value = types.SimpleNamespace(enable_eastmoney_patch=False)
+        fetcher = EfinanceFetcher(sleep_min=0, sleep_max=0)
+
+        with patch.object(fetcher, "_fetch_stock_data") as mock_fetch_stock_data:
+            with self.assertRaises(DataFetchError) as captured:
+                fetcher.get_daily_data("1211.HK", start_date="2026-05-01", end_date="2026-05-08")
+
+        mock_fetch_stock_data.assert_not_called()
+        self.assertIn("不支持港股日线", str(captured.exception))
+
     def test_efinance_logs_eastmoney_endpoint_on_remote_disconnect(self):
         fetcher = EfinanceFetcher()
         fake_efinance = types.SimpleNamespace(