xtquant-share 1.1.6__tar.gz → 1.2.2__tar.gz

{xtquant_share-1.1.6 → xtquant_share-1.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xtquant-share
-Version: 1.1.6
+Version: 1.2.2
 Summary: Xtreme Quant Share - eXtreme transparent sharing proxy for XtQuant on macOS/Linux
 Author-email: Jason Hu <63170682@qq.com>
 License-Expression: GPL-3.0-only

{xtquant_share-1.1.6 → xtquant_share-1.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "xtquant-share"
-version = "1.1.6"
+version = "1.2.2"
 description = "Xtreme Quant Share - eXtreme transparent sharing proxy for XtQuant on macOS/Linux"
 readme = "README.md"
 license = "GPL-3.0-only"
@@ -52,10 +52,12 @@ dev = [
 ]
 
 [project.scripts]
-xqshare-server = "xqshare.server:main"
 xtdata = "xqshare.tools.xtdata:main"
 xttrader = "xqshare.tools.xttrader:main"
 
+[project.gui-scripts]
+xqshare-server = "xqshare.server:main"
+
 [project.urls]
 Homepage = "https://gitee.com/jdragonhu/xqshare"
 Documentation = "https://gitee.com/jdragonhu/xqshare#readme"

{xtquant_share-1.1.6 → xtquant_share-1.2.2}/xqshare/server.py

@@ -81,7 +81,14 @@ def setup_logging(log_dir: str = None, log_level: str = "INFO"):
     root_logger = logging.getLogger()
     root_logger.setLevel(getattr(logging, log_level.upper()))
     
-    console_handler = logging.StreamHandler()
+    import sys
+    import io
+    # 强制 stdout 使用 UTF-8（解决 Windows 后台启动时日志乱码）
+    if sys.stdout and hasattr(sys.stdout, 'buffer'):
+        utf8_stdout = io.TextIOWrapper(sys.stdout.buffer, encoding='utf-8', errors='replace')
+    else:
+        utf8_stdout = sys.stdout
+    console_handler = logging.StreamHandler(utf8_stdout)
     console_handler.setFormatter(formatter)
     console_handler.setLevel(logging.INFO)
     root_logger.addHandler(console_handler)
@@ -118,8 +125,34 @@ def _init_logging(log_level="INFO"):
 
 # ==================== 日志装饰器 ====================
 
+def _deliver(obj):
+    """将 rpyc netref 对象本地化为真正的 Python 对象。
+    xtquant 底层 C++ 扩展做严格类型检查，netref 不被识别为 list/dict 等原生类型，
+    必须在调用前将参数本地化。
+    """
+    try:
+        import rpyc
+        if isinstance(obj, rpyc.BaseNetref):
+            return rpyc.classic.obtain(obj)
+    except Exception:
+        pass
+    # 对类 list 的可迭代容器做兜底转换（排除 str/bytes，避免被拆成字符数组）
+    if (type(obj) not in (list, str, bytes)
+            and hasattr(obj, '__iter__')
+            and hasattr(obj, '__len__')):
+        try:
+            return list(obj)
+        except Exception:
+            pass
+    return obj
+
+
 def _log_call(name: str, client_info: str, func, *args, **kwargs):
     """通用的 API 调用日志记录函数"""
+    # 将 rpyc netref 参数本地化，避免 C++ 扩展类型检查失败
+    args = tuple(_deliver(a) for a in args)
+    kwargs = {k: _deliver(v) for k, v in kwargs.items()}
+
     try:
         args_str = str(args)[:200] if args else ""
         kwargs_str = str(kwargs)[:200] if kwargs else ""
@@ -386,8 +419,14 @@ class XtQuantService(rpyc.Service):
         client_info = getattr(self, '_client_info', 'unknown')
         logger.info(f"[断开] 客户端离开: {client_info}")
         # 自动清理本次连接创建的所有 trader 实例，防止 session 资源泄漏
+        # 必须先 disconnect() 再 stop()，否则 miniQMT 内部 session 不会真正释放
         traders = getattr(self, '_traders', [])
         for trader in traders:
+            try:
+                trader.disconnect()
+                logger.info(f"[清理Trader] 已自动 disconnect trader | client={client_info}")
+            except Exception as e:
+                logger.warning(f"[清理Trader] disconnect trader 失败: {e} | client={client_info}")
             try:
                 trader.stop()
                 logger.info(f"[清理Trader] 已自动 stop trader | client={client_info}")
@@ -885,13 +924,13 @@ def _cmd_background(args):
     if args.env_file != ".env":
         cmd += ["--env-file", args.env_file]
 
-    with open(log_file, "a") as log_f:
+    with open(log_file, "a", encoding="utf-8") as log_f:
         if sys.platform == "win32":
             proc = subprocess.Popen(
                 cmd,
                 stdout=log_f,
                 stderr=log_f,
-                creationflags=subprocess.CREATE_NEW_PROCESS_GROUP | subprocess.DETACHED_PROCESS,
+                creationflags=subprocess.CREATE_NEW_PROCESS_GROUP | subprocess.DETACHED_PROCESS | subprocess.CREATE_NO_WINDOW,
                 close_fds=True,
             )
         else:

{xtquant_share-1.1.6 → xtquant_share-1.2.2}/xtquant_share.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xtquant-share
-Version: 1.1.6
+Version: 1.2.2
 Summary: Xtreme Quant Share - eXtreme transparent sharing proxy for XtQuant on macOS/Linux
 Author-email: Jason Hu <63170682@qq.com>
 License-Expression: GPL-3.0-only

{xtquant_share-1.1.6 → xtquant_share-1.2.2}/xtquant_share.egg-info/entry_points.txt

@@ -1,4 +1,6 @@
 [console_scripts]
-xqshare-server = xqshare.server:main
 xtdata = xqshare.tools.xtdata:main
 xttrader = xqshare.tools.xttrader:main
+
+[gui_scripts]
+xqshare-server = xqshare.server:main