hamuna-quant-cli 0.1.10__tar.gz → 0.1.11__tar.gz

{hamuna_quant_cli-0.1.10 → hamuna_quant_cli-0.1.11}/PKG-INFO

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

{hamuna_quant_cli-0.1.10 → hamuna_quant_cli-0.1.11}/hamuna_quant_cli/__main__.py

@@ -335,10 +335,18 @@ def cmd_commit(args) -> int:
     Round 18.62 P0-1: 新增 step 1.5 replay diff gate — `--replay-result` 必填,
     与 `--result` 算 sharpe diff, 超阈值 (HAMUNA_REPLAY_GATE_PCT 缺省 0.20) → exit 5.
     server `UpdateStrategyResult` handler 二次校验防绕过.
+
+    Round 18.62 P1-1: 新增 step 1.4 version bump — `GET /strategies/{id}` 拿
+    `latest_version` (无 → "0.0.0"); 默认 patch 自动 bump (`0.0.0 → 0.0.1`),
+    `--major` → `X+1.0.0`, `--minor` → `X.Y+1.0`. `--major + --minor` 互斥.
+    server handler 强校验 semver 格式 + 严格递增; PUT body 必含 `version`.
     """
     from . import runtime
+    from .runtime.server_client import ServerError
+    import io
     import json
     import os
+    import re
     import tarfile
 
     sid = args.strategy_id
@@ -370,10 +378,36 @@ def cmd_commit(args) -> int:
             print(f"replay_result.json 不存在: {args.replay_result}", file=sys.stderr)
             return 2
 
+    # ----- Round 18.62 P1-1 step 1.4: version bump -----
+    # cli 先 GET /strategies/{id} 拿 latest_version (无 → "0.0.0"); 默认 patch 自动 bump,
+    # --major → X+1.0.0, --minor → X.Y+1.0. 互斥校验防呆. server 二次校验 (semver 格式 +
+    # 严格递增) 防绕过. PUT body 必含 version (P1-1 server 强校验).
+    if args.major and args.minor:
+        print("ERROR: --major 与 --minor 互斥, 选一个或不传 (默认 patch)", file=sys.stderr)
+        return 2
+    try:
+        strat = runtime.server_client.get_strategy(sid)
+        latest = (strat or {}).get("latest_version") or "0.0.0"
+    except ServerError:
+        latest = "0.0.0"  # 404 / 401 等都 fallback, 新策略首次 commit
+    if not re.fullmatch(r"\d+\.\d+\.\d+", latest):
+        print(f"ERROR: server latest_version '{latest}' 不是合法 semver (X.Y.Z), "
+              f"请手动清理 strategies.latest_version 后重试", file=sys.stderr)
+        return 2
+    major, minor, patch = (int(x) for x in latest.split("."))
+    if args.major:
+        new_version = f"{major + 1}.0.0"
+    elif args.minor:
+        new_version = f"{major}.{minor + 1}.0"
+    else:
+        new_version = f"{major}.{minor}.{patch + 1}"
+    print(f"=== Step 1.4/3: P1-1 version bump ({latest} → {new_version}) ===",
+          file=sys.stderr)
+
     bundle_out = Path(args.bundle_out) if args.bundle_out else Path(f"runs/{sid}/bundle.tar.gz")
     bundle_out.parent.mkdir(parents=True, exist_ok=True)
 
-    print("=== Step 1/3: 打包 bundle (strategy + result + config + params) ===",
+    print("=== Step 1/3: 打包 bundle (strategy + result + config + params + replay + version) ===",
           file=sys.stderr)
     with tarfile.open(bundle_out, "w:gz") as tar:
         tar.add(strategy_path, arcname=strategy_path.name)
@@ -385,6 +419,11 @@ def cmd_commit(args) -> int:
         # Round 18.62 P0-1: replay_result.json 也打进去, 方便回溯 / 审计.
         if replay_path:
             tar.add(replay_path, arcname=replay_path.name)
+        # Round 18.62 P1-1: version.json 内存写, audit 用 (server 不读, 仅本地回溯).
+        ver_bytes = json.dumps({"version": new_version}, ensure_ascii=False).encode("utf-8")
+        ver_info = tarfile.TarInfo(name="version.json")
+        ver_info.size = len(ver_bytes)
+        tar.addfile(ver_info, io.BytesIO(ver_bytes))
     print(f"  ✓ bundle = {bundle_out} ({bundle_out.stat().st_size} bytes)", file=sys.stderr)
 
     # ----- Round 18.62 P0-1 step 1.5: replay diff gate -----
@@ -420,14 +459,17 @@ def cmd_commit(args) -> int:
         print(f"  ✓ replay gate pass (diff={diff_pct:.2%} <= {threshold:.0%}, "
               f"replay.sharpe={rp_sharpe:.4f})", file=sys.stderr)
 
-    print("=== Step 2/3: PUT /strategies/:id/result (metrics + replay_metrics) ===", file=sys.stderr)
+    print("=== Step 2/3: PUT /strategies/:id/result (metrics + replay_metrics + version) ===",
+          file=sys.stderr)
     try:
         result = json.loads(result_path.read_text(encoding="utf-8"))
     except json.JSONDecodeError as e:
         print(f"  ✗ result.json 解析失败: {e}", file=sys.stderr)
         return 2
     try:
-        resp = runtime.server_client.upload_backtest_result(sid, result, replay_metrics=replay_metrics)
+        resp = runtime.server_client.upload_backtest_result(
+            sid, result, replay_metrics=replay_metrics, version=new_version,
+        )
     except runtime.server_client.ServerError as e:
         print(f"  ✗ 上传 metrics 失败: {e}", file=sys.stderr)
         return 4
@@ -1000,6 +1042,12 @@ def build_parser() -> argparse.ArgumentParser:
                          "或 --skip-replay-gate 跳过)")
     cm.add_argument("--skip-replay-gate", action="store_true",
                     help="[qa 临时] 跳过 replay diff gate (非 dev 默认)")
+    # Round 18.62 P1-1: version bump. 默认 patch 自动 (从 server latest_version +0.0.1),
+    # 显式 --major / --minor opt-in. 互斥.
+    cm.add_argument("--major", action="store_true",
+                    help="[P1-1] major bump (X+1.0.0); 跟 --minor 互斥")
+    cm.add_argument("--minor", action="store_true",
+                    help="[P1-1] minor bump (X.Y+1.0); 跟 --major 互斥")
     cm.add_argument("--config", help="config.json 路径")
     cm.add_argument("--params", default=None,
                     help="params.json 路径 (固定 schema; 整个内容作 multipart params 字段, desktop 实盘配置源)")

{hamuna_quant_cli-0.1.10 → hamuna_quant_cli-0.1.11}/hamuna_quant_cli/runtime/server_client.py

@@ -72,19 +72,38 @@ def _api_call(method: str, path: str, body: dict | None = None) -> dict:
     return envelope
 
 
-def upload_backtest_result(strategy_id: str, result: dict, replay_metrics: dict | None = None) -> dict:
-    """PUT /api/v1/strategies/{id}/result → 上传 BacktestResult-shape dict + 可选 replay_metrics.
+def upload_backtest_result(strategy_id: str, result: dict, replay_metrics: dict | None = None, version: str | None = None) -> dict:
+    """PUT /api/v1/strategies/{id}/result → 上传 BacktestResult-shape dict + 可选 replay_metrics + version.
 
     兼容 akquant_runner.run_akquant_backtest() 输出 (13 顶层 key + metrics 子 dict 15 key + ...),
     先做轻清洗: NaN/Inf → None (json 标准不允许), 后传给 server.
 
     Round 18.62 P0-1: replay_metrics (Sharpe/TotalReturn/WinRate/Trades/DiffPct/RunAt) —
     跟 result 平级, server handler 二次校验 diff 防绕过. None 时不传该 key (老调用方不破).
+    Round 18.62 P1-1: version (X.Y.Z semver) — cli 默认 patch 自动 bump (cmd_commit step 1.4
+    拿 server latest_version 算新 version), server handler 二次校验 semver 格式 + 严格递增.
+    老调用方 (无 version kwarg) → 不传该 key → server 422 (P1-1 强校验).
     """
     payload = _sanitize_for_json(result)
