@weaxs/openclaw-stock-analysis 0.1.5 → 0.1.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/index.ts CHANGED
@@ -28,9 +28,14 @@ const toolsDir = existsSync(join(here, "tools"))
28
28
  const repoRoot = dirname(toolsDir);
29
29
  const isWin = process.platform === "win32";
30
30
  const venvPython = join(repoRoot, ".venv", isWin ? "Scripts" : "bin", "python3");
31
+ // Staged-payload layout (openclaw/tools present in a dev checkout): the venv
32
+ // still lives at the repo root one level up.
33
+ const parentVenvPython = join(repoRoot, "..", ".venv", isWin ? "Scripts" : "bin", "python3");
31
34
 
32
35
  function pythonBin(): string {
33
- return existsSync(venvPython) ? venvPython : "python3";
36
+ if (existsSync(venvPython)) return venvPython;
37
+ if (existsSync(parentVenvPython)) return parentVenvPython;
38
+ return "python3";
34
39
  }
35
40
 
36
41
  async function runPy(script: string, args: string[]): Promise<string> {
@@ -45,17 +50,17 @@ export default definePluginEntry({
45
50
  id: "stock-analysis",
46
51
  name: "Stock Analysis",
47
52
  description:
48
- "Stock analysis, screening, and strategy backtesting across A/HK/US markets",
53
+ "Stock analysis, screening, and strategy backtesting across A/HK/US/JP/KR/TW markets",
49
54
  register(api) {
50
55
  // --- Data Tools ---
51
56
 
52
57
  api.registerTool({
53
58
  name: "get_kline",
54
59
  description:
55
- "获取股票K线数据(OHLCV)。支持A股(如600519)、港股(如00700.HK)、美股(如AAPL)",
60
+ "获取股票K线数据(OHLCV)。支持A股(如600519)、港股(如00700.HK)、美股(如AAPL)、日股(如7203.T)、韩股(如005930.KS)、台股(如2330.TW)及A股ETF",
56
61
  parameters: Type.Object({
57
62
  symbol: Type.String({
58
- description: "股票代码,如 600519(A股)、00700.HK(港股)、AAPL(美股)",
63
+ description: "股票代码,如 600519(A股)、00700.HK(港股)、AAPL(美股)、7203.T(日股)、005930.KS(韩股)、2330.TW(台股)",
59
64
  }),
60
65
  period: Type.Optional(
61
66
  Type.Union(
@@ -80,7 +85,7 @@ export default definePluginEntry({
80
85
 
81
86
  api.registerTool({
82
87
  name: "get_quote",
83
- description: "获取股票实时行情报价。支持A股、港股、美股",
88
+ description: "获取股票实时行情报价。支持A股、港股、美股、日股、韩股、台股",
84
89
  parameters: Type.Object({
85
90
  symbol: Type.String({ description: "股票代码" }),
86
91
  }),
@@ -215,11 +220,11 @@ export default definePluginEntry({
215
220
  api.registerTool({
216
221
  name: "get_market_indices",
217
222
  description:
218
- "获取主要市场指数行情。CN: 上证/深证/创业板/科创50/沪深300;HK: 恒生/国企/科技;US: 道琼斯/纳斯达克/标普500",
223
+ "获取主要市场指数行情。CN: 上证/深证/创业板/科创50/沪深300;HK: 恒生/国企/科技;US: 道琼斯/纳斯达克/标普500;JP: 日经225/东证;KR: KOSPI/KOSDAQ;TW: 台湾加权",
219
224
  parameters: Type.Object({
220
225
  region: Type.Optional(
221
226
  Type.Union(
222
- [Type.Literal("cn"), Type.Literal("hk"), Type.Literal("us")],
227
+ [Type.Literal("cn"), Type.Literal("hk"), Type.Literal("us"), Type.Literal("jp"), Type.Literal("kr"), Type.Literal("tw")],
223
228
  { description: "市场区域,默认 cn" }
224
229
  )
225
230
  ),
@@ -264,7 +269,7 @@ export default definePluginEntry({
264
269
  api.registerTool({
265
270
  name: "get_stock_info",
266
271
  description:
267
- "获取股票基本信息(行业、板块、上市日期、总股本等)。A股返回板块/行业,HK/US返回行业/公司简介",
272
+ "获取股票基本信息(行业、板块、上市日期、总股本等)。A股返回板块/行业,其他市场返回行业/公司简介",
268
273
  parameters: Type.Object({
269
274
  symbol: Type.String({ description: "股票代码" }),
270
275
  }),
@@ -457,10 +462,10 @@ export default definePluginEntry({
457
462
  api.registerTool({
458
463
  name: "check_trading_day",
459
464
  description:
460
- "查询某日是否为交易日。支持CN(A股)、HK(港股)、US(美股)三市场",
465
+ "查询某日是否为交易日。支持CN(A股)、HK(港股)、US(美股)、JP(日股)、KR(韩股)、TW(台股)",
461
466
  parameters: Type.Object({
462
467
  market: Type.Union(
463
- [Type.Literal("CN"), Type.Literal("HK"), Type.Literal("US")],
468
+ [Type.Literal("CN"), Type.Literal("HK"), Type.Literal("US"), Type.Literal("JP"), Type.Literal("KR"), Type.Literal("TW")],
464
469
  { description: "市场" }
465
470
  ),
466
471
  date: Type.Optional(
@@ -477,10 +482,10 @@ export default definePluginEntry({
477
482
 
478
483
  api.registerTool({
479
484
  name: "get_trading_days",
480
- description: "获取最近/未来N个交易日列表。支持CN/HK/US三市场",
485
+ description: "获取最近/未来N个交易日列表。支持CN/HK/US/JP/KR/TW",
481
486
  parameters: Type.Object({
482
487
  market: Type.Union(
483
- [Type.Literal("CN"), Type.Literal("HK"), Type.Literal("US")],
488
+ [Type.Literal("CN"), Type.Literal("HK"), Type.Literal("US"), Type.Literal("JP"), Type.Literal("KR"), Type.Literal("TW")],
484
489
  { description: "市场" }
485
490
  ),
486
491
  direction: Type.Optional(
@@ -771,6 +776,9 @@ export default definePluginEntry({
771
776
  Type.Literal("A"),
772
777
  Type.Literal("HK"),
773
778
  Type.Literal("US"),
779
+ Type.Literal("JP"),
780
+ Type.Literal("KR"),
781
+ Type.Literal("TW"),
774
782
  Type.Literal("all"),
775
783
  ],
776
784
  { description: "市场,默认 all" }
@@ -794,7 +802,7 @@ export default definePluginEntry({
794
802
  parameters: Type.Object({
795
803
  market: Type.Optional(
796
804
  Type.Union(
797
- [Type.Literal("A"), Type.Literal("HK"), Type.Literal("US")],
805
+ [Type.Literal("A"), Type.Literal("HK"), Type.Literal("US"), Type.Literal("JP"), Type.Literal("KR"), Type.Literal("TW")],
798
806
  { description: "市场代码" }
799
807
  )
800
808
  ),
@@ -944,7 +952,7 @@ export default definePluginEntry({
944
952
  api.registerTool({
945
953
  name: "parse_stock_list",
946
954
  description:
947
- "自选股/文本导入解析 — 从自然语言、CSV、Markdown 表格提取股票,自动识别 A 股 6 位代码、港股 xxxxx.HK、美股 ticker,并调用 name_resolver 处理中文股票名",
955
+ "自选股/文本导入解析 — 从自然语言、CSV、Markdown 表格提取股票,自动识别 A 股 6 位代码、港股 xxxxx.HK、美股 ticker、日股 xxxx.T、韩股 xxxxxx.KS/KQ、台股 xxxx.TW,并调用 name_resolver 处理中文股票名",
948
956
  parameters: Type.Object({
949
957
  text: Type.String({ description: "待解析的文本" }),
950
958
  }),
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "id": "stock-analysis",
3
3
  "name": "Stock Analysis",
4
- "description": "Stock analysis, screening, and strategy backtesting across A/HK/US markets (akshare/yfinance/tushare)",
4
+ "description": "Stock analysis, screening, and strategy backtesting across A/HK/US/JP/KR/TW markets (akshare/yfinance/tushare)",
5
5
  "contracts": {
6
6
  "tools": [
7
7
  "get_kline",
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@weaxs/openclaw-stock-analysis",
3
- "version": "0.1.5",
4
- "description": "OpenClaw plugin for stock analysis, screening, and strategy backtesting across A/HK/US markets",
3
+ "version": "0.1.6",
4
+ "description": "OpenClaw plugin for stock analysis, screening, and strategy backtesting across A/HK/US/JP/KR/TW markets",
5
5
  "type": "module",
6
6
  "main": "./index.ts",
7
7
  "openclaw": {
@@ -22,6 +22,7 @@
22
22
  },
23
23
  "files": [
24
24
  "index.ts",
25
+ "dist/",
25
26
  "openclaw.plugin.json",
26
27
  "README.md",
27
28
  "tools/",
@@ -1,7 +1,7 @@
1
1
  #!/usr/bin/env python3
2
2
  """Market capability boundaries — tell agent what a given market supports.
3
3
 
4
- Prevents agents from calling A-share-only tools on HK/US and vice versa.
4
+ Prevents agents from calling A-share-only tools on HK/US/JP/KR/TW and vice versa.
5
5
  """
6
6
 
7
7
  import argparse
@@ -13,21 +13,23 @@ from pathlib import Path
13
13
  sys.path.insert(0, str(Path(__file__).resolve().parent))
14
14
  from stock_data import detect_market
15
15
 
16
+ ALL_MARKETS = ["A", "HK", "US", "JP", "KR", "TW"]
17
+
16
18
  # tool_name -> {markets: [supported markets], reason: str for unsupported}
17
19
  TOOL_MATRIX = {
18
- "get_kline": {"markets": ["A", "HK", "US"], "reason": None},
19
- "get_quote": {"markets": ["A", "HK", "US"], "reason": None},
20
- "get_news": {"markets": ["A", "HK", "US"], "reason": None},
21
- "get_financials": {"markets": ["A", "HK", "US"], "reason": None},
22
- "get_technical_analysis": {"markets": ["A", "HK", "US"], "reason": None},
23
- "analyze_pattern": {"markets": ["A", "HK", "US"], "reason": None},
24
- "get_market_indices": {"markets": ["A", "HK", "US"], "reason": None},
25
- "calculate_ma": {"markets": ["A", "HK", "US"], "reason": None},
26
- "get_volume_analysis": {"markets": ["A", "HK", "US"], "reason": None},
27
- "detect_anomaly": {"markets": ["A", "HK", "US"], "reason": None},
28
- "get_stock_info": {"markets": ["A", "HK", "US"], "reason": None},
29
- "detect_market_regime": {"markets": ["A", "HK", "US"], "reason": None},
30
- "get_market_review": {"markets": ["A", "HK", "US"], "reason": None},
20
+ "get_kline": {"markets": ALL_MARKETS, "reason": None},
21
+ "get_quote": {"markets": ALL_MARKETS, "reason": None},
22
+ "get_news": {"markets": ALL_MARKETS, "reason": None},
23
+ "get_financials": {"markets": ALL_MARKETS, "reason": None},
24
+ "get_technical_analysis": {"markets": ALL_MARKETS, "reason": None},
25
+ "analyze_pattern": {"markets": ALL_MARKETS, "reason": None},
26
+ "get_market_indices": {"markets": ALL_MARKETS, "reason": None},
27
+ "calculate_ma": {"markets": ALL_MARKETS, "reason": None},
28
+ "get_volume_analysis": {"markets": ALL_MARKETS, "reason": None},
29
+ "detect_anomaly": {"markets": ALL_MARKETS, "reason": None},
30
+ "get_stock_info": {"markets": ALL_MARKETS, "reason": None},
31
+ "detect_market_regime": {"markets": ["A", "HK", "US"], "reason": "index coverage is CN/HK/US only"},
32
+ "get_market_review": {"markets": ["A", "HK", "US"], "reason": "review data coverage is CN/HK/US only"},
31
33
  # A-share only
32
34
  "get_capital_flow": {"markets": ["A"], "reason": "A-share only (akshare data)"},
33
35
  "get_chip_distribution": {"markets": ["A"], "reason": "A-share only"},
@@ -41,14 +43,14 @@ TOOL_MATRIX = {
41
43
  "reason": "sentiment providers are US-centric; requires SENTIMENT_API_KEY",
42
44
  },
43
45
  "get_trending_sentiment": {
44
- "markets": ["A", "HK", "US"],
46
+ "markets": ALL_MARKETS,
45
47
  "reason": None,
46
48
  },
47
49
  # search-based, market-agnostic
48
- "search_stock_news": {"markets": ["A", "HK", "US"], "reason": None},
49
- "search_comprehensive_intel": {"markets": ["A", "HK", "US"], "reason": None},
50
- "extract_article": {"markets": ["A", "HK", "US"], "reason": None},
51
- "screen_risk": {"markets": ["A", "HK", "US"], "reason": None},
50
+ "search_stock_news": {"markets": ALL_MARKETS, "reason": None},
51
+ "search_comprehensive_intel": {"markets": ALL_MARKETS, "reason": None},
52
+ "extract_article": {"markets": ALL_MARKETS, "reason": None},
53
+ "screen_risk": {"markets": ALL_MARKETS, "reason": None},
52
54
  }
53
55
 
54
56
 
@@ -81,7 +83,7 @@ def main():
81
83
  sub = parser.add_subparsers(dest="command")
82
84
  p = sub.add_parser("get")
83
85
  grp = p.add_mutually_exclusive_group(required=True)
84
- grp.add_argument("--market", type=str.upper, choices=["A", "HK", "US"], help="Market code")
86
+ grp.add_argument("--market", type=str.upper, choices=ALL_MARKETS, help="Market code")
85
87
  grp.add_argument("--symbol", help="Stock symbol (auto-detects market)")
86
88
  args = parser.parse_args()
87
89
 
@@ -12,6 +12,10 @@ import json
12
12
  import os
13
13
  import sys
14
14
  from datetime import datetime, timezone
15
+ from pathlib import Path
16
+
17
+ sys.path.insert(0, str(Path(__file__).resolve().parent))
18
+ from capabilities import ALL_MARKETS # noqa: E402
15
19
 
16
20
  # provider -> (import_name, required_env_vars, markets, note)
17
21
  PROVIDERS = {
@@ -19,8 +23,8 @@ PROVIDERS = {
19
23
  "tushare": ("tushare", ["TUSHARE_TOKEN"], ["A"], None),
20
24
  "efinance": ("efinance", [], ["A"], None),
21
25
  "pytdx": ("pytdx", [], ["A"], "connects to public Tencent servers"),
22
- "yfinance": ("yfinance", [], ["HK", "US"], "quote may be delayed 15-20min"),
23
- "finnhub": ("finnhub", ["FINNHUB_API_KEY"], ["US"], None),
26
+ "yfinance": ("yfinance", [], ["HK", "US", "JP", "KR", "TW"], "quote may be delayed 15-20min"),
27
+ "finnhub": ("finnhub", ["FINNHUB_API_KEY"], ["HK", "US"], None),
24
28
  "longbridge": (
25
29
  "longport.openapi",
26
30
  ["LONGBRIDGE_APP_KEY", "LONGBRIDGE_APP_SECRET", "LONGBRIDGE_ACCESS_TOKEN"],
@@ -68,7 +72,7 @@ def diagnose(market: str = "all") -> dict:
68
72
  market = (market or "all").upper()
69
73
  all_providers = [_check_provider(p) for p in PROVIDERS]
70
74
 
71
- markets_to_report = ["A", "HK", "US"] if market == "ALL" else [market]
75
+ markets_to_report = ALL_MARKETS if market == "ALL" else [market]
72
76
 
73
77
  result = {
74
78
  "meta": {
@@ -97,6 +101,8 @@ def diagnose(market: str = "all") -> dict:
97
101
  and not any(p["name"] == "finnhub" and p["available"] for p in providers)
98
102
  ):
99
103
  warnings.append(f"{m} quotes will be delayed (yfinance only)")
104
+ if m in ("JP", "KR", "TW"):
105
+ warnings.append(f"{m} is served by yfinance only — quotes delayed 15-20min, no failover")
100
106
 
101
107
  result["markets"].append(
102
108
  {
@@ -118,7 +124,7 @@ def main():
118
124
  "--market",
119
125
  default="ALL",
120
126
  type=str.upper,
121
- choices=["A", "HK", "US", "ALL"],
127
+ choices=ALL_MARKETS + ["ALL"],
122
128
  help="Market to diagnose (default: ALL)",
123
129
  )
124
130
  args = parser.parse_args()
@@ -13,10 +13,14 @@ from pathlib import Path
13
13
 
14
14
  sys.path.insert(0, str(Path(__file__).resolve().parent))
15
15
  from name_resolver import resolve # noqa: E402
16
+ from stock_data import detect_market # noqa: E402
16
17
 
17
18
  # regex patterns
18
19
  RE_A_CODE = re.compile(r"(?<!\d)(\d{6})(?!\d)")
19
20
  RE_HK_CODE = re.compile(r"(?<![A-Za-z0-9])(\d{4,5}\.HK)(?![A-Za-z0-9])", re.IGNORECASE)
21
+ RE_ASIA_SUFFIX_CODE = re.compile(
22
+ r"(?<![A-Za-z0-9])(\d{4}\.T|\d{6}\.(?:KS|KQ)|\d{4}\.(?:TW|TWO))(?![A-Za-z0-9])", re.IGNORECASE
23
+ )
20
24
  RE_US_TICKER = re.compile(r"(?<![A-Za-z0-9])([A-Z]{1,5})(?![A-Za-z0-9\.])")
21
25
  RE_CN_NAME = re.compile(r"[一-鿿][一-鿿\w]{1,7}")
22
26
 
@@ -158,20 +162,31 @@ def parse(text: str) -> dict:
158
162
  seen_symbols.add(code)
159
163
  hk_matches.append(m.group(1))
160
164
 
161
- # strip HK codes so their 4-5 digit part doesn't get picked up as A-share
162
- text_after_hk = text
163
- for m in hk_matches:
164
- text_after_hk = text_after_hk.replace(m, " ")
165
+ # 1b. JP/KR/TW suffixed codes (7203.T, 005930.KS, 2330.TW — digits would hit A-share regex too)
166
+ asia_matches: list[str] = []
167
+ for m in RE_ASIA_SUFFIX_CODE.finditer(text):
168
+ code = m.group(1).upper()
169
+ if code not in seen_symbols:
170
+ items.append({"symbol": code, "market": detect_market(code)})
171
+ seen_symbols.add(code)
172
+ asia_matches.append(m.group(1))
173
+
174
+ # strip suffixed codes so their digit part doesn't get picked up as A-share
175
+ # and their suffix doesn't get picked up as a US ticker
176
+ text_without_suffixed = text
177
+ for m in hk_matches + asia_matches:
178
+ text_without_suffixed = text_without_suffixed.replace(m, " ")
165
179
 
166
180
  # 2. A-share 6-digit codes
167
- for m in RE_A_CODE.finditer(text_after_hk):
181
+ for m in RE_A_CODE.finditer(text_without_suffixed):
168
182
  code = m.group(1)
169
183
  if code not in seen_symbols:
170
184
  items.append({"symbol": code, "market": "A"})
171
185
  seen_symbols.add(code)
172
186
 
173
187
  # 3. US tickers (1-5 uppercase letters), filtered against stopwords
174
- for m in RE_US_TICKER.finditer(text):
188
+ # runs on stripped text so HK/JP/KR/TW suffixes (HK, TW, KS...) aren't misread as tickers
189
+ for m in RE_US_TICKER.finditer(text_without_suffixed):
175
190
  tick = m.group(1)
176
191
  if tick in US_STOPWORDS:
177
192
  continue
@@ -146,6 +146,46 @@ def _bocha_search(query: str, max_results: int = 5) -> list[dict]:
146
146
  return []
147
147
 
148
148
 
149
+ def _searxng_search(query: str, max_results: int = 5) -> list[dict]:
150
+ """SearXNG self-hosted metasearch — no API key, quota-free fallback.
151
+
152
+ Set SEARXNG_BASE_URLS to a comma-separated list of instance URLs,
153
+ e.g. "http://127.0.0.1:8080,https://searx.example.com".
154
+ """
155
+ base_urls = [u.strip().rstrip("/") for u in os.environ.get("SEARXNG_BASE_URLS", "").split(",") if u.strip()]
156
+ if not base_urls:
157
+ return []
158
+ try:
159
+ import requests
160
+ except ImportError:
161
+ return []
162
+ for base in base_urls:
163
+ try:
164
+ resp = requests.get(
165
+ f"{base}/search",
166
+ params={"q": query, "format": "json"},
167
+ headers={"Accept": "application/json"},
168
+ timeout=15,
169
+ )
170
+ if not resp.ok:
171
+ continue
172
+ data = resp.json()
173
+ results = [
174
+ {
175
+ "title": r.get("title", ""),
176
+ "url": r.get("url", ""),
177
+ "snippet": (r.get("content") or "")[:200],
178
+ "source": "searxng",
179
+ }
180
+ for r in data.get("results", [])
181
+ ]
182
+ if results:
183
+ return results
184
+ except Exception:
185
+ continue
186
+ return []
187
+
188
+
149
189
  def search_news(query: str, max_results: int = 10) -> dict:
150
190
  results = []
151
191
  engines_tried = []
@@ -156,6 +196,7 @@ def search_news(query: str, max_results: int = 10) -> dict:
156
196
  ("brave", _brave_search),
157
197
  ("bocha", _bocha_search),
158
198
  ("serpapi", _serpapi_search),
199
+ ("searxng", _searxng_search),
159
200
  ]:
160
201
  engines_tried.append(name)
161
202
  items = fn(query, max_results)
@@ -170,7 +211,10 @@ def search_news(query: str, max_results: int = 10) -> dict:
170
211
  "query": query,
171
212
  "results": [],
172
213
  "engines_tried": engines_tried,
173
- "note": "No search engines configured. Set TAVILY_API_KEY, BRAVE_API_KEY, or SERPAPI_KEY in environment.",
214
+ "note": (
215
+ "No search engines configured. Set TAVILY_API_KEY, BRAVE_API_KEY, BOCHA_API_KEY, "
216
+ "SERPAPI_KEY, or SEARXNG_BASE_URLS in environment."
217
+ ),
174
218
  }
175
219
 
176
220
  seen_urls = set()
@@ -11,8 +11,15 @@ from datetime import datetime, timedelta
11
11
 
12
12
 
13
13
  def detect_market(symbol: str) -> str:
14
- if symbol.upper().endswith(".HK"):
14
+ s = symbol.upper()
15
+ if s.endswith(".HK"):
15
16
  return "HK"
17
+ if s.endswith(".T"):
18
+ return "JP"
19
+ if s.endswith((".KS", ".KQ")):
20
+ return "KR"
21
+ if s.endswith((".TW", ".TWO")):
22
+ return "TW"
16
23
  if re.match(r"^\d{6}$", symbol):
17
24
  return "A"
18
25
  return "US"
@@ -77,10 +84,10 @@ def _failover(sources: list, label: str = ""):
77
84
  return None
78
85
 
79
86
 
80
- def _akshare_retry(fn, *args, retries=2, delay=1):
87
+ def _akshare_retry(fn, *args, retries=2, delay=1, **kwargs):
81
88
  for attempt in range(retries + 1):
82
89
  try:
83
- return fn(*args)
90
+ return fn(*args, **kwargs)
84
91
  except Exception:
85
92
  if attempt == retries:
86
93
  raise
@@ -247,8 +254,10 @@ def _kline_akshare(symbol: str, period: str, count: int) -> list:
247
254
  end = datetime.now()
248
255
  start = end - timedelta(days=count * 7 if period == "weekly" else count * 31 if period == "monthly" else count * 2)
249
256
 
257
+ # ETFs (51/52/56/58/15/16/18xxxx) are not covered by stock_zh_a_hist
258
+ hist_fn = ak.fund_etf_hist_em if normalize_stock_code(symbol)["is_etf"] else ak.stock_zh_a_hist
250
259
  df = _akshare_retry(
251
- ak.stock_zh_a_hist,
260
+ hist_fn,
252
261
  symbol=symbol,
253
262
  period=period_map.get(period, "daily"),
254
263
  start_date=start.strftime("%Y%m%d"),
@@ -663,16 +672,30 @@ def _quote_alphavantage(symbol: str) -> dict:
663
672
  )
664
673
 
665
674
 
675
+ def _yf_failover(symbol: str, yfinance, finnhub, longbridge, alphavantage, label: str):
676
+ """Shared HK/US/JP/KR/TW failover chain: yfinance → finnhub/longbridge (HK/US) → alphavantage (US only).
677
+
678
+ Each provider is a zero-arg callable; callers bind their own symbol/period/count.
679
+ """
680
+ market = detect_market(symbol)
681
+ sources = [("yfinance", yfinance)]
682
+ if market in ("HK", "US"):
683
+ sources += [("finnhub", finnhub), ("longbridge", longbridge)]
684
+ if market == "US":
685
+ sources.append(("alphavantage", alphavantage))
686
+ return _failover(sources, label=label)
687
+
688
+
666
689
  def kline_yf(symbol: str, period: str, count: int) -> list:
667
- """HK/US kline with failover: yfinance → finnhub → longbridge → alphavantage (US only)."""
668
- sources = [
669
- ("yfinance", lambda: _kline_yfinance(symbol, period, count)),
670
- ("finnhub", lambda: _kline_finnhub(symbol, period, count)),
671
- ("longbridge", lambda: _kline_longbridge(symbol, period, count)),
672
- ]
673
- if detect_market(symbol) == "US":
674
- sources.append(("alphavantage", lambda: _kline_alphavantage(symbol, period, count)))
675
- return _failover(sources, label=f"kline:{symbol}")
690
+ """HK/US/JP/KR/TW kline. Failover: yfinance → finnhub/longbridge (HK/US) → alphavantage (US only)."""
691
+ return _yf_failover(
692
+ symbol,
693
+ lambda: _kline_yfinance(symbol, period, count),
694
+ lambda: _kline_finnhub(symbol, period, count),
695
+ lambda: _kline_longbridge(symbol, period, count),
696
+ lambda: _kline_alphavantage(symbol, period, count),
697
+ label=f"kline:{symbol}",
698
+ )
676
699
 
677
700
 
678
701
  def cmd_kline(args):
@@ -691,15 +714,46 @@ def cmd_kline(args):
691
714
 
692
715
 
693
716
  def quote_a(symbol: str) -> dict:
694
- """A-share quote with failover: akshare → tushare → efinance → pytdx."""
695
- return _failover(
696
- [
697
- ("akshare", lambda: _quote_akshare(symbol)),
698
- ("tushare", lambda: _quote_tushare(symbol)),
699
- ("efinance", lambda: _quote_efinance(symbol)),
700
- ("pytdx", lambda: _quote_pytdx(symbol)),
701
- ],
702
- label=f"quote_a:{symbol}",
717
+ """A-share quote with failover: akshare → tushare → efinance → pytdx. ETFs try fund spot first."""
718
+ sources = []
719
+ if normalize_stock_code(symbol)["is_etf"]:
720
+ sources.append(("akshare_etf", lambda: _quote_akshare_etf(symbol)))
721
+ sources += [
722
+ ("akshare", lambda: _quote_akshare(symbol)),
723
+ ("tushare", lambda: _quote_tushare(symbol)),
724
+ ("efinance", lambda: _quote_efinance(symbol)),
725
+ ("pytdx", lambda: _quote_pytdx(symbol)),
726
+ ]
727
+ return _failover(sources, label=f"quote_a:{symbol}")
728
+
729
+
730
+ def _quote_akshare_etf(symbol: str) -> dict:
731
+ """A-share ETF realtime quote via akshare fund_etf_spot_em."""
732
+ import akshare as ak
733
+
734
+ df = _akshare_retry(ak.fund_etf_spot_em)
735
+ row = df[df["代码"] == symbol]
736
+ if row.empty:
737
+ raise ValueError(f"ETF {symbol} not found in akshare fund spot")
738
+ r = row.iloc[0]
739
+ return _clean_row(
740
+ {
741
+ "symbol": symbol,
742
+ "name": r.get("名称"),
743
+ "price": r.get("最新价"),
744
+ "change": r.get("涨跌额"),
745
+ "change_pct": r.get("涨跌幅"),
746
+ "volume": r.get("成交量"),
747
+ "turnover": r.get("成交额"),
748
+ "high": r.get("最高价"),
749
+ "low": r.get("最低价"),
750
+ "open": r.get("开盘价"),
751
+ "prev_close": r.get("昨收"),
752
+ "market_cap": r.get("总市值"),
753
+ "turnover_rate": r.get("换手率"),
754
+ "volume_ratio": r.get("量比"),
755
+ "is_etf": True,
756
+ }
703
757
  )
704
758
 
705
759
 
@@ -788,15 +842,15 @@ def _quote_finnhub(symbol: str) -> dict:
788
842
 
789
843
 
790
844
  def quote_yf(symbol: str) -> dict:
791
- """HK/US quote with failover: yfinance → finnhub → longbridge → alphavantage (US only)."""
792
- sources = [
793
- ("yfinance", lambda: _quote_yfinance(symbol)),
794
- ("finnhub", lambda: _quote_finnhub(symbol)),
795
- ("longbridge", lambda: _quote_longbridge(symbol)),
796
- ]
797
- if detect_market(symbol) == "US":
798
- sources.append(("alphavantage", lambda: _quote_alphavantage(symbol)))
799
- return _failover(sources, label=f"quote:{symbol}")
845
+ """HK/US/JP/KR/TW quote. Failover: yfinance → finnhub/longbridge (HK/US) → alphavantage (US only)."""
846
+ return _yf_failover(
847
+ symbol,
848
+ lambda: _quote_yfinance(symbol),
849
+ lambda: _quote_finnhub(symbol),
850
+ lambda: _quote_longbridge(symbol),
851
+ lambda: _quote_alphavantage(symbol),
852
+ label=f"quote:{symbol}",
853
+ )
800
854
 
801
855
 
802
856
  def cmd_quote(args):
@@ -1168,6 +1222,15 @@ def cmd_market_snapshot(args):
1168
1222
 
1169
1223
  # --------------- market_indices ---------------
1170
1224
 
1225
+ # region -> {index symbol -> display name}; CN is handled separately via akshare.
1226
+ _REGION_INDEX_SYMBOLS = {
1227
+ "hk": {"^HSI": "恒生指数", "^HSCE": "恒生国企指数", "^HSTECH": "恒生科技指数"},
1228
+ "us": {"^DJI": "道琼斯", "^IXIC": "纳斯达克", "^GSPC": "标普500", "^RUT": "罗素2000"},
1229
+ "jp": {"^N225": "日经225", "^TOPX": "东证指数"},
1230
+ "kr": {"^KS11": "韩国KOSPI", "^KQ11": "韩国KOSDAQ"},
1231
+ "tw": {"^TWII": "台湾加权指数"},
1232
+ }
1233
+
1171
1234
 
1172
1235
  def cmd_market_indices(args):
1173
1236
  region = args.region.lower()
@@ -1212,13 +1275,10 @@ def cmd_market_indices(args):
1212
1275
  )
1213
1276
  )
1214
1277
  return results
1215
- elif region in ("hk", "us"):
1278
+ elif region in _REGION_INDEX_SYMBOLS:
1216
1279
  import yfinance as yf
1217
1280
 
1218
- if region == "hk":
1219
- symbols = {"^HSI": "恒生指数", "^HSCE": "恒生国企指数", "^HSTECH": "恒生科技指数"}
1220
- else:
1221
- symbols = {"^DJI": "道琼斯", "^IXIC": "纳斯达克", "^GSPC": "标普500", "^RUT": "罗素2000"}
1281
+ symbols = _REGION_INDEX_SYMBOLS[region]
1222
1282
  results = []
1223
1283
  for sym, name in symbols.items():
1224
1284
  try:
@@ -1610,7 +1670,7 @@ def main():
1610
1670
  p_snap.add_argument("--market", default="A", choices=["A", "HK", "US"])
1611
1671
 
1612
1672
  p_idx = sub.add_parser("market_indices")
1613
- p_idx.add_argument("--region", default="cn", choices=["cn", "hk", "us"])
1673
+ p_idx.add_argument("--region", default="cn", choices=["cn", "hk", "us", "jp", "kr", "tw"])
1614
1674
 
1615
1675
  p_sec = sub.add_parser("sector_rankings")
1616
1676
  p_sec.add_argument("--top", type=int, default=10)