cfquant 0.2.54__tar.gz → 0.2.55__tar.gz

{cfquant-0.2.54 → cfquant-0.2.55}/PKG-INFO

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

{cfquant-0.2.54 → cfquant-0.2.55}/cfquant/_editable_install.py

@@ -9,6 +9,11 @@ import sys
 import tempfile
 from pathlib import Path
 
+if __package__:
+    from .qmt_dependencies import report_startup_dependencies
+else:
+    from qmt_dependencies import report_startup_dependencies
+
 
 PACKAGE_NAME = "cfquant"
 
@@ -503,6 +508,7 @@ def ensure_cfquant_installed(project_root, python_exe=None):
     print("cfquant installed=%s project=%s" % (installed or "missing", expected))
     if installed == expected:
         print("Package versions match; skip installation.")
+        report_startup_dependencies(python_exe)
         return 0
 
     command = editable_install_args(project_root, python_exe)
@@ -526,6 +532,7 @@ def ensure_cfquant_installed(project_root, python_exe=None):
         print("[ERROR] Installed cfquant version does not match the project after installation.", file=sys.stderr)
         return 1
     print("%s package is installed." % PACKAGE_NAME)
+    report_startup_dependencies(python_exe)
     return 0
 
 

{cfquant-0.2.54 → cfquant-0.2.55}/cfquant/qmt_component_login.py

@@ -18,9 +18,12 @@ class QmtNotReady(RuntimeError):
 
 def verify_environment(directory):
     """Validate dependencies and native ABI before stopping a running terminal."""
-    import frida  # noqa: F401
-    import win32api
-    import win32crypt  # noqa: F401
+    try:
+        from .qmt_dependencies import LOGIN_MODULES, import_login_module
+    except ImportError:
+        from qmt_dependencies import LOGIN_MODULES, import_login_module
+    modules = {name: import_login_module(name) for name in LOGIN_MODULES}
+    win32api = modules["win32api"]
     directory = Path(directory)
     for module in ("Qt5Core.dll", "Qt5Widgets.dll"):
         version = win32api.GetFileVersionInfo(str(directory / module), "\\")
@@ -83,12 +86,16 @@ def select_binding(config_path, name):
 
 class QtLoginBackend:
     def __init__(self, directory, timeout=40, expected_pid=None):
-        import frida
+        try:
+            from .qmt_dependencies import import_login_module
+        except ImportError:
+            from qmt_dependencies import import_login_module
         import psutil
-        import win32api
-        import win32event
-        import win32gui
-        import win32process
+        frida = import_login_module("frida")
+        win32api = import_login_module("win32api")
+        win32event = import_login_module("win32event")
+        win32gui = import_login_module("win32gui")
+        win32process = import_login_module("win32process")
         self.gui, self.process = win32gui, win32process
         self.timeout = timeout
         self.hwnd = None
@@ -232,8 +239,12 @@ class QtLoginBackend:
         self.failure_hwnd = None
 
     def close(self):
-        import win32api
-        import win32event
+        try:
+            from .qmt_dependencies import import_login_module
+        except ImportError:
+            from qmt_dependencies import import_login_module
+        win32api = import_login_module("win32api")
+        win32event = import_login_module("win32event")
         try:
             if self.session:
                 self.session.detach()

{cfquant-0.2.54 → cfquant-0.2.55}/cfquant/qmt_credentials.py

@@ -6,6 +6,8 @@ import os
 from pathlib import Path
 import threading
 
+from .qmt_dependencies import QmtDependencyError, import_login_module
+
 _LOCK = threading.RLock()
 
 
@@ -17,12 +19,12 @@ def directory_key(directory):
 
 
 def _protect(value, entropy):
-    import win32crypt
+    win32crypt = import_login_module("win32crypt")
     return win32crypt.CryptProtectData(value, "CFQuant QMT login", entropy, None, None, 1)
 
 
 def _unprotect(value, entropy):
-    import win32crypt
+    win32crypt = import_login_module("win32crypt")
     return win32crypt.CryptUnprotectData(value, entropy, None, None, 1)[1]
 
 
@@ -50,6 +52,8 @@ class QmtCredentialStore:
         key = directory_key(directory)
         try:
             encrypted = _protect(password.encode("utf-8"), key.encode("ascii"))
+        except QmtDependencyError:
+            raise
         except Exception:
             raise RuntimeError("无法使用当前 Windows 用户加密 QMT 密码，请检查 pywin32 安装") from None
         with _LOCK:
@@ -68,5 +72,7 @@ class QmtCredentialStore:
             return ""
         try:
             return _unprotect(base64.b64decode(entry["secret"]), key.encode("ascii")).decode("utf-8")
