cfquant 0.2.48__tar.gz → 0.2.49__tar.gz

{cfquant-0.2.48 → cfquant-0.2.49}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cfquant
-Version: 0.2.48
+Version: 0.2.49
 Summary: QMT local bridge and xtquant-compatible Python client.
 License: MIT
 Requires-Python: >=3.8

{cfquant-0.2.48 → cfquant-0.2.49}/cfquant/qmt_strategy_deploy.py

@@ -343,13 +343,23 @@ def managed_source(source_path, identity_path, identity, descriptor):
     for start, end, text in sorted(replacements, reverse=True):
         lines[start:end] = [text]
     lines[0] = "# coding: utf-8\n"
-    source = "".join(lines)
-    ast.parse(source, feature_version=(3, 6))
-    helper = Path(__file__).with_name("qmt_strategy_runtime.py").read_text(encoding="utf-8")
-    generated = ("# coding: utf-8\n" + helper + "\n_cq_descriptor = " + ascii(descriptor)
-            + "\n_cq_guard = _CqStrategyLease(_cq_descriptor).acquire()\n"
-            + "_cq_guard.namespace = globals()\ntry:\n"
-            + "    exec(compile(%s, %s, 'exec'), globals())\n" % (ascii(source), ascii(str(source_path)))
+    source = "".join(lines)
+    ast.parse(source, feature_version=(3, 6))
+    helper = Path(__file__).with_name("qmt_strategy_runtime.py").read_text(encoding="utf-8")
+    source_lines = source.splitlines(keepends=True)
+    # Adjacent literals compile to the same source string, while keeping every
+    # entry line visible in QMT's editor. A single ascii(source) hid thousands
+    # of Lite lines behind the same short lease wrapper as the other modes.
+    embedded = "\n".join("        " + ascii(line) for line in source_lines)
+    header = ("# coding: utf-8\n# cfquant managed strategy\n"
+              + "# Mode: " + ascii(descriptor["mode"]) + "\n"
+              + "# Entry: " + ascii(Path(source_path).name) + "\n"
+              + "# Embedded entry: %d lines, preserved line by line below.\n" % len(source_lines)
+              + "# The lease wrapper is shared by all modes.\n\n")
+    generated = (header + helper + "\n_cq_descriptor = " + ascii(descriptor)
+            + "\n_cq_guard = _CqStrategyLease(_cq_descriptor).acquire()\n"
+            + "_cq_guard.namespace = globals()\ntry:\n"
+            + "    exec(compile((\n%s\n    ), %s, 'exec'), globals())\n" % (embedded, ascii(str(source_path)))
             + "    for _cq_name in ('_cf_bridge', '_normal_bridge', '_trade_bridge'):\n"
             + "        if globals().get(_cq_name) is not None:\n"
             + "            globals()[_cq_name].account_type = %s\n" % ascii(identity["account_type"])
@@ -408,13 +418,17 @@ class QmtStrategyManager:
             job.pop("deploy_retry_count", None)
             job.pop("deploy_retry_after", None)
 
-    def _clear_generation_transition(self, job):
-        changed = False
-        for key in ("control_generation", "accepted_generations"):
-            if key in job:
-                job.pop(key, None)
-                changed = True
-        return changed
+    def _clear_generation_transition(self, job):
+        changed = False
+        for key in ("control_generation", "accepted_generations"):
+            if key in job:
+                job.pop(key, None)
+                changed = True
+        for role in job.get("roles", []):
+            if "reimport_from_generation" in role:
+                role.pop("reimport_from_generation", None)
+                changed = True
+        return changed
 
     def _prepare_generation_transition(self, job, previous=None):
         """Keep old same-name containers valid until the replacement starts."""
@@ -467,19 +481,23 @@ class QmtStrategyManager:
         )
         job["control_generation"] = legacy
         job["accepted_generations"] = accepted
-        if previous is None:
-            for role in job.get("roles", []):
-                if _runtime_generation(role) == legacy:
-                    updates = {
-                        "reimport_required": True,
-                        "imported": False,
-                        "queued": False,
-                        "model_prepared": False,
-                    }
-                    for key, value in updates.items():
-                        if role.get(key) != value:
-                            role[key] = value
-                            changed = True
+        for role in job.get("roles", []):
+            if (_runtime_generation(role) == legacy
+                    and role.get("reimport_from_generation") != legacy):
+                # The old report survives QMT shutdown and import. Handle it
+                # once per replacement job, including across Web restarts;
+                # resetting every poll destroys the prepared/imported model.
+                updates = {
+                    "reimport_from_generation": legacy,
+                    "reimport_required": True,
+                    "imported": False,
+                    "queued": False,
+                    "model_prepared": False,
+                }
+                for key, value in updates.items():
+                    if role.get(key) != value:
+                        role[key] = value
+                        changed = True
         if changed and job.get("state") == "error":
             self._state(job, "waiting_exit")
         return changed

{cfquant-0.2.48 → cfquant-0.2.49}/cfquant/tests/test_lite_deployment_paths.py

@@ -98,6 +98,35 @@ def test_edit_without_mode_preserves_lite_binding_and_payload(web_deployment):
     assert_lite_package(manager, root)
 
 
+def test_edit_advanced_binding_to_lite_retires_both_advanced_models(web_deployment):
+    web, manager, row, infos, root = web_deployment
+    trade_root = root.with_name("QMT_trade")
+    shutil.copytree(root, trade_root)
+    row.update(mode="lttx", qmt_trade_dir=str(trade_root / "bin.x64"))
+    row["qmt_strategy"]["autorun"] = True
+    trade_info = dict(infos[0], qmt_role="trade", core_dir=str(trade_root / "bin.x64"),
+                      path=str(trade_root / "bin.x64" / "cfquant_bridge_config.json"))
+    manager.configure(row, infos + [trade_info])
+    advanced_name = "CFQ_%s_LTTX" % row["account_id"]
+    assert models(root)[advanced_name].getAttribute("startupAutorun") == "1"
+    assert models(trade_root)[advanced_name].getAttribute("startupAutorun") == "1"
+
+    body = {key: row[key] for key in ("account_id", "account_type", "bridge_id", "qmt_dir")}
+    result = web.save_account_runtime_config(dict(body, mode="lite", qmt_trade_dir=""))
+
+    assert result["account"]["mode"] == "lite"
+    assert result["account"]["qmt_trade_dir"] == ""
+    assert not result["qmt_strategy_deploy"].get("error")
+    job = assert_lite_package(manager, root)
+    assert job["roles"][0]["name"] == "CFQ_%s_LITE" % row["account_id"]
+    assert models(root)[job["roles"][0]["name"]].getAttribute("startupAutorun") == "1"
+    assert models(root)[advanced_name].getAttribute("startupAutorun") == "0"
+    assert models(trade_root)[advanced_name].getAttribute("startupAutorun") == "0"
+    trade_job = next(job for job in manager.jobs.values() if job["root"] == str(trade_root))
+    assert trade_job["enabled"] is False
+    assert trade_job["state"] == "disabled"
+
+
 @pytest.mark.parametrize("single_account", [False, True])
 def test_shared_qmt_directory_does_not_drop_lite_market_entries(single_account, web_deployment):
     web, _, row, _, root = web_deployment

{cfquant-0.2.48 → cfquant-0.2.49}/cfquant/tests/test_qmt_strategy_deploy.py

@@ -464,6 +464,8 @@ def test_all_managed_entry_variants_compile_without_executing(mode, deployment):
     assert document["detail"]["realName"] == role["name"] + ".py"
     assert document["formulaCatalog"][0].encode("utf-8", "surrogateescape").hex() == "ced2b5c4b2dfc2d4"
     ast.parse(document["content"], feature_version=(3, 6))
+    assert "# Mode: %r\n" % mode in document["content"]
+    assert "# Entry: %r\n" % Path(role["source"]).name in document["content"]
     if mode == "lite":
         embedded = [node.args[0].value for node in ast.walk(ast.parse(document["content"]))
                     if isinstance(node, ast.Call) and isinstance(node.func, ast.Name)
@@ -477,6 +479,8 @@ def test_all_managed_entry_variants_compile_without_executing(mode, deployment):
                                     if isinstance(node, (ast.FunctionDef, ast.ClassDef))}
         assert definitions(actual) == definitions(original)
         assert len(embedded[0].splitlines()) > 7000
+        assert len(document["content"].splitlines()) > 7000
+        assert max(map(len, document["content"].splitlines())) < 2000
     descriptor = {"mode": mode, "generation": "test", "role": "SH", "control_path": "test", "lease_dir": "test"}
     variants = list((SCRIPTS / "同账号独立市场").glob("*.py")) + [SCRIPTS / "CFQUANT_TRADE_LOWLAT.py"]
     for path in variants:
@@ -522,6 +526,64 @@ def test_process_once_detects_stale_runtime_generation_and_queues_reimport(deplo
     assert (root / "formulas" / (role["name"] + ".rzrk")).is_file()
 
 
+@pytest.mark.parametrize("report_state", ["running", "stopped"])
+@pytest.mark.parametrize("previous_mode", ["lite", "lttx"])
+def test_old_runtime_report_does_not_reset_prepared_replacement(deployment, report_state, previous_mode):
+    manager, row, infos, running, root = deployment
+    row["mode"] = "lite"
+    manager.configure(row, infos)
+    finish_import(manager, root)
+    manager.process_once()
+    first = copy.deepcopy(next(iter(manager.jobs.values())))
+    _write_json(first["roles"][0]["runtime_status_path"], {
+        "state": report_state, "generation": first["generation"], "updated_at": time.time() - 120,
+    })
+    if previous_mode != "lite":
+        row["mode"] = previous_mode
+        manager.configure(row, infos)
+        finish_import(manager, root)
+        manager.process_once()
+
+    row["mode"] = "lite"
+    manager.configure(row, infos, force=True)
+    job = next(iter(manager.jobs.values()))
+    role = job["roles"][0]
+    queue = root / "formulas" / (role["name"] + ".rzrk")
+    assert queue.is_file()
+    assert role["model_prepared"] is True
+
+    # The old heartbeat remains on disk until QMT has imported and started
+    # the new strategy. Repeated polling or a Web restart must not undo it.
+    manager = QmtStrategyManager(manager.path, SCRIPTS, lambda root: running[0])
+    job = next(iter(manager.jobs.values()))
+    role = job["roles"][0]
+    running[0] = True
+    manager.process_once()
+    manager.process_once()
+    assert role["reimport_required"] is False
+    assert role["model_prepared"] is True
+    assert role["queued"] is True
+    assert job["state"] == "waiting_manual_start"
+
+    finish_import(manager, root)
+    container = root / "python" / (role["name"] + ".py")
+    running[0] = False
+    manager.process_once()
+    manager.process_once()
+    assert container.is_file()
+    assert not queue.exists()
+    assert role["imported"] is True
+    assert job["state"] == "configured"
+
+    _write_json(role["runtime_status_path"], {
+        "state": "running", "generation": job["generation"], "updated_at": time.time(),
+    })
+    running[0] = True
+    manager.process_once()
+    assert job["state"] == "running"
+    assert not job.get("control_generation")
+
+
 @pytest.mark.parametrize("encoding", ["utf-8", "gbk", "gb18030"])
 def test_managed_package_executes_after_qmt_encoding_with_chinese_paths(tmp_path, encoding):
     directory = tmp_path / "\u534e\u6cf0\u8bc1\u5238 QMT \u6a21\u62df"

{cfquant-0.2.48 → cfquant-0.2.49}/cfquant/tests/test_qmt_strategy_web.py

@@ -304,7 +304,7 @@ def test_save_and_delete_call_deployment_manager(web_config, monkeypatch):
     assert calls[-1] == ("reconcile", set())
 
 
-def test_save_can_start_qmt_auto_login_and_persist_restart_times(web_config, monkeypatch):
+def test_save_can_start_qmt_auto_login_and_persist_restart_times(web_config, monkeypatch, tmp_path):
     web, config = web_config
     calls = []
     monkeypatch.setattr(web, "auto_deploy_qmt_core_for_account", lambda *args, **kwargs: {})
@@ -325,7 +325,7 @@ def test_save_can_start_qmt_auto_login_and_persist_restart_times(web_config, mon
     data = web.save_account_runtime_config({
         "account_id": "8885060548",
         "display_name": "国金证券",
-        "qmt_dir": r"D:\国金证券QMT交易端\bin.x64",
+        "qmt_dir": str(tmp_path / "QMT" / "bin.x64"),
         "qmt_auto_login": {"enabled": True, "restart_times": ["6:30", "06:30", "18:05"]},
     })
     assert data["qmt_auto_login"]["pid"] == 1234

{cfquant-0.2.48 → cfquant-0.2.49}/cfquant/version.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 """cfquant core version metadata."""
 
-__version__ = "0.2.48"
-WEB_VERSION = "web_20261011_02"
+__version__ = "0.2.49"
+WEB_VERSION = "web_20261012_01"

{cfquant-0.2.48 → cfquant-0.2.49}/cfquant.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cfquant
-Version: 0.2.48
+Version: 0.2.49
 Summary: QMT local bridge and xtquant-compatible Python client.
 License: MIT
 Requires-Python: >=3.8

{cfquant-0.2.48 → cfquant-0.2.49}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cfquant"
-version = "0.2.48"
+version = "0.2.49"
 description = "QMT local bridge and xtquant-compatible Python client."
 license = {text = "MIT"}
 readme = "README.md"

{cfquant-0.2.48 → cfquant-0.2.49}/qmt_scripts/CFQUANT_LITE.py

@@ -562,7 +562,7 @@ def _resolve_batch_order_ids(bridge, account, pending, before_ids):
         time.sleep(min(0.05, remaining))
 # END GENERATED CFTRADER BATCH
 
-CORE_VERSION = "0.2.48"
+CORE_VERSION = "0.2.49"
 LITE_ENTRY_VERSION = "lite_20260828_01"
 
 _CANCELABLE_ORDER_STATUS_VALUES = set([48, 49, 50, 55])

{cfquant-0.2.48 → cfquant-0.2.49}/qmt_scripts//345/220/214/350/264/246/345/217/267/347/213/254/347/253/213/345/270/202/345/234/272/CFQUANT_LITE_SH.py

@@ -616,7 +616,7 @@ def _resolve_batch_order_ids(bridge, account, pending, before_ids):
         time.sleep(min(0.05, remaining))
 # END GENERATED CFTRADER BATCH
 
-CORE_VERSION = "0.2.48"
+CORE_VERSION = "0.2.49"
 LITE_ENTRY_VERSION = "lite_20260828_01"
 
 _CANCELABLE_ORDER_STATUS_VALUES = set([48, 49, 50, 55])

{cfquant-0.2.48 → cfquant-0.2.49}/qmt_scripts//345/220/214/350/264/246/345/217/267/347/213/254/347/253/213/345/270/202/345/234/272/CFQUANT_LITE_SZ.py

@@ -616,7 +616,7 @@ def _resolve_batch_order_ids(bridge, account, pending, before_ids):
         time.sleep(min(0.05, remaining))
 # END GENERATED CFTRADER BATCH
 
-CORE_VERSION = "0.2.48"
+CORE_VERSION = "0.2.49"
 LITE_ENTRY_VERSION = "lite_20260828_01"
 
 _CANCELABLE_ORDER_STATUS_VALUES = set([48, 49, 50, 55])

{cfquant-0.2.48 → cfquant-0.2.49}/web_dashboard/app.js

@@ -1,4 +1,4 @@
-const FRONTEND_VERSION = 'web_20261011_02';
+const FRONTEND_VERSION = 'web_20261012_01';
 
 const state = {
   accountId: '',

{cfquant-0.2.48 → cfquant-0.2.49}/web_dashboard/index.html

@@ -5,7 +5,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <title>cfquant 控制台</title>
   <link rel="icon" type="image/svg+xml" href="/favicon.svg">
-  <link rel="stylesheet" href="/styles.css?v=web_20261011_02">
+  <link rel="stylesheet" href="/styles.css?v=web_20261012_01">
 </head>
 <body>
   <div id="webAuthOverlay" class="auth-overlay hidden" aria-live="polite">
@@ -3223,6 +3223,6 @@ else:
   <script src="/api-tester.js?v=20260916_apikey_01"></script>
   <script src="/python-api.js?v=20260925_trading_dates_01"></script>
   <script src="/docs.js?v=20260925_data_docs_01"></script>
-  <script src="/app.js?v=web_20261011_02"></script>
+  <script src="/app.js?v=web_20261012_01"></script>
 </body>
 </html>