hamuna-quant-cli 0.1.6__tar.gz → 0.1.8__tar.gz

{hamuna_quant_cli-0.1.6 → hamuna_quant_cli-0.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hamuna-quant-cli
-Version: 0.1.6
+Version: 0.1.8
 Summary: Hamuna A 股回测 + 实盘统一 CLI (akquant 0.3.x). 替代 v1 自建 driver + QMT-style 策略规范.
 Author-email: Hamuna Team <team@hamuna.example>
 License: MIT

{hamuna_quant_cli-0.1.6 → hamuna_quant_cli-0.1.8}/hamuna_quant_cli/__init__.py

@@ -12,4 +12,4 @@ server (13-key metrics schema). 全部走 akquant 0.3.x 引擎.
 """
 from __future__ import annotations
 
-__version__ = "0.1.6"
+__version__ = "0.1.7"

{hamuna_quant_cli-0.1.6 → hamuna_quant_cli-0.1.8}/hamuna_quant_cli/__main__.py

@@ -30,6 +30,37 @@ def _load_config(path: str) -> dict:
     return json.loads(Path(path).read_text(encoding="utf-8"))
 
 
+def _load_params_arg(arg: str) -> dict | None:
+    """Round 18.48+: --params 既支持 inline JSON (以 '{' 开头) 又支持文件路径.
+
+    历史 CLI / 回测脚本传文件路径 (`hamuna_quant_cli run --params ./params.json`).
+    desktop Rust 调 live run 时通过 `read_to_string` 把 `<name>.params.json` 读成
+    String 后 inline 传过来 (`--params '<json>'`), 旧 cli 把 inline 当文件路径
+    直接 `Path.read_text()` → FileNotFoundError (本轮 bug 报告).
+
+    协议: 以 '{' (允许前导空白) 开头 → inline JSON parse; 否则 → 文件路径 read.
+    Caller 决定 None vs raise: cmd_commit 容忍 None + 走 schema warning,
+    cmd_live_run 期望非空否则 raise FileNotFoundError.
+    """
+    if not arg:
+        return None
+    stripped = arg.lstrip()
+    if stripped.startswith("{"):
+        import json as _json
+        try:
+            return _json.loads(arg)
+        except _json.JSONDecodeError as e:
+            raise ValueError(f"--params inline JSON 解析失败: {e}") from e
+    p = Path(arg)
+    if not p.exists():
+        raise FileNotFoundError(f"--params 不存在: {arg}")
+    import json as _json
+    try:
+        return _json.loads(p.read_text(encoding="utf-8"))
+    except _json.JSONDecodeError as e:
+        raise ValueError(f"--params 解析失败: {arg} ({e})") from e
+
+
 def _parse_symbols(s: str) -> list[str]:
     """CSV symbols → 裸码 list (A 股 dataset stockCode 不带 .SH/.SZ/.BJ 后缀)."""
     out: list[str] = []
@@ -72,18 +103,17 @@ def cmd_run(args) -> int:
     # --params (params.json 固定 schema) → strategy_params 段注入 cfg,
     # akquant_runner 展开注入 engine kwargs. 与 `live run --params` 同源:
     # 同一份 params.json 驱动回测 + 实盘, 参数约定不再分裂 (Round 18.13).
+    # Round 18.48+: 既支持文件路径也支持 inline JSON (见 _load_params_arg).
     if getattr(args, "params", None):
-        params_path = Path(args.params)
-        if not params_path.exists():
-            print(f"--params 不存在: {args.params}", file=sys.stderr)
-            return 2
-        import json as _json
         try:
-            params_doc = _json.loads(params_path.read_text(encoding="utf-8"))
-        except _json.JSONDecodeError as e:
-            print(f"--params 解析失败: {args.params} ({e})", file=sys.stderr)
+            params_doc = _load_params_arg(args.params) or {}
+        except FileNotFoundError as e:
+            print(f"--params 不存在: {e}", file=sys.stderr)
             return 2
-        sp = (params_doc or {}).get("strategy_params")
+        except ValueError as e:
+            print(f"--params 解析失败: {e}", file=sys.stderr)
+            return 2
+        sp = params_doc.get("strategy_params")
         if isinstance(sp, dict):
             cfg["strategy_params"] = sp
         else:
@@ -91,7 +121,7 @@ def cmd_run(args) -> int:
         # Round 18.14: risk_config 段 → cfg['risk_config'] → runner 透传
         # run_backtest(risk_config={"max_position_pct": 0.1}) 原生消费 (账户级风控,
         # 引擎 hasattr 校验 + 未知字段仅 warning). skill 桌面编辑的实盘风控真正生效.
-        rc = (params_doc or {}).get("risk_config")
+        rc = params_doc.get("risk_config")
         if isinstance(rc, dict):
             # 与既有 cfg['risk_config'] 合并 (显式 cfg 优先)
             merged = dict(cfg.get("risk_config") or {})
@@ -814,9 +844,13 @@ def cmd_live_run(args) -> int:
         print(f"[error] strategy.py 加载失败: {e}", file=sys.stderr)
         return 3
     try:
-        import json as _json
         symbols = [s.strip() for s in args.symbols.split(",")] if args.symbols else None
-        params = _json.loads(Path(args.params).read_text(encoding="utf-8")) if args.params else None
+        # Round 18.48+: --params 既支持 inline JSON 也支持文件路径 (desktop rust read_to_string 传 inline)
+        try:
+            params = _load_params_arg(args.params) if args.params else None
+        except (FileNotFoundError, ValueError) as e:
+            print(f"[error] --params: {e}", file=sys.stderr)
+            return 2
         # 只取 strategy_params 段 (schema 顶层: backtest / strategy_params / risk_config / meta)
         sp = (params or {}).get("strategy_params")
         run_live(

{hamuna_quant_cli-0.1.6 → hamuna_quant_cli-0.1.8}/hamuna_quant_cli/live/runner.py

@@ -282,10 +282,10 @@ def configure_logging(level: str, log_file: Path | None) -> None:
 def _with_live_history_depth(
     cls: type, params: dict | None = None, calendar: list[str] | None = None
 ) -> type:
-    """class mode 注入 set_history_depth + 交易日历重排定时器 — live 引擎不像回测
-    (engine.py:4637) 那样自动开 history tracking, 策略 on_bar 里 get_history 直接抛
-    "History tracking is not enabled" (2026-08-19 实测). depth 取策略 on_start 设的
-    warmup_period, 未设默认 120.
+    """class mode 注入 set_history_depth + 交易日历重排定时器 + 5 类日志 hook — live
+    引擎不像回测 (engine.py:4637) 那样自动开 history tracking, 策略 on_bar 里
+    get_history 直接抛 "History tracking is not enabled" (2026-08-19 实测). depth
+    取策略 on_start 设的 warmup_period, 未设默认 120.
 
     calendar: 真实交易日列表 (YYYY-MM-DD, 从 bars_df / bridge 历史提取). 非空时
     wrapper 在 on_start 里按日历注册周五 14:55 的 schedule() 定时器 (payload
@@ -299,6 +299,20 @@ def _with_live_history_depth(
     末尾 `model_cls(**kwargs)`, 盖 __init__ 传 kwargs 不回灌 — 2026-08-25
     实测缺口), 因此 wrapper 保留 `__new__` override 做 params 注入.
 
+    5 类日志 hook (Round 18.55, 适应任何 class-mode 策略, 不改用户代码):
+    - [on_bar_entry]   替代 [signal_calc] — 每次 on_bar / on_tick 入口自动打
+                       (含 sym / price / bar timestamp), 取代用户策略里手写
+                       "我正在计算 MA5/MA20" 的样板. 用户策略内部指标计算仍可
+                       用 self.log('[signal_calc] ma_fast=X ma_slow=Y') 加细节.
+    - [signal_trigger] on_order 触发前自动打 (side/sym/qty/price), 替代用户
+                       自己写 "我要下单了" — 这是 risk_check / pos_check /
+                       capital_check 通过后才触发, 所以 [signal_trigger] 出现 =
+                       风控放行.
+    - [signal_filled]  on_trade 回调自动打 (sym/qty/price), 等同成交回报.
+    - [risk_check] / [pos_check] / [capital_check] 由用户自己写 self.log(...)
+      (看不到 user 内部逻辑, wrapper 没法自动打; 例见 example_strategy.py
+      Round 18.52 的 _risk_check + 5 tick 节流).
+
     ponytail: 只包 class mode; functional mode 用户自己管 get_history (ctx 侧).
     日历定时器只覆盖周五重排; 非周五策略自己 on_timer 空转.
     """
@@ -338,6 +352,57 @@ def _with_live_history_depth(
                 print(f"[warn] set_history_depth({depth}) 失败: {e}", flush=True)
             return ret_val
 
+        # ========== Round 18.55 5 类日志 hook ==========
+        # hook 在 super().xxx 调用前后自动打, 不破坏 user 的 on_bar / on_tick 逻辑.
+        # 用 try/except 包住 user 抛出的异常 — wrapper 的 log 失败不能让策略崩.
+
+        def on_bar(self, bar: _Any) -> _Any:  # type: ignore[override]
+            try:
+                sym = getattr(bar, "symbol", "?")
+                ts = getattr(bar, "timestamp", 0)
+                close = float(getattr(bar, "close", 0.0) or 0.0)
+                from datetime import datetime as _dt2
+                ts_str = _dt2.fromtimestamp(ts / 1e9).strftime("%H:%M") if ts else "?"
+                print(f"[on_bar_entry] sym={sym} close={close:.3f} ts={ts_str}",
+                      flush=True)
+            except Exception:  # noqa: BLE001
+                pass
+            return super().on_bar(bar)
+
+        def on_tick(self, tick: _Any) -> _Any:  # type: ignore[override]
+            try:
+                sym = getattr(tick, "symbol", "?")
+                price = float(getattr(tick, "price", 0.0) or 0.0)
+                print(f"[on_tick_entry] sym={sym} price={price:.3f}", flush=True)
+            except Exception:  # noqa: BLE001
+                pass
+            return super().on_tick(tick)
+
+        def on_order(self, order: _Any) -> _Any:  # type: ignore[override]
+            try:
+                side = getattr(order, "side", "?")
+                sym = getattr(order, "symbol", "?")
+                qty = int(getattr(order, "quantity", 0) or 0)
+                price = float(getattr(order, "price", 0.0) or 0.0)
+                print(f"[signal_trigger] side={side} sym={sym} qty={qty} "
+                      f"price={price:.3f} (风控/持仓/资金 已通过)",
+                      flush=True)
+            except Exception:  # noqa: BLE001
+                pass
+            return super().on_order(order)
+
+        def on_trade(self, trade: _Any) -> _Any:  # type: ignore[override]
+            try:
+                sym = getattr(trade, "symbol", "?")
+                qty = int(getattr(trade, "quantity", 0) or 0)
+                price = float(getattr(trade, "price", 0.0) or 0.0)
+                side = getattr(trade, "side", "?")
+                print(f"[signal_filled] side={side} sym={sym} qty={qty} "
+                      f"price={price:.3f}", flush=True)
+            except Exception:  # noqa: BLE001
+                pass
+            return super().on_trade(trade)
+
     _Wrapped.__name__ = cls.__name__
     _Wrapped.__qualname__ = cls.__qualname__
     return _Wrapped

{hamuna_quant_cli-0.1.6 → hamuna_quant_cli-0.1.8}/hamuna_quant_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hamuna-quant-cli
-Version: 0.1.6
+Version: 0.1.8
 Summary: Hamuna A 股回测 + 实盘统一 CLI (akquant 0.3.x). 替代 v1 自建 driver + QMT-style 策略规范.
 Author-email: Hamuna Team <team@hamuna.example>
 License: MIT

{hamuna_quant_cli-0.1.6 → hamuna_quant_cli-0.1.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "hamuna-quant-cli"
-version = "0.1.6"
+version = "0.1.8"
 description = "Hamuna A 股回测 + 实盘统一 CLI (akquant 0.3.x). 替代 v1 自建 driver + QMT-style 策略规范."
 readme = "hamuna_quant_cli/README.md"
 requires-python = ">=3.10"