refactor: split calendar profile and report modules

Author: AdvancingTitans

CHANGELOG.md

@@ -11,9 +11,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added `young profile add-stock`, `young profile add-fund`, and `young profile show` to maintain local investment memory in `~/.young_stock/profile.json`.
 - Added `young daily`, a personalized daily market report that combines saved stock/fund watchlists, global indices, A-share sentiment, fund flow, and risk-oriented suggestions.
 - Exposed `run_daily_report()` in `young_stock._core` so agent skills can depend on the PyPI package instead of copying the core script.
+- Added focused `calendar`, `profile`, `reports`, and `health` modules as the first step of the v2 architecture split.
+- Added an explicit 2026 market-calendar layer for A-share, HK, and US holiday-aware nearest-trade-day resolution.
+- Added lightweight data-source health snapshots that track recent success rate and latency for public quote/news APIs.
 
 ### Changed
 - The daily report uses the existing nearest-trade-date logic, so pre-close weekday runs still review the latest settled trading day.
+- CLI investment-memory logic moved out of `cli.py`; `_core.run_daily_report()` and `_core.nearest_trade_date()` remain compatibility wrappers over the new modules.
 
 ## [0.1.11] - 2026-06-02
 

README.md

@@ -71,6 +71,8 @@ Most A-share data libraries either (a) require paid accounts, (b) break the mome
 
 It is also a foundation for analysis pipelines: every subcommand maps to a Python function in `young_stock._core`, so you can `from young_stock._core import get_zt_pool, get_fund_flow` and feed the dicts into your own notebook or LLM prompt.
 
+The internals are being split into focused modules: `young_stock.calendar` handles holiday-aware trade dates, `young_stock.profile` handles local investment memory, `young_stock.reports` composes daily reports, and `young_stock.health` tracks lightweight public-source health. Compatibility wrappers remain in `_core` for existing users.
+
 ## What's in the box
 
 - **Multiple public quote sources** — Tencent Finance, Sina Finance, and Eastmoney are tried in sequence so temporary source failures can be filled by another no-login endpoint.
@@ -80,6 +82,8 @@ It is also a foundation for analysis pipelines: every subcommand maps to a Pytho
 - **Single-stock news** — `young news 3690.HK` prints only the news/momentum view, with each item showing source and link status.
 - **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.
+- **Formal calendar layer** — A-share/HK/US holiday sets are separated into `young_stock.calendar`, so trading-day rules can evolve without touching data-source code.
+- **Source health tracking** — common JSON fetches update `young_stock._core.SOURCE_HEALTH`, giving downstream agents a recent success-rate/latency signal for public sources.
 - **Rich terminal tables** — readable on dark and light terminals.
 - **Verified A-share fund flow** — `young flow` uses Tonghuashun concept-board fund flow only when both net-inflow and net-outflow rankings are available, then falls back to 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.

src/young_stock/_core.py

@@ -34,6 +34,9 @@
 from pathlib import Path
 from typing import Any
 
+from .calendar import nearest_trade_date as calendar_nearest_trade_date
+from .health import SourceHealthBook
+
 # ------------------------------------------------------------------
 # 配置
 # ------------------------------------------------------------------
@@ -184,6 +187,7 @@
 # 诊断记录
 DIAGNOSTICS: list[str] = []
 NEWS_URL_VALIDATION_CACHE: dict[str, bool] = {}
+SOURCE_HEALTH = SourceHealthBook()
 
 
 def diag(msg: str) -> None:
