hamuna-quant-cli 0.1.0__tar.gz → 0.1.1__tar.gz

{hamuna_quant_cli-0.1.0 → hamuna_quant_cli-0.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hamuna-quant-cli
-Version: 0.1.0
+Version: 0.1.1
 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.0 → hamuna_quant_cli-0.1.1}/hamuna_quant_cli/__init__.py

@@ -14,4 +14,4 @@ from __future__ import annotations
 
 # 版本号由 scripts/bump_version.py 每次 build 自动更新 (基于 git 提交数).
 # 格式: 0.1.0.dev<git提交数> (PEP 440). 手动改这里会被下一次 build 覆盖.
-__version__ = "0.1.0"
+__version__ = "0.1.1"

{hamuna_quant_cli-0.1.0 → hamuna_quant_cli-0.1.1}/hamuna_quant_cli/__main__.py

@@ -800,6 +800,9 @@ def cmd_live_run(args) -> int:
         return 3
     try:
         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
+        # 只取 strategy_params 段 (schema 顶层: backtest / strategy_params / risk_config / meta)
+        sp = (params or {}).get("strategy_params")
         run_live(
             spec,
             mode=args.mode,
@@ -812,6 +815,7 @@ def cmd_live_run(args) -> int:
             log_file=args.log_file,
             market_broker=args.market_broker,
             replay_days=args.replay_days,
+            params=sp if isinstance(sp, dict) else None,
         )
     except LiveRunError as e:
         print(f"[error] live run 失败: {e}", file=sys.stderr)
@@ -950,6 +954,8 @@ def build_parser() -> argparse.ArgumentParser:
                        help="独立行情 broker (e.g. qmt_market)")
     run_p.add_argument("--symbols", default=None,
                        help="标的列表, 逗号分隔")
+    run_p.add_argument("--params", default=None,
+                       help="params.json 路径 (固定 schema, strategy_params 段作策略构造参数)")
     run_p.add_argument("--duration", default="1h",
                        help="运行时长 (akquant 解析)")
     run_p.add_argument("--class-name", default="Strategy",

{hamuna_quant_cli-0.1.0 → hamuna_quant_cli-0.1.1}/hamuna_quant_cli/live/runner.py

@@ -279,17 +279,30 @@ def configure_logging(level: str, log_file: Path | None) -> None:
     akquant.configure_logging(LogConfig(**cfg_kwargs))
 
 
-def _with_live_history_depth(cls: type) -> type:
+def _with_live_history_depth(cls: type, params: dict | 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.
 
+    params: 用户实盘参数 (params.json strategy_params) — 作构造 kwargs 注入.
+    live 端 _build_strategy_instance 是 `cls()` 无参实例化, 不传的话 Strategy.__new__
+    走 `model_cls()` 空模型, 用户配置的参数不生效 (2026-08-25 实测缺口).
+    注入必须盖 `__new__`: Strategy 的参数入口在 __new__ 末尾 `model_cls(**kwargs)`,
+    盖 __init__ 传 kwargs 不回灌给已结束的 __new__ (无参构造时 params 丢失).
+
     ponytail: 只包 class mode; functional mode 用户自己管 get_history (ctx 侧).
     """
     from typing import Any as _Any
 
     class _Wrapped(cls):
+        _user_params: dict = params or {}
+
+        def __new__(cls, *a: _Any, **kw: _Any) -> _Any:
+            merged = dict(cls._user_params)
+            merged.update(kw)
+            return super().__new__(cls, *a, **merged)
+
         def on_start(self) -> _Any:
             ret = super().on_start()
             depth = getattr(self, "warmup_period", None) or 120
@@ -345,6 +358,7 @@ def run_live(
     log_file: Path | None,
     market_broker: str | None,
     replay_days: int = 30,
+    params: dict | None = None,
 ) -> None:
     """翻译 + 转发到 akquant.run_live.
 
@@ -358,6 +372,8 @@ def run_live(
     duration:    字符串 ("30s" / "1h" / "2d"), akquant 自己解析
     gateway_options_raw:  CLI 字符串, parse 成 dict 后透传
     initial_cash: 回传给 run_live (None = akquant 默认)
+    params:      params.json 的 strategy_params (用户实盘配置) — 校验后作构造
+                 kwargs 注入策略. None = 用策略代码内默认值.
     """
     gateway_options = parse_kv_pairs(gateway_options_raw)
     duration = _live_safety_defaults(mode, broker, gateway_options, duration)
@@ -555,7 +571,19 @@ def run_live(
 
     # class mode vs functional mode — run_live 入参不同
     if spec.mode == "class":
-        kwargs["strategy_cls"] = _with_live_history_depth(spec.strategy_cls)
+        # params.json 用户配置 → 校验 (未知字段/越界抛 LiveRunError) + 注入构造 kwargs.
+        # live 端 _build_strategy_instance 是 `cls()` 无参实例化, 必须在包装类里把
+        # params 传进 __new__ → ParamModel(**kwargs) 才生效 (2026-08-25 实测缺口).
+        sp = None
+        if params:
+            try:
+                from akquant import validate_strategy_params
+                sp = validate_strategy_params(spec.strategy_cls, params)
+            except Exception as e:
+                raise LiveRunError(
+                    f"params.json 校验失败 (strategy_params 与 IntParam/ListParam 字段不符): {e}"
+                ) from e
+        kwargs["strategy_cls"] = _with_live_history_depth(spec.strategy_cls, sp)
     else:
         cbs = spec.callbacks or {}
         kwargs["strategy_cls"] = cbs["on_bar"]

{hamuna_quant_cli-0.1.0 → hamuna_quant_cli-0.1.1}/hamuna_quant_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hamuna-quant-cli
-Version: 0.1.0
+Version: 0.1.1
 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.0 → hamuna_quant_cli-0.1.1}/pyproject.toml

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