+        except QmtDependencyError:
+            raise
         except Exception:
             raise RuntimeError("无法解密 QMT 密码，请使用保存密码时的 Windows 用户运行，或重新保存密码") from None

cfquant-0.2.55/cfquant/qmt_dependencies.py

@@ -0,0 +1,137 @@
+"""Read-only checks and repair instructions for optional QMT login components."""
+import copy
+import importlib
+import json
+import os
+import subprocess
+import sys
+import threading
+import time
+
+
+LOGIN_MODULES = ("frida", "win32api", "win32crypt", "win32event", "win32gui", "win32process")
+_LOCK = threading.Lock()
+_CACHE = {}
+_PROBE_CODE = r'''
+import importlib, importlib.metadata, json, pathlib, sys
+checks = []
+for name in MODULES:
+    try:
+        module = importlib.import_module(name)
+        checks.append(dict(name=name, ok=True, path=getattr(module, '__file__', '')))
+    except Exception as error:
+        checks.append(dict(name=name, ok=False, error=str(error), error_type=type(error).__name__))
+packages = {}
+for name in ('pywin32', 'frida'):
+    try:
+        packages[name] = importlib.metadata.version(name)
+    except importlib.metadata.PackageNotFoundError:
+        packages[name] = ''
+prefix = pathlib.Path(sys.prefix)
+conda = (prefix / 'conda-meta').is_dir()
+print(json.dumps(dict(python_executable=sys.executable, python_version=sys.version.split()[0],
+    prefix=str(prefix), environment='conda' if conda else 'venv' if sys.prefix != sys.base_prefix else 'python',
+    global_python=sys.prefix == sys.base_prefix,
+    conda_pywin32=conda and bool(list((prefix / 'conda-meta').glob('pywin32-*.json'))),
+    supported=sys.platform == 'win32', checks=checks, packages=packages), ensure_ascii=True))
+'''
+
+
+def _ps_quote(value):
+    return "'" + str(value).replace("'", "''") + "'"
+
+
+def _finish_report(report):
+    report["checked_at"] = time.time()
+    report["ok"] = bool(report.get("supported") and not report.get("error")
+                        and all(item["ok"] for item in report.get("checks", [])))
+    failed = [item for item in report.get("checks", []) if not item["ok"]]
+    if not report.get("supported") and not report.get("error"):
+        report["message"] = "当前系统不支持 QMT 组件自动登录，请手动启动并登录 QMT。"
+    elif report["ok"]:
+        report["message"] = "QMT 自动登录组件检测通过。"
+    else:
+        names = "、".join(item["name"] for item in failed) or "Python 环境"
+        report["message"] = "QMT 自动登录组件不可用（%s）。可取消自动启动，保存配置后手动启动并登录 QMT。" % names
+    commands = []
+    python = "& " + _ps_quote(report["python_executable"])
+    if report.get("supported") and failed:
+        if any(item["name"].startswith("win32") for item in failed):
+            if report.get("conda_pywin32"):
+                commands.append("conda install --prefix %s --force-reinstall 'pywin32>=306'" % _ps_quote(report["prefix"]))
+            else:
+                commands.append(python + " -m pip install --no-cache-dir --force-reinstall 'pywin32>=306'")
+                if report.get("global_python"):
+                    commands.append(python + " -m pywin32_postinstall -install")
+        if any(item["name"] == "frida" for item in failed):
+            commands.append(python + " -m pip install --no-cache-dir --force-reinstall 'frida>=17.0,<18'")
+        commands.append(python + " -c " + _ps_quote("import " + ", ".join(LOGIN_MODULES) + "; print('QMT login components OK')"))
+    report["repair_commands"] = commands
+    report["repair_note"] = (
+        "先停止 CFQuant，再在此电脑的 PowerShell 中执行；Conda 命令请使用 Anaconda PowerShell Prompt。"
+        "验证通过后重启 CFQuant，再重新检测。若仍报 DLL 错误，需要检查旧 DLL 残留；"
+        "虚拟环境中不要运行 pywin32_postinstall。"
+    )
+    return report
+
+
+def check_login_dependencies(python_exe=None, refresh=False, timeout=15):
+    """Probe the actual interpreter without installing packages or loading DLLs here."""
+    executable = str(python_exe or sys.executable)
+    with _LOCK:
+        if not refresh and executable in _CACHE:
+            return copy.deepcopy(_CACHE[executable])
+        report = {"python_executable": executable, "supported": sys.platform == "win32", "checks": []}
+        if not report["supported"]:
+            _CACHE[executable] = _finish_report(report)
+            return copy.deepcopy(_CACHE[executable])
+        try:
+            run_kwargs = {}
+            if os.name == "nt":
+                run_kwargs["creationflags"] = getattr(subprocess, "CREATE_NO_WINDOW", 0)
+            completed = subprocess.run(
+                [executable, "-c", "MODULES = %r\n" % (LOGIN_MODULES,) + _PROBE_CODE],
+                stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True, encoding="utf-8",
+                errors="replace", timeout=timeout,
+                **run_kwargs,
+            )
+            if completed.returncode:
+                raise RuntimeError((completed.stderr or completed.stdout or "Python dependency probe failed")[-4000:])
+            # Startup hooks may print before our JSON report.
+            report.update(json.loads(completed.stdout.strip().splitlines()[-1]))
+        except Exception as error:
+            report["error"] = str(error)
+        _CACHE[executable] = _finish_report(report)
+        return copy.deepcopy(_CACHE[executable])
+
+
+class QmtDependencyError(RuntimeError):
+    pass
+
+
+def import_login_module(name):
+    """Keep in-process import errors actionable, including stale loaded DLLs."""
+    try:
+        return importlib.import_module(name)
+    except (ImportError, OSError) as error:
+        raise QmtDependencyError(
+            "QMT 自动登录组件 %s 无法加载；运行环境：%s；原因：%s。"
+            "请查看自动登录组件检测中的修复说明，或取消自动启动后手动登录 QMT。"
+            % (name, sys.executable, error)
+        ) from error
+
+
+def report_startup_dependencies(python_exe=None):
+    report = check_login_dependencies(python_exe, refresh=True)
+    if not report.get("supported"):
+        return report
+    level = "INFO" if report["ok"] else "WARN"
+    print("[%s] %s Python=%s" % (level, report["message"], report["python_executable"]))
+    for item in report["checks"]:
+        if not item["ok"]:
+            print("[WARN] %s: %s" % (item["name"], item["error"]))
+    if report.get("error"):
+        print("[WARN] %s" % report["error"])
+    for command in report["repair_commands"]:
+        print("[REPAIR] %s" % command)
+    return report

