feat: prefer ths concept fund flow

Author: AdvancingTitans

CHANGELOG.md

@@ -5,6 +5,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.1.10] - 2026-06-02
+
+### Added
+- `young flow` now tries the Tonghuashun concept fund-flow page first and displays top concept net inflow/outflow directions when available.
+
+### Changed
+- Fund-flow output now adapts its title to the active source scope: concept board, sector board, market activity, or Eastmoney main-capital flow.
+- Tonghuashun concept flow is treated as a board-direction reference and is clearly labeled as not equivalent to whole-market main-capital net inflow.
+
 ## [0.1.9] - 2026-06-01
 
 ### Added

README.md

@@ -77,7 +77,7 @@ It is also a foundation for analysis pipelines: every subcommand maps to a Pytho
 - **Smart caching** — `~/.young_stock/cache/`, 7-day TTL, auto-pruned. Pass `--refresh` to skip.
 - **Trade-day awareness** — nearest-trade-day resolution including weekends and (best-effort) holidays.
 - **Rich terminal tables** — readable on dark and light terminals.
-- **Verified A-share fund flow** — `young flow` shows the latest Eastmoney A-share / Shanghai Composite fund-flow record and its trading date explicitly, including a warning when it differs from the requested report date; if realtime fund-flow sources are temporarily unavailable, it tries Eastmoney page indicators, Sina Finance sector fund-flow, then Sina/Tencent market-activity references, clearly labeling non-equivalent fallbacks before using the most recent locally cached good fund-flow record.
+- **Verified A-share fund flow** — `young flow` first tries Tonghuashun concept-board fund flow for fresh board-direction money signals, then Eastmoney main-capital flow/page indicators, Sina Finance sector fund-flow, Sina/Tencent market-activity references, and finally the most recent locally cached good record. Non-equivalent fallbacks are clearly labeled instead of being presented as whole-market main-capital net inflow.
 - **News heat ranking** — HK/US focus stocks can be ranked by filtered news heat from multiple no-login sources: Futu, Sina Finance, and Eastmoney fast news. Xueqiu/THS are intentionally not hardwired unless a stable no-login interface is available.
 - **Same-day news discipline** — news sections only show items published on the requested trading date, up to five items, with a clear empty-state message when nothing valid is available.
 - **Readable news links** — linked news items are checked for obvious empty/404/no-content pages and replaced by other same-day news when possible.
