cfquant 0.2.36__tar.gz → 0.2.38__tar.gz

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

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

{cfquant-0.2.36 → cfquant-0.2.38}/cfquant/qmt_bridge.py

@@ -1109,7 +1109,8 @@ class CfquantQmtBridge(object):
                 "order_sysid": self._get_value(obj, "m_strOrderSysID"),
                 "order_type": self._stock_order_type(obj),
                 "order_time": self._first_value(obj, (
-                    "order_time",
+                    "time",
+                    "order_time",
                     "entrust_time",
                     "insert_time",
                     "m_strOrderTime",
@@ -1197,6 +1198,7 @@ class CfquantQmtBridge(object):
                 "order_sysid": self._get_value(obj, "m_strOrderSysID"),
                 "traded_id": self._first_value(obj, ("m_strTradeID", "m_strDealID", "m_nTradeID", "m_nDealID")),
                 "trade_time": self._first_value(obj, (
+                    "time",
                     "trade_time",
                     "deal_time",
                     "m_strTradeTime",

{cfquant-0.2.36 → cfquant-0.2.38}/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.38}/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.38}/cfquant/tx_trade_bridge.py

@@ -3067,7 +3067,8 @@ class TxTradeBridge(object):
                 "order_sysid": self._get_value(obj, "m_strOrderSysID"),
                 "order_type": self._stock_order_type(obj),
                 "order_time": self._first_value(obj, (
-                    "order_time",
+                    "time",
+                    "order_time",
                     "entrust_time",
                     "insert_time",
                     "m_strOrderTime",
@@ -3163,7 +3164,8 @@ class TxTradeBridge(object):
                 "contract_no": self._first_value(obj, ("contract_no", "m_strCompactNo", "m_strContractNo", "m_strCompactID")),
                 "stock_code1": self._first_value(obj, ("stock_code1", "m_stockCode", "m_strStockCode1", "m_strUnderCode")),
                 "trade_time": self._first_value(obj, (
-                    "trade_time",
+                    "time",
+                    "trade_time",
                     "deal_time",
                     "m_strTradeTime",
                     "m_strDealTime",

{cfquant-0.2.36 → cfquant-0.2.38}/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.38"
+WEB_VERSION = "web_20260923_02"

{cfquant-0.2.36 → cfquant-0.2.38}/cfquant/xttype.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+import datetime
 import re
 
 from . import xtconstant
@@ -198,31 +199,62 @@ def _coerce_bool(value, default=False):
     return default
 
 
-def _coerce_time_int(value, default=0):
-    """Convert QMT's string trade/order time to xtquant's integer form."""
+def _coerce_timestamp(value, date_value=None, default=0):
+    """Convert QMT's display time to MiniQMT's Unix timestamp in seconds."""
     if value is None or isinstance(value, bool):
         return default
     if isinstance(value, int):
-        return value
-    if isinstance(value, float):
-        return int(value) if value.is_integer() else default
-    text = str(value).strip()
+        if value >= 100000000000:
+            return value // 1000
+        if value >= 100000000:
+            return value
+        text = str(value)
+    elif isinstance(value, float):
+        if value >= 100000000000:
+            return int(value / 1000)
+        if value >= 100000000:
+            return int(value)
+        text = str(int(value)) if value.is_integer() else str(value)
+    else:
+        text = str(value).strip()
     if not text:
         return default
-    if re.fullmatch(r"[+-]?\d+", text):
+    if re.fullmatch(r"[+-]?\d{9,}", text):
         try:
-            return int(text)
+            number = int(text)
+            return number // 1000 if number >= 100000000000 else number
         except ValueError:
             return default
     digits = re.sub(r"\D", "", text)
     if not digits:
         return default
+    # HHMMSS / HHMMSSmmm values need the trading date before they can
+    # represent the same Unix timestamp exposed by native xtquant.
+    if len(digits) not in (5, 6, 8, 9):
+        return default
+    if len(digits) == 5:
+        digits = "0" + digits
+    hour, minute, second = int(digits[:2]), int(digits[2:4]), int(digits[4:6])
+    microsecond = int((digits[6:] + "000000")[:6]) if len(digits) > 6 else 0
+    date_text = re.sub(r"\D", "", str(date_value or ""))
+    if len(date_text) != 8:
+        return default
     try:
-        return int(digits)
-    except ValueError:
+        dt = datetime.datetime.strptime(date_text, "%Y%m%d").replace(
+            hour=hour, minute=minute, second=second, microsecond=microsecond,
+            tzinfo=datetime.timezone(datetime.timedelta(hours=8)),
+        )
+        return int(dt.timestamp())
+    except (TypeError, ValueError, OverflowError):
         return default
 
 
+def _time_field_timestamp(data, time_names, date_names):
+    value = _first_value(data, time_names, default=None)
+    date_value = _first_value(data, date_names, default=None)
+    return _coerce_timestamp(value, date_value)
+
+
 def normalize_order_price_type(value, market=""):
     """Translate documented QMT broker price enums, preserving unknown values."""
     try:
@@ -525,8 +557,9 @@ class XtOrder(DictObject):
             "sysid",
             "m_strOrderID",
         ), default="")
-        _set_first(data, "order_time", (
-            "entrust_time",
+        _set_first(data, "order_time", (
+            "time",
+            "entrust_time",
             "insert_time",
             "m_strOrderTime",
             "m_strEntrustTime",
@@ -600,7 +633,11 @@ class XtOrder(DictObject):
         data["stock_code"] = _coerce_text(data.get("stock_code"))
         data["order_id"] = _coerce_int(data.get("order_id"), -1)
         data["order_sysid"] = _coerce_text(data.get("order_sysid"))
-        data["order_time"] = _coerce_time_int(data.get("order_time"))
+        data["order_time"] = _time_field_timestamp(
+            data,
+            ("order_time", "time", "entrust_time", "insert_time", "m_strOrderTime", "m_strEntrustTime", "m_strInsertTime", "m_nOrderTime", "m_nEntrustTime", "m_nInsertTime"),
+            ("order_date", "entrust_date", "m_strOrderDate", "m_strEntrustDate", "m_strTradingDay", "m_nOrderDate", "m_nEntrustDate"),
+        )
         for name in ("order_type", "order_volume", "price_type", "traded_volume", "order_status", "direction", "offset_flag"):
             data[name] = _coerce_int(data.get(name))
         for name in ("price", "traded_price"):
@@ -636,7 +673,7 @@ class XtCreditOrder(XtOrder):
             account_id=_coerce_text(data.get("account_id")),
             stock_code=_coerce_text(data.get("stock_code")),
             order_id=_coerce_int(data.get("order_id"), -1),
-            order_time=_coerce_time_int(data.get("order_time")),
+            order_time=data.get("order_time", 0),
             order_type=_coerce_int(data.get("order_type")),
             order_volume=_coerce_int(data.get("order_volume")),
             price_type=_coerce_int(data.get("price_type")),
@@ -698,8 +735,9 @@ class XtTrade(DictObject):
             "m_nTradeID",
             "m_nDealID",
         ), default="")
-        _set_first(data, "traded_time", (
-            "trade_time",
+        _set_first(data, "traded_time", (
+            "time",
+            "trade_time",
             "deal_time",
             "m_strTradeTime",
             "m_strDealTime",
@@ -763,7 +801,11 @@ class XtTrade(DictObject):
         data["stock_code"] = _coerce_text(data.get("stock_code"))
         data["order_type"] = _coerce_int(data.get("order_type"))
         data["traded_id"] = _coerce_text(data.get("traded_id"))
-        data["traded_time"] = _coerce_time_int(data.get("traded_time"))
+        data["traded_time"] = _time_field_timestamp(
+            data,
+            ("traded_time", "time", "trade_time", "deal_time", "m_strTradeTime", "m_strDealTime", "m_nTradeTime", "m_nDealTime"),
+            ("trade_date", "deal_date", "m_strTradeDate", "m_strDealDate", "m_strTradingDay", "m_nTradeDate", "m_nDealDate"),
+        )
         for name in ("traded_volume",):
             data[name] = _coerce_int(data.get(name))
         for name in ("traded_price", "traded_amount", "commission"):
@@ -803,7 +845,7 @@ class XtCreditDeal(DictObject):
             account_id=_coerce_text(data.get("account_id")),
             stock_code=_coerce_text(data.get("stock_code")),
             traded_id=_coerce_text(data.get("traded_id")),
-            traded_time=_coerce_time_int(data.get("traded_time")),
+            traded_time=data.get("traded_time", 0),
             traded_price=_coerce_float(data.get("traded_price")),
             traded_volume=_coerce_int(data.get("traded_volume")),
             order_id=_coerce_int(data.get("order_id"), -1),

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

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

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

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

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

@@ -1,4 +1,4 @@
-const FRONTEND_VERSION = 'web_20260922_03';
+const FRONTEND_VERSION = 'web_20260923_02';
 
 const state = {
   accountId: '',
@@ -2500,9 +2500,42 @@ function normalizeApiBaseUrl(value) {
   }
 }
 
+function isPrivateApiHost(host) {
+  host = String(host || '').trim().toLowerCase();
+  if (!host || host === 'localhost' || host === '::1' || host === '[::1]') return true;
+  if (/^127\./.test(host)) return true;
+  const parts = host.split('.').map((item) => Number(item));
+  if (parts.length !== 4 || parts.some((item) => !Number.isInteger(item) || item < 0 || item > 255)) return false;
+  return parts[0] === 10
+    || parts[0] === 192 && parts[1] === 168
+    || parts[0] === 172 && parts[1] >= 16 && parts[1] <= 31
+    || parts[0] === 169 && parts[1] === 254;
+}
+
+function apiBaseUrlForPage(value) {
+  const configured = normalizeApiBaseUrl(value);
+  const page = normalizeApiBaseUrl(window.location.origin);
+  try {
+    const configuredUrl = new URL(configured);
+    const pageUrl = new URL(page);
+    // A saved LAN address belongs to the machine that last ran Web. When the
+    // page is opened from another private/loopback address, follow the current
+    // page so changing the host IP does not leave the tester pointing at the
+    // old machine. Public/explicit remote URLs remain user-configurable.
+    if (isPrivateApiHost(configuredUrl.hostname)
+        && isPrivateApiHost(pageUrl.hostname)
+        && configuredUrl.hostname !== pageUrl.hostname) {
+      return page;
+    }
+  } catch (error) {
+    return page;
+  }
+  return configured;
+}
+
 function currentApiBaseUrl() {
   const input = $('apiBaseUrlInput');
-  if (input && input.value.trim()) return normalizeApiBaseUrl(input.value);
+  if (input && input.value.trim()) return apiBaseUrlForPage(input.value);
   return normalizeApiBaseUrl(window.location.origin);
 }
 
@@ -4616,7 +4649,10 @@ function renderServerAccessLegacy(info) {
 
   const baseInput = $('apiBaseUrlInput');
   if (baseInput && !baseInput.value.trim()) {
-    baseInput.value = normalizeApiBaseUrl(state.serverAccess.api_base_url || window.location.origin);
+    baseInput.value = apiBaseUrlForPage(state.serverAccess.api_base_url || window.location.origin);
+  } else if (baseInput && baseInput.value.trim()) {
+    const effectiveBaseUrl = apiBaseUrlForPage(baseInput.value);
+    if (effectiveBaseUrl !== normalizeApiBaseUrl(baseInput.value)) baseInput.value = effectiveBaseUrl;
   }
   updateApiRequestPreview();
 }
@@ -4732,7 +4768,10 @@ function renderServerAccess(info) {
   const baseInput = $('apiBaseUrlInput');
   if (baseInput && !baseInput.value.trim()) {
     const currentUrl = state.serverAccess.api_base_url || state.serverAccess.local_url || window.location.origin;
-    baseInput.value = normalizeApiBaseUrl(currentUrl);
+    baseInput.value = apiBaseUrlForPage(currentUrl);
+  } else if (baseInput && baseInput.value.trim()) {
+    const effectiveBaseUrl = apiBaseUrlForPage(baseInput.value);
+    if (effectiveBaseUrl !== normalizeApiBaseUrl(baseInput.value)) baseInput.value = effectiveBaseUrl;
   }
   if (!authEnabled) {
     clearWebAuthToken();
@@ -10369,7 +10408,7 @@ async function loadConfigLegacy() {
     const savedBaseUrl = data.server_access && data.server_access.api_base_url
       ? data.server_access.api_base_url
       : window.location.origin;
-    apiBaseInput.value = normalizeApiBaseUrl(savedBaseUrl);
+    apiBaseInput.value = apiBaseUrlForPage(savedBaseUrl);
   }
   renderServerAccess(data.server_access);
   renderUserProfile(data.user_profile);
@@ -10430,7 +10469,7 @@ async function loadConfig() {
     const savedBaseUrl = data.server_access && data.server_access.api_base_url
       ? data.server_access.api_base_url
       : window.location.origin;
-    apiBaseInput.value = normalizeApiBaseUrl(savedBaseUrl);
+    apiBaseInput.value = apiBaseUrlForPage(savedBaseUrl);
   }
   renderServerAccess(data.server_access);
   renderUserProfile(data.user_profile);
@@ -14027,4 +14066,3 @@ async function boot() {
 }
 
 boot().catch((error) => log('启动失败', { error: error.message }));
-

{cfquant-0.2.36 → cfquant-0.2.38}/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_20260923_02">
 </head>
 <body>
   <div id="webAuthOverlay" class="auth-overlay hidden" aria-live="polite">
@@ -3202,7 +3202,6 @@ 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_20260923_02"></script>
 </body>
 </html>
-