{cfquant-0.2.54 → cfquant-0.2.55}/cfquant/tests/test_qmt_auto_login_browser.py

@@ -173,3 +173,27 @@ def test_login_result_is_visible_in_status_panel(page, frontend_url):
     assert '已登录' in result['success']
     assert '请修改保存的密码' in result['failure']
     assert errors == []
+
+
+def test_dependency_failure_shows_repair_command_and_manual_login_action(page, frontend_url):
+    _, errors = open_app(page, frontend_url, setup_required=False)
+    saved_binding(page)
+    page.evaluate("""() => {
+      state.qmtLoginDependencies = null;
+      renderQmtDependencyStatus({
+        supported: true, ok: false, python_executable: 'C:/Python311/python.exe',
+        environment: 'python', python_version: '3.11.9',
+        checks: [{name: 'win32api', ok: false, error: 'DLL load failed while importing win32api'}],
+        repair_commands: ["& 'C:/Python311/python.exe' -m pip install --force-reinstall pywin32"],
+        repair_note: '先停止 CFQuant 后执行。',
+        message: 'QMT 自动登录组件不可用（win32api）。',
+      });
+    }""")
+    panel = page.locator('#bindingQmtDependencies')
+    expect(panel).to_be_visible()
+    expect(panel).to_contain_text('win32api')
+    expect(panel).to_contain_text('C:/Python311/python.exe')
+    expect(panel.locator('[data-qmt-dependency-action="manual"]')).to_have_count(1)
+    panel.locator('[data-qmt-dependency-action="manual"]').click()
+    expect(page.locator('#bindingQmtAutoLogin')).not_to_be_checked()
+    assert errors == []

cfquant-0.2.55/cfquant/tests/test_qmt_dependencies.py

