cfquant 0.2.36__tar.gz → 0.2.37__tar.gz

{cfquant-0.2.36 → cfquant-0.2.37}/PKG-INFO

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

{cfquant-0.2.36 → cfquant-0.2.37}/cfquant/qmt_strategy_deploy.py

@@ -188,17 +188,15 @@ def _model_items(document):
     return section, list(section.getElementsByTagName("item"))
 
 
-def _strategy_slot_name(account_id, role="normal"):
-    """Return a deterministic name shared by all modes for one account.
-
-    A mode switch must replace the existing model instead of creating a
-    second autorun model. Independent SH/SZ routes are the one case where a
-    single account receives distinct names.
-    """
-    account = re.sub(r"[^A-Z0-9]+", "_", str(account_id or "").upper()).strip("_") or "ACCOUNT"
-    market = str(role or "normal").upper()
-    suffix = "_%s" % market if market in ("SH", "SZ") else ""
-    return ("CFQ_%s%s" % (account, suffix))[:64]
+def _strategy_slot_name(account_id, mode="ctypes", role="normal"):
+    """Return a deterministic, mode-specific name in cfquant's namespace."""
+    account = re.sub(r"[^A-Z0-9]+", "_", str(account_id or "").upper()).strip("_") or "ACCOUNT"
+    if len(account) > 20:
+        account = account[-5:]
+    mode = normalize_strategy_mode(mode).upper()
+    market = str(role or "normal").upper()
+    suffix = "_%s" % market if market in ("SH", "SZ") else ""
+    return ("CFQ_%s_%s%s" % (account, mode, suffix))[:64]
 
 
 def _is_managed_strategy_name(name):
@@ -533,7 +531,7 @@ class QmtStrategyManager:
                 for role in group["roles"]:
                     old_role = previous_roles.get(role["role"])
                     old_name = old_role.get("name") if isinstance(old_role, dict) else ""
-                    expected_name = _strategy_slot_name(row["account_id"], role["role"])
+                    expected_name = _strategy_slot_name(row["account_id"], mode, role["role"])
                     if old_name == expected_name:
                         role_names[role["role"]] = old_name
                     else:

{cfquant-0.2.36 → cfquant-0.2.37}/cfquant/tests/test_qmt_strategy_deploy.py

@@ -14,6 +14,7 @@ from cfquant.qmt_strategy_deploy import (
     QmtStrategyManager, _account_binding, _atomic_write, _read_document,
     _write_json, _resolve_account_binding, account_qmt_roots, managed_source, normalize_strategy_settings,
     normalize_strategy_mode,
+    _strategy_slot_name,
 )
 from cfquant.qmt_strategy_package import _cipher, build_package
 from cfquant.qmt_strategy_runtime import _CqStrategyLease
@@ -29,6 +30,11 @@ def test_strategy_mode_aliases_are_canonical(value, expected):
     assert normalize_strategy_mode(value) == expected
 
 
+def test_strategy_name_contains_mode_and_shortens_long_account():
+    name = _strategy_slot_name("ACCOUNT-12345678901234567890", "lite")
+    assert name == "CFQ_67890_LITE"
+
+
 @pytest.fixture
 def deployment(tmp_path):
     root = tmp_path / "QMT"
@@ -261,7 +267,9 @@ def test_switch_and_delete_revoke_old_generation_and_disable_its_model(deploymen
     manager.configure(row, infos)
     new = next(iter(manager.jobs.values()))
     assert old["generation"] != new["generation"]
-    assert old["roles"][0]["name"] == new["roles"][0]["name"]
+    assert old["roles"][0]["name"] != new["roles"][0]["name"]
+    assert old["roles"][0]["name"].endswith("_CTYPES")
+    assert new["roles"][0]["name"].endswith("_LITE")
     assert json.loads(Path(old["control_path"]).read_text())["mode"] == "lite"
     running[0] = False
     manager.process_once()
@@ -289,7 +297,7 @@ def test_historical_generated_name_is_disabled_for_the_same_account(deployment):
     manager.configure(row, infos)
     manager.process_once()
     assert models(root)["CFQ_CTYPES_DEADBEEF_NORMAL"].getAttribute("startupAutorun") == "0"
-    assert next(iter(manager.jobs.values()))["roles"][0]["name"] == "CFQ_%s" % ACCOUNT
+    assert next(iter(manager.jobs.values()))["roles"][0]["name"] == "CFQ_%s_CTYPES" % ACCOUNT
 
 
 def test_independent_identity_for_two_accounts_in_one_qmt(deployment):
@@ -501,7 +509,7 @@ def test_market_routes_only_import_market_entries_and_use_their_own_stock(deploy
     for role in job["roles"]:
         model = models(root)[role["name"]]
         assert model.getAttribute("stock") == {"SH": "SH000300", "SZ": "SZ399001"}[role["role"]]
-    assert {role["name"] for role in job["roles"]} == {"CFQ_%s_SH" % ACCOUNT, "CFQ_%s_SZ" % ACCOUNT}
+    assert {role["name"] for role in job["roles"]} == {"CFQ_%s_CTYPES_SH" % ACCOUNT, "CFQ_%s_CTYPES_SZ" % ACCOUNT}
 
 
 def descriptor(tmp_path, generation, role="normal"):

{cfquant-0.2.36 → cfquant-0.2.37}/cfquant/version.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 """cfquant core version metadata."""
 
-__version__ = "0.2.35"
-WEB_VERSION = "web_20260922_03"
+__version__ = "0.2.36"
+WEB_VERSION = "web_20260922_04"

{cfquant-0.2.36 → cfquant-0.2.37}/cfquant.egg-info/PKG-INFO

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

{cfquant-0.2.36 → cfquant-0.2.37}/pyproject.toml

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

{cfquant-0.2.36 → cfquant-0.2.37}/web_dashboard/app.js

@@ -1,4 +1,4 @@
-const FRONTEND_VERSION = 'web_20260922_03';
+const FRONTEND_VERSION = 'web_20260922_04';
 
 const state = {
   accountId: '',

{cfquant-0.2.36 → cfquant-0.2.37}/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_20260922_03">
+  <link rel="stylesheet" href="/styles.css?v=web_20260922_04">
 </head>
 <body>
   <div id="webAuthOverlay" class="auth-overlay hidden" aria-live="polite">
@@ -3202,7 +3202,7 @@ else:
   <script src="/cftrader-api-data.js?v=20260911_02"></script>
   <script src="/api-tester.js?v=20260916_apikey_01"></script>
   <script src="/python-api.js?v=20260911_api_test_01"></script>
-  <script src="/app.js?v=web_20260922_03"></script>
+  <script src="/app.js?v=web_20260922_04"></script>
 </body>
 </html>