+    # P1-1 P0-1.1 ponytail: 无条件 wrap `{"result": ...}` 让 server 解析形状一致
+    # (即使 replay_metrics=None / version=None 也要 wrap, 防止 server handler 422 invalid shape).
+    # 此改动在 P1-1 同步实施, P0-1 Case F 已知问题修复.
+    body: dict = {"result": payload}
     if replay_metrics is not None:
-        payload = {"result": payload, "replay_metrics": _sanitize_for_json(replay_metrics)}
-    return _api_call('PUT', f'/api/v1/strategies/{strategy_id}/result', payload)
+        body["replay_metrics"] = _sanitize_for_json(replay_metrics)
+    if version is not None:
+        body["version"] = version
+    return _api_call('PUT', f'/api/v1/strategies/{strategy_id}/result', body)
+
+
+def get_strategy(strategy_id: str) -> dict:
+    """GET /api/v1/strategies/{id} → server DataValue (含 latest_version / result / versions[]).
+
+    Round 18.62 P1-1: cli 端 version auto-bump 需要 latest_version. 404 raise ServerError,
+    caller (cmd_commit) fallback "0.0.0" + patch bump. 返 dict (含 latest_version 字段);
+    若 server 返回 DataValue 是 dict 直接返, 是 None 也直接返让 caller 用 .get() 容错.
+    """
+    return _api_call('GET', f'/api/v1/strategies/{strategy_id}')
 
 
 def create_strategy(name: str, code: str = '', params: dict | None = None) -> dict:

{hamuna_quant_cli-0.1.10 → hamuna_quant_cli-0.1.11}/hamuna_quant_cli.egg-info/PKG-INFO

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

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