@@ -139,6 +139,6 @@ young a -d 20260530 --refresh    # 指定日期 + 强制刷新
 young update       # 在当前 Python 环境中更新 CLI
 ```
 
-数据来源：腾讯财经、新浪财经、东方财富公开行情与快讯接口（`qt.gtimg.cn` / `hq.sinajs.cn` / `push2.eastmoney.com` / `push2ex.eastmoney.com` / `np-listapi.eastmoney.com`），多源自动切换。本地缓存 7 天，目录 `~/.young_stock/cache/`，可用 `young cache-clear` 清理。命令会标注当前阶段：上午盘、午间、下午盘或盘后；若展示的是非请求日的最新可用数据，会标注为该交易日盘后数据。
+数据来源：同花顺概念资金流页面、腾讯财经、新浪财经、东方财富公开行情与快讯接口（`data.10jqka.com.cn` / `qt.gtimg.cn` / `hq.sinajs.cn` / `push2.eastmoney.com` / `push2ex.eastmoney.com` / `np-listapi.eastmoney.com`），多源自动切换。本地缓存 7 天，目录 `~/.young_stock/cache/`，可用 `young cache-clear` 清理。命令会标注当前阶段：上午盘、午间、下午盘或盘后；若展示的是非请求日的最新可用数据，会标注为该交易日盘后数据。
 
 适用人群：每天盘后想用一条命令看完五张图的开发者 / 量化研究者 / 自动化爱好者。欢迎 issue / PR。

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "young-stock-cli"
-version = "0.1.9"
+version = "0.1.10"
 description = "A-share (China stock market) after-hours CLI — no login, no scraping tricks, just data."
 readme = "README.md"
 requires-python = ">=3.10"

src/young_stock/__init__.py

@@ -1,3 +1,3 @@
 """young-stock-cli: A-share after-hours CLI."""
 
-__version__ = "0.1.9"
+__version__ = "0.1.10"

src/young_stock/_core.py

@@ -97,6 +97,7 @@
     "https://money.finance.sina.com.cn/quotes_service/view/xml_money_flow_fc_hy.php"
     "?fenlei=0&format=json&callback=gotData0&_={ts}"
 )
+THS_CONCEPT_MONEY_FLOW_URL = "http://data.10jqka.com.cn/funds/gnzjl/"
 INDEX_URL = (
     "https://push2.eastmoney.com/api/qt/ulist.np/get"
     "?fltt=2&secids={secids}&fields={fields}&_={ts}"
@@ -573,6 +574,84 @@ def pct(amount: float) -> str:
     return result
 
 
+def _parse_ths_money_flow_table(raw_html: str) -> list[dict[str, Any]]:
+    rows: list[dict[str, Any]] = []
+    tbody_match = re.search(r"<tbody>(.*?)</tbody>", raw_html, re.DOTALL | re.IGNORECASE)
+    tbody = tbody_match.group(1) if tbody_match else raw_html
+    for row in re.findall(r"<tr[^>]*>(.*?)</tr>", tbody, re.DOTALL | re.IGNORECASE):
+        cells = re.findall(r"<td[^>]*>(.*?)</td>", row, re.DOTALL | re.IGNORECASE)
+        if len(cells) < 11:
+            continue
+        text_cells = [_html_to_text(cell) for cell in cells]
+        concept = text_cells[1]
+        if not concept or concept in {"行业", "概念"}:
+            continue
+        rows.append(
+            {
+                "rank": _safe_int(text_cells[0]),
+                "name": concept,
+                "index": _safe_float(text_cells[2]),
+                "change_pct": _safe_number(text_cells[3]),
+                "buy": _safe_number(text_cells[4]),
+                "sell": _safe_number(text_cells[5]),
+                "net": _safe_number(text_cells[6]),
+                "companies": _safe_int(text_cells[7]),
+                "leader": text_cells[8],
+                "leader_change_pct": _safe_number(text_cells[9]),
+                "leader_price": _safe_number(text_cells[10]),
+            }
+        )
+    return rows
+
+
+def fetch_ths_concept_money_flow_snapshot(date_str: str) -> dict[str, str]:
+    """同花顺概念资金流。页面可直接返回表格，作为 young flow 的优先在线源。"""
+    cached = cache_load("fund_flow", date_str, "ths", ttl=CACHE_TTL_SECONDS)
+    if cached:
+        return cached
+    headers = {
+        "User-Agent": (
+            "Mozilla/5.0 (Windows NT 10.0; Win64; x64) "
+            "AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0 Safari/537.36"
+        ),
+        "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
+        "Referer": "http://data.10jqka.com.cn/",
+    }
+    try:
+        req = urllib.request.Request(THS_CONCEPT_MONEY_FLOW_URL, headers=headers)
+        opener = urllib.request.build_opener(urllib.request.ProxyHandler({}))
+        with opener.open(req, timeout=12) as resp:
+            raw = resp.read().decode("gbk", errors="ignore")
+    except Exception as e:
+        diag(f"THS concept money-flow snapshot: {e}")
+        return {}
+
+    if "Nginx forbidden" in raw or "Forbidden" in raw:
+        diag("THS concept money-flow snapshot: forbidden")
+        return {}
+    rows = _parse_ths_money_flow_table(raw)
+    if not rows:
+        diag("THS concept money-flow snapshot: empty table")
+        return {}
+    top_in_rows = sorted([row for row in rows if float(row.get("net") or 0) > 0], key=lambda item: float(item.get("net") or 0), reverse=True)[:5]
+    top_out_rows = sorted([row for row in rows if float(row.get("net") or 0) < 0], key=lambda item: float(item.get("net") or 0))[:5]
+    trade_date = _display_date(nearest_trade_date())
+    result = {
+        "date": trade_date,
+        "_source": "同花顺概念资金流",
+        "_scope": "A股",
+        "_fallback_indicator": "concept_money_flow",
+        "_indicator_note": "以下为同花顺概念板块资金流，反映概念方向净额，不等同于全市场主力资金净流入。",
+        "_concept_in": json.dumps(top_in_rows, ensure_ascii=False),
+        "_concept_out": json.dumps(top_out_rows, ensure_ascii=False),
+    }
+    if result["date"].replace("-", "") != date_str:
+        result["_requested_date"] = _display_date(date_str)
+        result["_date_note"] = "latest_available"
+    cache_save("fund_flow", date_str, "ths", result)
+    return result
+
+
 def _market_activity_snapshot(rows: list[dict[str, Any]], source: str, date_str: str) -> dict[str, str]:
     usable = [r for r in rows if r.get("f12") in {"000001", "399001"}]
     if not usable:
@@ -1591,6 +1670,10 @@ def get_zb_pool(date_str: str) -> dict[str, Any]:
 
 @retry_on_recoverable(max_retries=MAX_RETRIES, initial_delay=INITIAL_BACKOFF)
 def get_fund_flow(date_str: str, *, strict_date: bool = True) -> dict[str, str]:
+    ths_snapshot = fetch_ths_concept_money_flow_snapshot(date_str)
+    if ths_snapshot:
+        return ths_snapshot
+
     cached = cache_load("fund_flow", date_str, "eastmoney")
     if cached:
         if cached.get("_unavailable"):
@@ -2282,7 +2365,12 @@ def print_zt_analysis(zt_data: dict, dt_data: dict, zb_data: dict) -> None:
 
 
 def print_fund_flow(flow_data: dict[str, str]) -> None:
-    print("## A股资金流向（上证指数口径）\n")
+    scope_title = "A股资金流向（上证指数口径）"
+    if flow_data.get("_fallback_indicator") == "concept_money_flow":
+        scope_title = "A股资金流向（概念板块口径）"
+    elif flow_data.get("_fallback_indicator") == "sector_money_flow":
+        scope_title = "A股资金流向（行业板块口径）"
+    print(f"## {scope_title}\n")
     if not flow_data or "_error" in flow_data:
         print("  暂不展示：当前没有拿到可核验交易日的免登录资金流数据。")
         print()
@@ -2308,6 +2396,33 @@ def print_fund_flow(flow_data: dict[str, str]) -> None:
         print("  提醒: 实时接口暂不可用，当前为本地最近一次可信数据")
     if flow_data.get("_source"):
         print(f"  来源: {flow_data['_source']}")
+    if flow_data.get("_fallback_indicator") == "concept_money_flow":
+        print(f"  说明: {flow_data.get('_indicator_note', '当前展示概念板块资金流参考，不等同于全市场主力资金净流入。')}")
+        try:
+            top_in = json.loads(flow_data.get("_concept_in", "[]"))
+            top_out = json.loads(flow_data.get("_concept_out", "[]"))
+        except json.JSONDecodeError:
+            top_in, top_out = [], []
+        if top_in:
+            print("  概念净流入靠前:")
+            for item in top_in[:5]:
+                name = item.get("name", "-")
+                net = float(item.get("net") or 0)
+                leader = item.get("leader") or "-"
+                leader_pct = fmt_pct(item.get("leader_change_pct"))
+                print(f"    {name}: {net:+.2f}亿，领涨股 {leader}（{leader_pct}）")
+        if top_out:
+            print("  概念净流出靠前:")
+            for item in top_out[:5]:
+                name = item.get("name", "-")
+                net = float(item.get("net") or 0)
+                leader = item.get("leader") or "-"
+                leader_pct = fmt_pct(item.get("leader_change_pct"))
+                print(f"    {name}: {net:+.2f}亿，领涨股 {leader}（{leader_pct}）")
+        else:
+            print("  概念净流出靠前: 当前页未返回净流出概念")
+        print()
+        return
     if flow_data.get("_fallback_indicator") == "sector_money_flow":
         print(f"  说明: {flow_data.get('_indicator_note', '当前展示行业资金流参考，不等同于全市场主力资金净流入。')}")
         try:

tests/test_core.py

@@ -1,8 +1,15 @@
 from datetime import datetime
 
+import pytest
+
 from young_stock import _core
 
 
+@pytest.fixture(autouse=True)
+def disable_ths_flow_network(monkeypatch):
+    monkeypatch.setattr(_core, "fetch_ths_concept_money_flow_snapshot", lambda date_str: {})
+
+
 def test_format_helpers():
     assert _core.fmt_price(12.345) == "12.35"
     assert _core.fmt_pct(1.234).endswith("%")
@@ -294,6 +301,70 @@ def test_market_fund_flow_snapshot_sums_shanghai_and_shenzhen(monkeypatch):
     assert flow["_date_note"] == "latest_available"
 
 
+def test_parse_ths_money_flow_table():
+    raw = """
+    <table><tbody><tr class="even">
+      <td class="first tc">1</td>
+      <td class="tl"><a>ERP概念</a></td>
+      <td class=" c-rise">1447.8</td>
+      <td class="tr cur c-rise">4.78%</td>
+      <td class="tr c-rise">61.53</td>
+      <td class="tr c-fall">47.25</td>
+      <td class="tr c-rise">14.28</td>
+      <td class="tr">35</td>
+      <td class="tc"><a>软通动力</a></td>
+      <td class="tr c-rise">20.01%</td>
+      <td class="tr c-rise">39.65</td>
+    </tr></tbody></table>
+    """
+
+    rows = _core._parse_ths_money_flow_table(raw)
+
+    assert rows[0]["name"] == "ERP概念"
+    assert rows[0]["net"] == 14.28
+    assert rows[0]["leader"] == "软通动力"
+
+
+def test_fund_flow_prefers_ths_concept_flow(monkeypatch):
+    monkeypatch.setattr(_core, "cache_load", lambda *args, **kwargs: None)
+    monkeypatch.setattr(
+        _core,
+        "fetch_ths_concept_money_flow_snapshot",
+        lambda date_str: {
+            "date": "2026-06-01",
+            "_source": "同花顺概念资金流",
+            "_fallback_indicator": "concept_money_flow",
+            "_concept_in": "[]",
+            "_concept_out": "[]",
+        },
+    )
+    monkeypatch.setattr(_core, "fetch_fund_flow_json", lambda url: (_ for _ in ()).throw(AssertionError("should not call Eastmoney first")))
+
+    flow = _core.get_fund_flow("20260601")
+
+    assert flow["_source"] == "同花顺概念资金流"
+    assert flow["_fallback_indicator"] == "concept_money_flow"
+
+
+def test_print_fund_flow_concept_indicator(capsys):
+    _core.print_fund_flow(
+        {
+            "date": "2026-06-01",
+            "_source": "同花顺概念资金流",
+            "_fallback_indicator": "concept_money_flow",
+            "_indicator_note": "概念板块资金流参考",
+            "_concept_in": '[{"name":"ERP概念","net":14.28,"leader":"软通动力","leader_change_pct":20.01}]',
+            "_concept_out": '[{"name":"有色金属","net":-8.0,"leader":"示例股","leader_change_pct":-3.0}]',
+        }
+    )
+
+    output = capsys.readouterr().out
+    assert "概念板块口径" in output
+    assert "同花顺概念资金流" in output
+    assert "ERP概念" in output
+    assert "主力净流入:" not in output
+
+
 def test_fund_flow_ignores_old_unavailable_cache(monkeypatch):
     monkeypatch.setattr(_core, "cache_load", lambda *args, **kwargs: {"_unavailable": "old"})
     monkeypatch.setattr(_core, "cache_save", lambda *args, **kwargs: None)