dragon-quant 0.2.2__tar.gz → 0.2.3__tar.gz

{dragon_quant-0.2.2 → dragon_quant-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dragon-quant
-Version: 0.2.2
+Version: 0.2.3
 Summary: 龙头战法四维量化筛选系统 — A股涨停板龙头识别工具
 Author: gitBingxu
 License-Expression: MIT
@@ -138,6 +138,25 @@ dragon-quant data batch-quote --codes 600172,000001,002409
 dragon-quant data cookie-status    # 查看 Cookie 状态
 dragon-quant data cookie-fetch     # 刷新全部 Cookie
 dragon-quant data cookie-fetch --source xueqiu  # 只刷新雪球
+
+# 手动设置 Cookie（推荐兜底方案）
+# 适用场景：Playwright 自动获取失败/被风控；或你已经在浏览器里抓到了可用 Cookie。
+#
+# 1) 从浏览器开发者工具（Network）里复制请求头中的 Cookie（整段）
+# 2) 写入本地（注意：Cookie 属于敏感信息，请勿提交到仓库/群聊）
+
+# 设置东财 Cookie
+python3 -m dragon_quant.providers.cookie set --source em --cookie 'qgqp_b_id=...; st_nvi=...; nid18=...'
+
+# 设置雪球 Cookie
+python3 -m dragon_quant.providers.cookie set --source xq --cookie 'xq_a_token=...; xq_is_login=1; u=...'
+
+# 查看是否生效
+python3 -m dragon_quant.providers.cookie status --show
+
+# Cookie 文件默认位置（macOS）
+# ~/Library/Application Support/dragon-quant/cookies/eastmoney
+# ~/Library/Application Support/dragon-quant/cookies/xueqiu
 ```
 
 ### `review` — 龙头回测

{dragon_quant-0.2.2 → dragon_quant-0.2.3}/README.md

@@ -119,6 +119,25 @@ dragon-quant data batch-quote --codes 600172,000001,002409
 dragon-quant data cookie-status    # 查看 Cookie 状态
 dragon-quant data cookie-fetch     # 刷新全部 Cookie
 dragon-quant data cookie-fetch --source xueqiu  # 只刷新雪球
+
+# 手动设置 Cookie（推荐兜底方案）
+# 适用场景：Playwright 自动获取失败/被风控；或你已经在浏览器里抓到了可用 Cookie。
+#
+# 1) 从浏览器开发者工具（Network）里复制请求头中的 Cookie（整段）
+# 2) 写入本地（注意：Cookie 属于敏感信息，请勿提交到仓库/群聊）
+
+# 设置东财 Cookie
+python3 -m dragon_quant.providers.cookie set --source em --cookie 'qgqp_b_id=...; st_nvi=...; nid18=...'
+
+# 设置雪球 Cookie
+python3 -m dragon_quant.providers.cookie set --source xq --cookie 'xq_a_token=...; xq_is_login=1; u=...'
+
+# 查看是否生效
+python3 -m dragon_quant.providers.cookie status --show
+
+# Cookie 文件默认位置（macOS）
+# ~/Library/Application Support/dragon-quant/cookies/eastmoney
+# ~/Library/Application Support/dragon-quant/cookies/xueqiu
 ```
 
 ### `review` — 龙头回测

dragon_quant-0.2.3/dragon_quant/_version.py

@@ -0,0 +1 @@
+__version__ = "0.2.3"

{dragon_quant-0.2.2 → dragon_quant-0.2.3}/dragon_quant/cli.py

@@ -7,6 +7,7 @@ CLI 入口 — dragon-quant 命令行工具
   dragon-quant data {sector,components,kline,minute,quote,batch-quote} [options]
   dragon-quant review [--date DATE] [--top N] [--force]
   dragon-quant storage {status,size,clear} [options]
+  dragon-quant fix-api [--provider eastmoney] [--show-browser]
 """
 
 import argparse
@@ -222,6 +223,12 @@ def _cmd_review_ui(args):
     start_server(port=args.port, open_browser=not args.no_browser)
 
 
+def _cmd_fix_api(args):
+    """修复 API 配置命令"""
+    from dragon_quant.fix_api import fix_api
+    fix_api(provider=args.fix_provider, headless=not args.show_browser)
+
+
 def _cmd_storage(args):
     """存储管理命令"""
     mgr = StorageManager()
@@ -388,6 +395,13 @@ def main():
     clear_p.add_argument("--logs", action="store_true", help="清理日志")
     clear_p.add_argument("--days", type=int, default=None, help="保留最近N天")
 
+    # fix-api 子命令
+    fix_p = sub.add_parser("fix-api", help="从目标网站自动捕获并修复 API 配置")
+    fix_p.add_argument("--provider", dest="fix_provider", default="eastmoney",
+                       choices=["eastmoney"], help="要修复的 provider (默认: eastmoney)")
+    fix_p.add_argument("--show-browser", action="store_true",
+                       help="显示浏览器窗口 (默认无头运行)")
+
     args = parser.parse_args()
 
     if args.command == "scan":
@@ -400,6 +414,8 @@ def main():
         _cmd_storage(args)
     elif args.command == "review":
         _cmd_review(args)
+    elif args.command == "fix-api":
+        _cmd_fix_api(args)
 
     else:
         parser.print_help()

dragon_quant-0.2.3/dragon_quant/config/__init__.py

@@ -0,0 +1,4 @@
+"""
+配置管理 — API 请求模板持久化与回退
+"""
+

dragon_quant-0.2.3/dragon_quant/config/api_config.py

@@ -0,0 +1,173 @@
+"""
+API 请求模板 — 持久化配置管理
+
+每个 provider 下的每个 endpoint 对应一个 RequestTemplate，
+封装请求 URL 拼接和 Header 构建。
+
+配置存储路径: {DATA_DIR}/config/api_config.json
+"""
+
+import json
+import os
+import threading
+from dataclasses import dataclass, field
+from typing import Optional
+
+import urllib.parse
+import time
+
+from dragon_quant.storage.paths import DATA_DIR
+
+CONFIG_DIR = DATA_DIR / "config"
+CONFIG_PATH = CONFIG_DIR / "api_config.json"
+
+CONFIG_VERSION = "1"
+
+
+@dataclass
+class RequestTemplate:
+    base: str
+    path: str
+    fixed_params: dict = field(default_factory=dict)
+    headers: dict = field(default_factory=dict)
+    referer: str = ""
+
+    def build_url(self, **dynamic_params) -> str:
+        params = {**self.fixed_params, **dynamic_params}
+        if "cb" not in params:
+            # 尽量对齐东财前端 JSONP callback 命名，降低风控概率
+            # 形如：jQuery112307663912278618489_1780992936600
+            # 注：callback 名称不会影响我们 _parse_jsonp 的解析。
+            ts = int(time.time() * 1000)
+            pseudo_rand = int(str(ts)[-6:]) * 123457  # 仅用于仿真格式，无安全意义
+            params["cb"] = f"jQuery{pseudo_rand}_{ts}"
+        if "_" not in params:
+            params["_"] = str(int(time.time() * 1000))
+        qs = urllib.parse.urlencode(params)
+        return f"{self.base}{self.path}?{qs}"
+
+    def build_headers(self, referer: str = "", cookie: str = "") -> dict:
+        headers = {}
+        if self.headers:
+            headers.update(self.headers)
+        if referer or self.referer:
+            headers["Referer"] = referer or self.referer
+        if cookie:
+            headers["Cookie"] = cookie
+        return headers
+
+
+def _ensure_config_dir():
+    CONFIG_DIR.mkdir(parents=True, exist_ok=True)
+
+
+def load_templates(provider: str) -> Optional[dict[str, RequestTemplate]]:
+    if not CONFIG_PATH.exists():
+        return None
+    try:
+        with open(CONFIG_PATH) as f:
+            data = json.load(f)
+        provider_data = data.get(provider, {})
+        if not provider_data:
+            return None
+        templates = {}
+        for ep_name, ep_cfg in provider_data.items():
+            templates[ep_name] = RequestTemplate(
+                base=ep_cfg["base"],
+                path=ep_cfg["path"],
+                fixed_params=ep_cfg.get("fixed_params", {}),
+                headers=ep_cfg.get("headers", {}),
+                referer=ep_cfg.get("referer", ""),
+            )
+        return templates
+    except Exception:
+        return None
+
+
+def save_templates(provider: str, templates: dict[str, RequestTemplate]):
+    _ensure_config_dir()
+    existing = {}
+    if CONFIG_PATH.exists():
+        try:
+            with open(CONFIG_PATH) as f:
+                existing = json.load(f)
+        except Exception:
+            existing = {}
+    existing.setdefault("version", CONFIG_VERSION)
+    provider_data = {}
+    for name, tpl in templates.items():
+        provider_data[name] = {
+            "base": tpl.base,
+            "path": tpl.path,
+            "fixed_params": tpl.fixed_params,
+            "headers": tpl.headers,
+            "referer": tpl.referer,
+        }
+    existing[provider] = provider_data
+    tmp_path = CONFIG_PATH.with_suffix(".tmp")
+    with open(tmp_path, "w") as f:
+        json.dump(existing, f, ensure_ascii=False, indent=2)
+    os.replace(tmp_path, CONFIG_PATH)
+
+
+def save_single_template(provider: str, endpoint: str, tpl: RequestTemplate):
+    existing = {}
+    if CONFIG_PATH.exists():
+        try:
+            with open(CONFIG_PATH) as f:
+                existing = json.load(f)
+        except Exception:
+            existing = {}
+    existing.setdefault("version", CONFIG_VERSION)
+    existing.setdefault(provider, {})
+    existing[provider][endpoint] = {
+        "base": tpl.base,
+        "path": tpl.path,
+        "fixed_params": tpl.fixed_params,
+        "headers": tpl.headers,
+        "referer": tpl.referer,
+    }
+    _ensure_config_dir()
+    tmp_path = CONFIG_PATH.with_suffix(".tmp")
+    with open(tmp_path, "w") as f:
+        json.dump(existing, f, ensure_ascii=False, indent=2)
+    os.replace(tmp_path, CONFIG_PATH)
+
+
+def hardcoded_templates(provider: str) -> dict[str, RequestTemplate]:
+    if provider == "eastmoney":
+        return {
+            "sector_ranking": RequestTemplate(
+                base="https://push2.eastmoney.com",
+                path="/webguest/api/qt/clist/get",
+                fixed_params={
+                    "np": "1", "fltt": "1", "invt": "2",
+                    "timil": "1", "dect": "1", "wbp2u": "|0|0|0|web",
+                },
+                headers={},
+                referer="https://quote.eastmoney.com/center/hsbk.html",
+            ),
+            "sector_components": RequestTemplate(
+                base="https://push2.eastmoney.com",
+                path="/api/qt/clist/get",
+                fixed_params={
+                    "np": "1", "fltt": "2", "invt": "2",
+                    "dect": "1",
+                },
+                headers={},
+                referer="https://quote.eastmoney.com/center/gridlist.html",
+            ),
+            "sector_5min_kline": RequestTemplate(
+                base="https://push2his.eastmoney.com",
+                path="/api/qt/stock/kline/get",
+                fixed_params={
+                    "fqt": "1",
+                    "beg": "0",
+                    "end": "20500101",
+                    "smplmt": "460",
+                },
+                headers={},
+                referer="https://quote.eastmoney.com/bk/90.{code}.html",
+            ),
+        }
+    return {}

{dragon_quant-0.2.2 → dragon_quant-0.2.3}/dragon_quant/data.py

@@ -81,17 +81,27 @@ def get_sector_ranking(asc: bool = False) -> list[SectorPerformance]:
     return em.get_sector_ranking(asc=asc)
 
 
-def get_sector_components(sector_code: str) -> list[StockInfo]:
+def get_sector_components(sector_code: str, page: int = 1,
+                          all_pages: bool = False,
+                          page_size: int = 50) -> list[StockInfo]:
     """获取概念板块成分股列表（按涨跌幅降序）
 
     Args:
         sector_code: 板块代码，如 "BK0487"
+        page: 页码（默认第一页）
+        all_pages: 是否自动拉取全量分页
+        page_size: 每页大小
     Returns:
         list[StockInfo] 成分股列表
     """
     providers = _get_providers()
     em = providers["eastmoney"]
-    return em.get_sector_components(sector_code)
+    return em.get_sector_components(
+        sector_code,
+        page=page,
+        all_pages=all_pages,
+        page_size=page_size,
+    )
 
 
 def get_sector_5min_kline(sector_code: str, bars: int = 100) -> list[KBar]: