cfquant 0.2.22__tar.gz → 0.2.24__tar.gz

{cfquant-0.2.22 → cfquant-0.2.24}/PKG-INFO

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

{cfquant-0.2.22 → cfquant-0.2.24}/cfquant/_editable_install.py

@@ -114,7 +114,7 @@ def _run_pip_command(
 ):
     kwargs = {
         "cwd": str(project_root),
-        "env": python_environment(clear_pythonpath=True),
+        "env": pip_environment(),
         "stdout": subprocess.PIPE,
         "stderr": subprocess.STDOUT,
         "text": True,
@@ -318,7 +318,7 @@ def run_editable_install(
     })
     kwargs = {
         "cwd": str(project_root),
-        "env": python_environment(clear_pythonpath=True),
+        "env": pip_environment(),
         "stdout": subprocess.PIPE,
         "stderr": subprocess.STDOUT,
         "text": True,
@@ -413,6 +413,15 @@ def python_environment(clear_pythonpath=False):
     return env
 
 
+def pip_environment():
+    env = python_environment(clear_pythonpath=True)
+    # Legacy Windows egg-link files use the system encoding, not UTF-8.
+    if sys.platform == "win32":
+        env["PYTHONUTF8"] = "0"
+    env["PYTHONIOENCODING"] = "utf-8"
+    return env
+
+
 def neutral_check_cwd():
     return Path(tempfile.gettempdir()).resolve()
 
@@ -423,7 +432,8 @@ def run(args, cwd, quiet=False, clear_pythonpath=False):
     return subprocess.run(
         list(args),
         cwd=str(cwd),
-        env=python_environment(clear_pythonpath=clear_pythonpath),
+        env=(pip_environment() if list(args)[1:3] == ["-m", "pip"]
+             else python_environment(clear_pythonpath=clear_pythonpath)),
         stdout=stdout,
         stderr=stderr,
     )
@@ -441,6 +451,27 @@ def is_cfquant_installed(python_exe=None):
     return completed.returncode == 0
 
 
+def project_package_version(project_root):
+    try:
+        import tomllib
+    except ImportError:
+        from pip._vendor import tomli as tomllib
+    with (Path(project_root) / "pyproject.toml").open("rb") as stream:
+        return str(tomllib.load(stream)["project"]["version"])
+
+
+def installed_package_version(python_exe=None):
+    completed = subprocess.run(
+        [python_exe or sys.executable, "-c",
+         "from importlib.metadata import version; print(version('cfquant'))"],
+        cwd=str(neutral_check_cwd()),
+        env=python_environment(clear_pythonpath=True),
+        stdout=subprocess.PIPE, stderr=subprocess.PIPE,
+        text=True, encoding="utf-8", timeout=30,
+    )
+    return completed.stdout.strip() if completed.returncode == 0 else ""
+
+
 def ensure_cfquant_installed(project_root, python_exe=None):
     project_root = Path(project_root).resolve()
     if not (project_root / "pyproject.toml").is_file():
@@ -448,9 +479,11 @@ def ensure_cfquant_installed(project_root, python_exe=None):
         return 2
 
     python_exe = python_exe or sys.executable
-    print("Checking whether %s is installed in this Python environment..." % PACKAGE_NAME)
-    if is_cfquant_installed(python_exe):
-        print("%s and its runtime dependencies are ready; skip editable source install." % PACKAGE_NAME)
+    expected = project_package_version(project_root)
+    installed = installed_package_version(python_exe)
+    print("cfquant installed=%s project=%s" % (installed or "missing", expected))
+    if installed == expected:
+        print("Package versions match; skip installation.")
         return 0
 
     command = editable_install_args(project_root, python_exe)
@@ -470,8 +503,8 @@ def ensure_cfquant_installed(project_root, python_exe=None):
             print("[ERROR] source install failed with exit code %s." % completed.returncode, file=sys.stderr)
             return completed.returncode
 
-    if not is_cfquant_installed(python_exe):
-        print("[ERROR] %s is still not visible after source install." % PACKAGE_NAME, file=sys.stderr)
+    if installed_package_version(python_exe) != expected:
+        print("[ERROR] Installed cfquant version does not match the project after installation.", file=sys.stderr)
         return 1
     print("%s package is installed." % PACKAGE_NAME)
     return 0

{cfquant-0.2.22 → cfquant-0.2.24}/cfquant/tests/16_/345/220/257/345/212/250/345/256/211/350/243/205/346/265/213/350/257/225.py

@@ -1,12 +1,44 @@
 # -*- coding: utf-8 -*-
 import json
 import subprocess
+import sys
 from pathlib import Path
 
+import pytest
 from cfquant import _editable_install
 from cfquant import cli
 
 
+def test_pip_environment_preserves_parent_settings(monkeypatch):
+    monkeypatch.setenv("PYTHONUTF8", "1")
+    monkeypatch.setenv("PYTHONPATH", "inherited-source")
+    monkeypatch.setattr(sys, "platform", "win32")
+    env = _editable_install.pip_environment()
+    assert env["PYTHONUTF8"] == "0"
+    assert env["PYTHONIOENCODING"] == "utf-8"
+    assert "PYTHONPATH" not in env
+    assert _editable_install.os.environ["PYTHONUTF8"] == "1"
+
+
+@pytest.mark.skipif(sys.platform != "win32", reason="Windows legacy encoding")
+def test_pip_scans_legacy_egg_link_without_modifying_it(tmp_path):
+    target = tmp_path / "\u79c1\u4eba\u6587\u4ef6"
+    try:
+        contents = (str(target) + "\n").encode("mbcs")
+    except UnicodeEncodeError:
+        pytest.skip("System encoding cannot represent the fixture path")
+    target.mkdir()
+    link = tmp_path / "legacy.egg-link"
+    link.write_bytes(contents)
+    result = _editable_install._run_pip_command(
+        [sys.executable, "-m", "pip", "list", "--path", str(tmp_path),
+         "--format=json", "--disable-pip-version-check"],
+        tmp_path,
+    )
+    assert result["ok"], result["output"]
+    assert link.read_bytes() == contents
+
+
 def test_editable_install_uses_split_arguments(tmp_path):
     command = _editable_install.editable_install_args(tmp_path, python_exe="python")
 
@@ -260,8 +292,8 @@ def test_run_editable_install_falls_back_to_source_install(monkeypatch, tmp_path
 
 
 def test_ensure_cfquant_installed_falls_back_to_source_install(monkeypatch, tmp_path):
-    (tmp_path / "pyproject.toml").write_text("[project]\nname = 'cfquant'\n", encoding="utf-8")
-    installed_checks = [False, True]
+    (tmp_path / "pyproject.toml").write_text("[project]\nname = 'cfquant'\nversion = '0.2.23'\n", encoding="utf-8")
+    installed_checks = ["0.2.22", "0.2.23"]
     calls = []
 
     def fake_is_installed(python_exe=None):
@@ -277,7 +309,7 @@ def test_ensure_cfquant_installed_falls_back_to_source_install(monkeypatch, tmp_
         result.returncode = 7 if "--editable" in args else 0
         return result
 
-    monkeypatch.setattr(_editable_install, "is_cfquant_installed", fake_is_installed)
+    monkeypatch.setattr(_editable_install, "installed_package_version", fake_is_installed)
     monkeypatch.setattr(_editable_install, "run", fake_run)
 
     assert _editable_install.ensure_cfquant_installed(tmp_path, python_exe="python") == 0
@@ -286,6 +318,20 @@ def test_ensure_cfquant_installed_falls_back_to_source_install(monkeypatch, tmp_
     assert calls[1][0][-1] == "."
 
 
+@pytest.mark.parametrize("installed", ["", "0.2.22", "0.2.24", "0.2.23"])
+def test_startup_installs_only_when_version_differs(monkeypatch, tmp_path, installed):
+    (tmp_path / "pyproject.toml").write_text("[project]\nversion='0.2.23'\n", encoding="utf-8")
+    versions = iter([installed, "0.2.23"])
+    monkeypatch.setattr(_editable_install, "installed_package_version", lambda exe: next(versions))
+    calls = []
+    def install(args, cwd):
+        calls.append(args)
+        return subprocess.CompletedProcess(args, 0)
+    monkeypatch.setattr(_editable_install, "run", install)
+    assert _editable_install.ensure_cfquant_installed(tmp_path, "python") == 0
+    assert len(calls) == (0 if installed == "0.2.23" else 1)
+
+
 def test_start_script_passes_dot_not_trailing_dp0():
     script = (Path(__file__).resolve().parents[2] / "start_cfquant.bat").read_text(encoding="utf-8")
 

{cfquant-0.2.22 → cfquant-0.2.24}/cfquant/tests/test_project_updater.py

@@ -36,7 +36,7 @@ def project_updater(tmp_path, monkeypatch):
     monkeypatch.setattr(
         updater,
         "_run_editable_install",
-        lambda reason: {"attempted": False, "ok": True, "reason": reason},
+        lambda reason: pytest.fail("Web updates must not run pip"),
     )
     monkeypatch.setattr(updater, "_require_editable_install", lambda result: None)
     return web, updater, project_root

{cfquant-0.2.22 → cfquant-0.2.24}/cfquant/version.py

@@ -2,4 +2,4 @@
 """cfquant core version metadata."""
 
 __version__ = "core_20260917_01"
-WEB_VERSION = "web_20260917_01"
+WEB_VERSION = "web_20260917_03"

{cfquant-0.2.22 → cfquant-0.2.24}/cfquant.egg-info/PKG-INFO

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

{cfquant-0.2.22 → cfquant-0.2.24}/cfquant_web_server.py

@@ -9038,18 +9038,11 @@ class CfquantProjectUpdater(object):
             try:
                 self._set_operation_phase("restore", "正在恢复选中的项目版本")
                 self._restore_backup(selected)
-                self._set_operation_phase("install", "正在刷新当前 Python 环境中的源码安装")
-                editable_install = self._run_editable_install("project_rollback")
-                self._require_editable_install(editable_install)
+                editable_install = {"deferred": True, "attempted": False}
                 self._set_operation_phase("deploy", "正在同步回滚后的 cfquant 核心到 QMT 目录")
                 qmt_core_deploy = auto_deploy_qmt_core_for_all_accounts(source_dir=BASE_DIR)
             except Exception:
                 self._restore_backup(rollback_backup)
-                try:
-                    recovery_install = self._run_editable_install("project_rollback_recovery")
-                    self._require_editable_install(recovery_install)
-                except Exception as recovery_error:
-                    safe_print("project rollback editable install recovery failed: %s" % recovery_error)
                 raise
             self._write_rollback_meta(
                 selected,
@@ -9113,9 +9106,7 @@ class CfquantProjectUpdater(object):
                 shutil.copy2(src, dst)
                 copied.append(rel_path)
             entry_info = self._entry_update_info(changed)
-            self._set_operation_phase("install", "正在刷新当前 Python 环境中的源码安装")
-            editable_install = self._run_editable_install("project_update")
-            self._require_editable_install(editable_install)
+            editable_install = {"deferred": True, "attempted": False}
             self._set_operation_phase("deploy", "正在同步最新 cfquant 核心到 QMT 目录")
             qmt_core_deploy = auto_deploy_qmt_core_for_all_accounts(source_dir=BASE_DIR)
             qmt_deploy_summary = qmt_core_deploy.get("summary") or {}
@@ -9156,12 +9147,6 @@ class CfquantProjectUpdater(object):
             }
         except Exception:
             self._restore_backup(backup)
-            if editable_install and editable_install.get("attempted"):
-                try:
-                    recovery_install = self._run_editable_install("project_update_recovery")
-                    self._require_editable_install(recovery_install)
-                except Exception as recovery_error:
-                    safe_print("project update editable install recovery failed: %s" % recovery_error)
             raise
 
     def _run_editable_install(self, reason):

{cfquant-0.2.22 → cfquant-0.2.24}/pyproject.toml

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

{cfquant-0.2.22 → cfquant-0.2.24}/web_dashboard/app.js

@@ -1,4 +1,4 @@
-const FRONTEND_VERSION = 'web_20260917_01';
+const FRONTEND_VERSION = 'web_20260917_03';
 
 const state = {
   accountId: '',
@@ -5466,8 +5466,7 @@ function qmtUpdateProgressSteps(kind) {
       { key: 'upload', label: '上传项目源码 zip', percent: 42 },
       { key: 'backup', label: '备份当前 Web 项目', percent: 58 },
       { key: 'install', label: '替换 Web 项目文件', percent: 82 },
-      { key: 'editable-install', label: '更新 Python SDK', percent: 88 },
-      { key: 'restart', label: '重启 Web 服务', percent: 94 },
+      { key: 'restart', label: '重启并检查 SDK 版本', percent: 94 },
       { key: 'done', label: '更新完成', percent: 100 },
     ];
   }
@@ -5476,8 +5475,7 @@ function qmtUpdateProgressSteps(kind) {
       { key: 'prepare', label: '确认 Web 回滚目标', percent: 12 },
       { key: 'backup', label: '备份当前 Web 项目', percent: 36 },
       { key: 'restore', label: '恢复选中备份', percent: 76 },
-      { key: 'editable-install', label: '更新 Python SDK', percent: 88 },
-      { key: 'restart', label: '重启 Web 服务', percent: 94 },
+      { key: 'restart', label: '重启并检查 SDK 版本', percent: 94 },
       { key: 'done', label: '回滚完成', percent: 100 },
     ];
   }
@@ -5487,8 +5485,7 @@ function qmtUpdateProgressSteps(kind) {
       { key: 'download', label: '连接官网并下载发布包', percent: 38 },
       { key: 'backup', label: '备份当前 Web 项目', percent: 58 },
       { key: 'install', label: '替换 Web 项目文件', percent: 82 },
-      { key: 'editable-install', label: '更新 Python SDK', percent: 88 },
-      { key: 'restart', label: '重启 Web 服务', percent: 94 },
+      { key: 'restart', label: '重启并检查 SDK 版本', percent: 94 },
       { key: 'done', label: '更新完成', percent: 100 },
     ];
   }

{cfquant-0.2.22 → cfquant-0.2.24}/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_20260917_01">
+  <link rel="stylesheet" href="/styles.css?v=web_20260917_03">
 </head>
 <body>
   <div id="webAuthOverlay" class="auth-overlay hidden" aria-live="polite">
@@ -3176,6 +3176,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_20260917_01"></script>
+  <script src="/app.js?v=web_20260917_03"></script>
 </body>
 </html>