@@ -439,13 +443,31 @@ def _fetch_raw(url: str, headers: dict[str, str] | None = None, timeout: int = 1
 
 
 def fetch_json(url: str, headers: dict[str, str] | None = None) -> dict[str, Any]:
+    started = time.monotonic()
     try:
         raw = _fetch_raw(url, headers)
     except Exception as e:
+        SOURCE_HEALTH.record(_source_from_url(url), ok=False, latency_ms=(time.monotonic() - started) * 1000)
         return {"_error": str(e)}
+    SOURCE_HEALTH.record(_source_from_url(url), ok=True, latency_ms=(time.monotonic() - started) * 1000)
     return _parse_json_text(raw)
 
 
+def _source_from_url(url: str) -> str:
+    host = urllib.parse.urlparse(url).netloc.lower()
+    if "eastmoney" in host:
+        return "eastmoney"
+    if "sina" in host:
+        return "sina"
+    if "gtimg" in host or "qq.com" in host:
+        return "tencent"
+    if "10jqka" in host:
+        return "ths"
+    if "futunn" in host:
+        return "futu"
+    return host or "unknown"
+
+
 def _parse_json_text(raw: str) -> dict[str, Any]:
     raw = raw.strip()
     if raw.startswith("(") and raw.endswith(")"):
@@ -2953,101 +2975,20 @@ def run_stock_news(symbol: str, date_str: str, size: int = 8) -> None:
     print_report_footer()
 
 
-def _daily_watchlist_items(watchlist: dict[str, list[str]] | None, key: str) -> list[str]:
-    if not watchlist:
-        return []
-    values = watchlist.get(key) or []
-    return [str(v).strip() for v in values if str(v).strip()]
-
-
-def _quote_trend_label(qd: QuoteData) -> str:
-    pct = qd.change_pct
-    if pct is None:
-        return "趋势待确认"
-    if pct >= 2:
-        return "强势上行"
-    if pct >= 0.3:
-        return "偏强"
-    if pct <= -2:
-        return "明显走弱"
-    if pct <= -0.3:
-        return "偏弱"
-    return "震荡"
-
-
 def print_daily_watchlist(watchlist: dict[str, list[str]] | None, date_str: str, include_news: bool = True) -> None:
-    stocks = _daily_watchlist_items(watchlist, "stocks")
-    funds = _daily_watchlist_items(watchlist, "funds")
-    print("## 一、关注标的\n")
-    if not stocks and not funds:
-        print("  尚未设置关注股票或基金。")
-        print()
-        return
+    from .reports import print_daily_watchlist as _print_daily_watchlist
 
-    if stocks:
-        print("### 个股/ETF行情与趋势\n")
-        for symbol in stocks:
-            try:
-                qd = get_single_stock_quote(symbol, date_str)
-            except ValueError as e:
-                print(f"- {symbol}: 暂未拿到可核验行情（{e}）")
-                continue
-            if not qd:
-                print(f"- {symbol}: 暂未拿到可核验行情")
-                continue
-            name = qd.name or qd.symbol
-            print(
-                f"- {name} ({qd.symbol}): 最新 {fmt_price(qd.price)} {qd.currency}, "
-                f"涨跌幅 {fmt_pct(qd.change_pct)}, {_quote_trend_label(qd)}；"
-                f"来源 {_source_label(qd.source)}，数据日 {qd.date or '-'}。"
-            )
-            if include_news:
-                keyword = qd.name if qd.market in ("cn_market", "hk_market") and qd.name else qd.symbol
-                lang = "zh-CN" if qd.market in ("cn_market", "hk_market") else "en"
-                news = combined_news_search(keyword, size=3, lang=lang, aliases=_news_aliases(qd.symbol, qd.name), date_str=date_str)
-                items = news.get("data", []) if "_error" not in news else []
-                if items:
-                    title = _clean_news_title(str(items[0].get("title") or ""))
-                    print(f"  相关新闻: {title}")
-        print()
-
-    if funds:
-        print("### 基金估值与持仓\n")
-        for code in funds:
-            run_fund_report(code, date_str, include_news=include_news)
+    _print_daily_watchlist(sys.modules[__name__], watchlist, date_str, include_news=include_news)
 
 
 def run_daily_report(
     date_str: str,
     watchlist: dict[str, list[str]] | None = None,
     include_news: bool = True,
 ) -> None:
-    DIAGNOSTICS.clear()
-    display_date = _display_date(date_str)
-    print(f"# 每日行情日报（{display_date}）\n")
-    print_stage_line(date_str)
-    print("数据来源: young-stock-cli 核心模块，多源免登录行情与新闻聚合。")
-    print("说明: 以下内容仅供复盘参考，不构成投资建议。\n")
-    print("=" * 60 + "\n")
-
-    print_daily_watchlist(watchlist, date_str, include_news=include_news)
-
-    print("## 二、全球指数与大盘概览\n")
-    run_global_market(date_str)
-
-    print("## 三、A股大盘与市场情绪\n")
-    run_a_share(date_str, include_news=include_news)
+    from .reports import run_daily_report as _run_daily_report
 
-    print("## 四、投资建议\n")
-    print("- 先看交易日与数据源日期是否一致；若出现最新可用数据提示，不把旧行情当成当日信号。")
-    print("- 个股/基金优先结合持仓成本、仓位上限和新闻催化验证，不因单日涨跌直接追涨杀跌。")
-    print("- 市场情绪偏弱或资金流口径降级时，降低加仓冲动；情绪修复时再观察量能和领涨方向持续性。")
-    print("- 基金估值是盘中/收盘估算，正式净值以基金公司晚间披露为准。")
-    print()
-
-    if DIAGNOSTICS:
-        print_diagnostic_summary()
-    print_report_footer()
+    _run_daily_report(sys.modules[__name__], date_str, watchlist, include_news=include_news)
 
 
 def print_futu_news(news_data: dict, keyword: str, limit: int = 5) -> None:
@@ -3219,16 +3160,7 @@ def print_a_share_news(date_str: str, zt_data: dict | None = None) -> None:
 # ------------------------------------------------------------------
 
 def nearest_trade_date(dt: datetime | None = None) -> str:
-    if dt is None:
-        dt = datetime.now()
-    if dt.weekday() < 5 and (dt.hour, dt.minute) < (15, 0):
-        dt -= timedelta(days=1)
-    wd = dt.weekday()
-    if wd == 5:
-        dt -= timedelta(days=1)
-    elif wd == 6:
-        dt -= timedelta(days=2)
-    return dt.strftime("%Y%m%d")
+    return calendar_nearest_trade_date(dt)
 
 
 def _session_label() -> str:

src/young_stock/calendar.py

@@ -0,0 +1,80 @@
+"""Trading-calendar helpers used by CLI commands and skills."""
+
+from __future__ import annotations
+
+from datetime import date, datetime, timedelta
+
+A_SHARE_HOLIDAYS_2026 = {
+    "20260101",
+    "20260216", "20260217", "20260218", "20260219", "20260220", "20260221", "20260222",
+    "20260404", "20260405", "20260406",
+    "20260501", "20260502", "20260503", "20260504", "20260505",
+    "20260619", "20260620", "20260621",
+    "20260925", "20260926", "20260927",
+    "20261001", "20261002", "20261003", "20261004", "20261005", "20261006", "20261007", "20261008",
+}
+
+HK_MARKET_HOLIDAYS_2026 = {
+    "20260101",
+    "20260217", "20260218", "20260219",
+    "20260403", "20260406", "20260407",
+    "20260501", "20260525",
+    "20260701",
+    "20260926",
+    "20261001", "20261019",
+    "20261225",
+}
+
+US_MARKET_HOLIDAYS_2026 = {
+    "20260101", "20260119", "20260216", "20260403", "20260525",
+    "20260619", "20260703", "20260907", "20261126", "20261225",
+}
+
+
+def _yyyymmdd(value: date | datetime | str) -> str:
+    if isinstance(value, str):
+        return value.replace("-", "")
+    return value.strftime("%Y%m%d")
+
+
+def market_holidays(market: str = "a") -> set[str]:
+    market = market.lower()
+    if market in {"a", "cn", "cn_market", "ashare"}:
+        return A_SHARE_HOLIDAYS_2026
+    if market in {"hk", "hk_market"}:
+        return HK_MARKET_HOLIDAYS_2026
+    if market in {"us", "us_market"}:
+        return US_MARKET_HOLIDAYS_2026
+    return set()
+
+
+def is_trade_day(value: date | datetime | str, market: str = "a") -> bool:
+    day = _yyyymmdd(value)
+    if isinstance(value, str):
+        dt = datetime.strptime(day, "%Y%m%d")
+    else:
+        dt = value
+    return dt.weekday() < 5 and day not in market_holidays(market)
+
+
+def previous_trade_day(value: date | datetime | str, market: str = "a") -> str:
+    if isinstance(value, str):
+        dt = datetime.strptime(_yyyymmdd(value), "%Y%m%d")
+    elif isinstance(value, datetime):
+        dt = value
+    else:
+        dt = datetime.combine(value, datetime.min.time())
+    dt -= timedelta(days=1)
+    while not is_trade_day(dt, market):
+        dt -= timedelta(days=1)
+    return dt.strftime("%Y%m%d")
+
+
+def nearest_trade_date(dt: datetime | None = None, market: str = "a") -> str:
+    if dt is None:
+        dt = datetime.now()
+    if market.lower() in {"a", "cn", "cn_market", "ashare"} and (dt.hour, dt.minute) < (15, 0):
+        return previous_trade_day(dt, market)
+    while not is_trade_day(dt, market):
+        dt -= timedelta(days=1)
+    return dt.strftime("%Y%m%d")

src/young_stock/cli.py

@@ -1,15 +1,13 @@
 """young-stock-cli command line interface."""
 from __future__ import annotations
 
-import json
-import os
 import subprocess
 import sys
-from pathlib import Path
 
 import click
 
 from . import __version__, _core
+from .profile import add_profile_item, load_profile, profile_path
 
 
 @click.group(
@@ -43,43 +41,6 @@ def _run(market: str, date: str | None, refresh: bool, include_news: bool = True
 _refresh_opt = click.option("--refresh", is_flag=True, help="Skip cache and force re-fetch.")
 
 
-def _profile_path() -> Path:
-    override = os.environ.get("YOUNG_STOCK_PROFILE")
-    if override:
-        return Path(override).expanduser()
-    return Path.home() / ".young_stock" / "profile.json"
-
-
-def _load_profile() -> dict[str, list[str]]:
-    path = _profile_path()
-    if not path.exists():
-        return {"stocks": [], "funds": []}
-    try:
-        data = json.loads(path.read_text(encoding="utf-8"))
-    except (OSError, json.JSONDecodeError):
-        return {"stocks": [], "funds": []}
-    return {
-        "stocks": [str(v) for v in data.get("stocks", []) if str(v).strip()],
-        "funds": [str(v) for v in data.get("funds", []) if str(v).strip()],
-    }
-
-
-def _save_profile(profile: dict[str, list[str]]) -> None:
-    path = _profile_path()
-    path.parent.mkdir(parents=True, exist_ok=True)
-    path.write_text(json.dumps(profile, ensure_ascii=False, indent=2) + "\n", encoding="utf-8")
-
-
-def _add_profile_item(kind: str, value: str) -> dict[str, list[str]]:
-    profile = _load_profile()
-    items = profile.setdefault(kind, [])
-    normalized = value.strip()
-    if normalized and normalized not in items:
-        items.append(normalized)
-    _save_profile(profile)
-    return profile
-
-
 def _print_first_use_guide() -> None:
     click.echo("# 每日行情日报")
     click.echo()
@@ -88,7 +49,7 @@ def _print_first_use_guide() -> None:
     click.echo("  young profile add-stock 0700.HK")
     click.echo("  young profile add-fund 161725")
     click.echo()
-    click.echo(f"配置会保存到: {_profile_path()}")
+    click.echo(f"配置会保存到: {profile_path()}")
 
 
 @cli.command(help="A-share dashboard: indices, ZT/DT pool, verified A-share fund flow, boards.")
@@ -224,7 +185,7 @@ def daily(date: str | None, refresh: bool, no_news: bool) -> None:
         _core.NO_CACHE = True
     _core.cache_clear_old(days=7)
     date_str = date or _core.nearest_trade_date()
-    profile = _load_profile()
+    profile = load_profile()
     if not profile.get("stocks") and not profile.get("funds"):
         _print_first_use_guide()
         return
@@ -239,22 +200,22 @@ def profile() -> None:
 @profile.command("add-stock", help="Add a stock/ETF symbol to your daily watchlist.")
 @click.argument("symbol")
 def profile_add_stock(symbol: str) -> None:
-    data = _add_profile_item("stocks", symbol)
+    data = add_profile_item("stocks", symbol)
     click.echo(f"Added stock: {symbol.strip()}")
     click.echo(f"Stocks: {', '.join(data.get('stocks', [])) or '-'}")
 
 
 @profile.command("add-fund", help="Add a fund code to your daily watchlist.")
 @click.argument("code")
 def profile_add_fund(code: str) -> None:
-    data = _add_profile_item("funds", code)
+    data = add_profile_item("funds", code)
     click.echo(f"Added fund: {code.strip()}")
     click.echo(f"Funds: {', '.join(data.get('funds', [])) or '-'}")
 
 
 @profile.command("show", help="Show saved daily-report investment memory.")
 def profile_show() -> None:
-    data = _load_profile()
+    data = load_profile()
     click.echo(f"Stocks: {', '.join(data.get('stocks', [])) or '-'}")
     click.echo(f"Funds: {', '.join(data.get('funds', [])) or '-'}")