@@ -0,0 +1,55 @@
+import json
+import subprocess
+
+from cfquant import qmt_dependencies
+
+
+def test_dependency_probe_reports_loaded_modules_and_versions(monkeypatch):
+    monkeypatch.setattr(qmt_dependencies.sys, "platform", "win32")
+    qmt_dependencies._CACHE.clear()
+    payload = {
+        "python_executable": "C:/Python311/python.exe",
+        "python_version": "3.11.9",
+        "prefix": "C:/Python311",
+        "environment": "python",
+        "conda_pywin32": False,
+        "supported": True,
+        "checks": [
+            {"name": "frida", "ok": True, "path": "frida.pyd"},
+            {"name": "win32api", "ok": False, "error": "DLL load failed while importing win32api"},
+        ],
+        "packages": {"pywin32": "306", "frida": "17.16.4"},
+    }
+    monkeypatch.setattr(qmt_dependencies.subprocess, "run", lambda *args, **kwargs: subprocess.CompletedProcess(
+        args, 0, stdout=json.dumps(payload), stderr=""
+    ))
+
+    report = qmt_dependencies.check_login_dependencies("C:/Python311/python.exe", refresh=True)
+
+    assert report["ok"] is False
+    assert report["python_executable"] == "C:/Python311/python.exe"
+    assert report["repair_commands"]
+    assert "pip install" in report["repair_commands"][0]
+
+
+def test_conda_dependency_failure_generates_conda_repair_command(monkeypatch):
+    monkeypatch.setattr(qmt_dependencies.sys, "platform", "win32")
+    qmt_dependencies._CACHE.clear()
+    payload = {
+        "python_executable": "C:/Miniconda/envs/qmt/python.exe",
+        "python_version": "3.12.4",
+        "prefix": "C:/Miniconda/envs/qmt",
+        "environment": "conda",
+        "conda_pywin32": True,
+        "supported": True,
+        "checks": [{"name": "win32api", "ok": False, "error": "DLL load failed"}],
+        "packages": {"pywin32": "306", "frida": "17.16.4"},
+    }
+    monkeypatch.setattr(qmt_dependencies.subprocess, "run", lambda *args, **kwargs: subprocess.CompletedProcess(
+        args, 0, stdout=json.dumps(payload), stderr=""
+    ))
+
+    report = qmt_dependencies.check_login_dependencies(payload["python_executable"], refresh=True)
+
+    assert report["repair_commands"][0].startswith("conda install --prefix")
+    assert "--force-reinstall" in report["repair_commands"][0]

{cfquant-0.2.54 → cfquant-0.2.55}/cfquant/version.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 """cfquant core version metadata."""
 
-__version__ = "0.2.54"
-WEB_VERSION = "web_20261019_01"
+__version__ = "0.2.55"
+WEB_VERSION = "web_20261020_01"

{cfquant-0.2.54 → cfquant-0.2.55}/cfquant.egg-info/PKG-INFO

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

{cfquant-0.2.54 → cfquant-0.2.55}/cfquant.egg-info/SOURCES.txt

@@ -41,6 +41,7 @@ cfquant/qmt_bridge.py
 cfquant/qmt_component_agent.js
 cfquant/qmt_component_login.py
 cfquant/qmt_credentials.py
+cfquant/qmt_dependencies.py
 cfquant/qmt_pipe_runtime.py
 cfquant/qmt_strategy_deploy.py
 cfquant/qmt_strategy_package.py
@@ -130,6 +131,7 @@ cfquant/tests/test_qmt_auto_login_browser.py
 cfquant/tests/test_qmt_auto_login_integration.py
 cfquant/tests/test_qmt_binding_settings.py
 cfquant/tests/test_qmt_component_login.py
+cfquant/tests/test_qmt_dependencies.py
 cfquant/tests/test_qmt_fileless.py
 cfquant/tests/test_qmt_strategy_browser.py
 cfquant/tests/test_qmt_strategy_deploy.py

{cfquant-0.2.54 → cfquant-0.2.55}/cfquant_web_server.py

@@ -18,7 +18,8 @@ import os
 from pathlib import Path
 from cfquant.diagnostics import latency_report, SCHEMA as QUOTE_LATENCY_SCHEMA
 from cfquant.stock_connect import connect_account_type, normalize_connect_code, validate_connect_order, validate_connect_market
-from cfquant.qmt_binding_settings import normalize_qmt_runtime_settings, qmt_runtime_identity
+from cfquant.qmt_binding_settings import normalize_qmt_runtime_settings, qmt_runtime_identity
+from cfquant.qmt_dependencies import check_login_dependencies, report_startup_dependencies
 import posixpath
 import queue
 import re
