hamuna-quant-cli 0.1.20__tar.gz → 0.1.22__tar.gz

{hamuna_quant_cli-0.1.20 → hamuna_quant_cli-0.1.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hamuna-quant-cli
-Version: 0.1.20
+Version: 0.1.22
 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.20 → hamuna_quant_cli-0.1.22}/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.20"
+__version__ = "0.1.22"

{hamuna_quant_cli-0.1.20 → hamuna_quant_cli-0.1.22}/hamuna_quant_cli/live/qmt_market.py

@@ -177,16 +177,16 @@ def _make_market_gateway() -> Any:
                 self._tick_callback(raw)
 
         def _emit_bar(self, raw: dict[str, Any]) -> None:
-            # Round 18.63.3: bar 时间戳按 period 真实递增 — wall-clock time_ns()
-            # 在批量推送 (SSE batch / warmup 20 根) 时几乎相同, live feed 按
-            # 时间戳去重/聚合 (同刻 bar 只保留一根) → 交付给策略的 bar 数远少于
-            # 推送数 → warmup_period (30) 永远攒不满 → on_bar 永不触发.
-            # 修: 每根 bar ts = max(prev + period_ns, wall-clock), 保证唯一递增且
-            # 晚于 session 启动 (第一个 bar 用墙钟, 天然 > active_start).
-            period_ns = _period_ns(self._period)
+            # Round 18.63.15: ts 用真实墙钟 (max(now, last+1ns)) — 之前 Round
+            # 18.63.3 用 max(now, last+period_ns) 造"假递增日期", SSE 每秒推同一根
+            # 当日 bar (time=00:00, volume 变) 时每根 +1 天 → 策略日期跳到未来
+            # (2026-10/11 月), %H:%M 恒为启动时刻 — 用户实测报告 (11:02 恒不变).
+            # 修: ts = max(now_ns, last_ns + 1) — 唯一递增 (流式每秒 1 根时墙钟
+            # 天然不同; 批量推送时 +1ns 防碰撞), 日期 = 当天, %H:%M 随墙钟走.
+            # QMT 真实 bar 时间 (epoch ms) 仍在 bar.extra['qmt_time_ms'] 可取.
             now_ns = time.time_ns()
             last_ns = getattr(self, "_last_bar_ts_ns", 0)
-            ts_ns = max(now_ns, last_ns + period_ns) if last_ns else now_ns
+            ts_ns = max(now_ns, last_ns + 1) if last_ns else now_ns
             self._last_bar_ts_ns = ts_ns
             bar_obj = _to_bar_obj(raw, ts_ns=ts_ns)
             if self._feed is not None:
@@ -606,23 +606,6 @@ def _unwrap_envelope(resp: dict[str, Any]) -> Any:
     return resp.get("value", resp)
 
 
-def _period_ns(period: str) -> int:
-    """QMT period 字符串 → 单根 bar 的名义时长 (ns). 用于 _emit_bar 时间戳递增.
-
-    Round 18.63.3: live feed 按时间戳去重/聚合, 同刻多根 bar 只保留一根 →
-    批量推送攒不满 warmup_period → on_bar 永不触发. 修: bar ts 按 period 真实
-    递增, 保证每根唯一. 无法识别时退回 1 分钟 (保守, 避免未来戳).
-    """
-    p = str(period or "").strip().lower()
-    table = {
-        "1m": 60, "5m": 300, "15m": 900, "30m": 1800, "60m": 3600,
-        "1h": 3600, "4h": 14400, "1d": 86400, "day": 86400, "1w": 604800,
-        "week": 604800, "1mo": 2592000, "month": 2592000,
-    }
-    seconds = table.get(p, 60)
-    return int(seconds * 1_000_000_000)
-
-
 def _bar_signature(bar: dict[str, Any]) -> tuple:
     """bar 摘要 — 推 on_bar 去重用.
 

{hamuna_quant_cli-0.1.20 → hamuna_quant_cli-0.1.22}/hamuna_quant_cli/live/runner.py

@@ -93,6 +93,29 @@ def _resolve_market_period(
                 f"(params.market_period={mp}, 策略 inline 默认)",
                 flush=True,
             )
+            # 优先级 3 (Round 18.63.14): params.json strategy_params.market_period
+            # 运行时覆盖 — 之前 docstring 声明了优先级 3 但代码从未实现, desktop
+            # 传 params(market_period=2=5m) 永远不生效, 策略按 inline 默认 1d 跑.
+            # params 传入形态: cmd_live_run 已 unwrap strategy_params 段 (扁平 dict),
+            # 兼容直接带 market_period 的扁平形态与残留嵌套形态.
+            sp = (params or {}).get("strategy_params") if isinstance(params, dict) else None
+            mp_override = None
+            if isinstance(sp, dict) and "market_period" in sp:
+                mp_override = sp.get("market_period")
+            elif isinstance(params, dict) and "market_period" in params:
+                mp_override = params.get("market_period")
+            if mp_override is not None:
+                try:
+                    pmp = int(mp_override)
+                    if pmp in _MARKET_PERIOD_MAP:
+                        mapped = _MARKET_PERIOD_MAP[pmp]
+                        print(
+                            f"[info] market_period 覆盖: {mapped} "
+                            f"(params.json market_period={pmp}, 运行时覆盖)",
+                            flush=True,
+                        )
+                except (TypeError, ValueError):
+                    pass  # 非法值忽略, 用 inline 推断结果
             return mapped
         except Exception as e:  # noqa: BLE001
             print(
@@ -612,9 +635,14 @@ def _live_safety_defaults(
                 "要去掉 qmt_paper=1 或改用 --mode paper."
             )
 
-        if duration == "1h":  # CLI 默认值 — 替换为永久
+        if duration in ("1h", "0", "0s", "0m", "0h", ""):
+            # Round 18.63.14: "0"/"1h" = 永久运行. 之前返回 "0" 会被 akquant
+            # `if duration:` 当真值 → _apply_time_limit("0") → 0 秒 deadline →
+            # 立即停止 (desktop 传 --duration 0 意图永久, 实测 3 秒后 TRADING
+            # SUMMARY 停止). 返回 "" (空串) → akquant if duration: 为假 → 不设
+            # deadline → 永久运行.
             print("[info] broker_live 默认 duration=0 (永久运行); 如需限时显式传 --duration", flush=True)
-            return "0"
+            return ""
         print(f"[warn] broker_live 使用显式 duration={duration} — 到期自动停止", flush=True)
 
         # Round 33: broker_live 默认开 dual_source=verify (QMT + server 端双源验证).

{hamuna_quant_cli-0.1.20 → hamuna_quant_cli-0.1.22}/hamuna_quant_cli.egg-info/PKG-INFO

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

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