@@ -11601,20 +11602,27 @@ def qmt_auto_login_apply_for_account(row, request=None, restart=False, reason="s
             if pid:
                 result["login_state"] = "logging_in"
                 _qmt_queue_component_login(login_row, paths, pid)
-    except Exception as error:
-        result.update({
-            "configured": False,
-            "error": str(error),
-            "message": "QMT 自动启动配置失败: %s" % error,
-        })
-        _qmt_auto_login_update_session(row, {
+    except Exception as error:
+        result.update({
+            "configured": False,
+            "error": str(error),
+            "message": "QMT 自动启动配置失败: %s" % error,
+        })
+        from cfquant.qmt_dependencies import QmtDependencyError
+        if isinstance(error, QmtDependencyError):
+            result["dependency_error"] = True
+            result["message"] = "自动登录组件不可用，请手动启动并登录 QMT；绑定保存状态请以配置结果为准。"
+            result["dependencies"] = check_login_dependencies(refresh=True)
+        _qmt_auto_login_update_session(row, {
             "enabled": True,
             "state": "error",
             "qmt_dir": qmt_dir,
             "restart_times": list(settings["restart_times"]),
-            "error": str(error),
-            "message": result["message"],
-        })
+            "error": str(error),
+            "message": result["message"],
+            "dependency_error": result.get("dependency_error", False),
+            "dependencies": result.get("dependencies"),
+        })
     return result
 
 
@@ -15091,8 +15099,8 @@ def management_qmt_start_policy():
     return None
 
 
-def management_status():
-    return {
+def management_status():
+    return {
         "api_version": 1,
         "ready": MANAGEMENT_READY,
         "boot_id": MANAGEMENT_BOOT_ID,
@@ -15102,7 +15110,8 @@ def management_status():
         "running_from_source": bool(_RUNNING_FROM_SOURCE),
         "core_version": current_core_version(),
         "web_version": WEB_VERSION,
-        "auto_start_qmt": management_qmt_start_policy(),
+        "auto_start_qmt": management_qmt_start_policy(),
+        "qmt_login_dependencies": check_login_dependencies(),
         "setup": WEB_CONFIG.setup_info(),
         "account_configs": WEB_CONFIG.account_configs(),
         "lttx_host": LTTX_HOST,
@@ -17023,8 +17032,10 @@ class CfquantWebHandler(BaseHTTPRequestHandler):
             return
         query = urllib.parse.parse_qs(parsed.query)
         try:
-            if parsed.path == "/api/health":
-                self._write_json(ok({"status": "ok"}))
+            if parsed.path == "/api/health":
+                self._write_json(ok({"status": "ok"}))
+            elif parsed.path == "/api/qmt-auto-login/dependencies":
+                self._write_json(ok(check_login_dependencies(refresh=parse_bool(query.get("refresh", ["0"])[0]))))
             elif parsed.path == "/api/management/status":
                 self._write_json(ok(management_status()))
             elif parsed.path == "/api/internal/runtime-route":
@@ -17060,7 +17071,8 @@ class CfquantWebHandler(BaseHTTPRequestHandler):
                     "web_auth": WEB_CONFIG.web_auth_info(include_username=True),
                     "user_profile": user_profile_response(),
                     "transport": WEB_CONFIG.transport_info(),
-                    "python_environment": WEB_CONFIG.python_environment_info(),
+                    "python_environment": WEB_CONFIG.python_environment_info(),
+                    "qmt_login_dependencies": check_login_dependencies(),
                     "pipe_hub": PIPE_HUB.status(),
                     "log_cleanup": log_cleanup_info(),
                     "qmt_log_language": qmt_log_language_info(),
@@ -17702,7 +17714,8 @@ def main(argv=None):
             "cfquant web port %s is already occupied by another process; stop it or set CFQUANT_WEB_PORT"
             % args.port
         )
-    ensure_lttx_started("Web 启动预启动")
+    report_startup_dependencies()
+    ensure_lttx_started("Web 启动预启动")
     # Older updater processes only copied raw entries. Refresh managed sources
     # before auto-login so QMT imports the selected mode's current package.
     for result in refresh_bound_qmt_strategies():

{cfquant-0.2.54 → cfquant-0.2.55}/pyproject.toml

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

{cfquant-0.2.54 → cfquant-0.2.55}/qmt_scripts/CFQUANT_LITE.py

@@ -700,7 +700,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.54"
+CORE_VERSION = "0.2.55"
 LITE_ENTRY_VERSION = "lite_20261014_03"
 
 _CANCELABLE_ORDER_STATUS_VALUES = set([48, 49, 50, 55])

{cfquant-0.2.54 → cfquant-0.2.55}/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

@@ -714,7 +714,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.54"
+CORE_VERSION = "0.2.55"
 LITE_ENTRY_VERSION = "lite_20261014_03"
 
 _CANCELABLE_ORDER_STATUS_VALUES = set([48, 49, 50, 55])

{cfquant-0.2.54 → cfquant-0.2.55}/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

@@ -714,7 +714,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.54"
+CORE_VERSION = "0.2.55"
 LITE_ENTRY_VERSION = "lite_20261014_03"
 
 _CANCELABLE_ORDER_STATUS_VALUES = set([48, 49, 50, 55])