dimine-python-sdk 0.2.2__py3-none-any.whl → 0.2.4__py3-none-any.whl

dimine_python_sdk/__init__.py

@@ -1,13 +1,33 @@
-from pathlib import Path
+from __future__ import annotations
 
-from .conn import ConnClient
+from pathlib import Path
+from typing import Any
 
 DOCS_PATH = Path(__file__).parent / "docs"
-__VERSION__ = "0.2.2"  # 由 build.bat 中的 generate_version.py 自动更新
+__VERSION__ = "0.2.4"  # 由 build.bat 中的 generate_version.py 自动更新
+
+
+_LAZY_IMPORTS: dict[str, Any] = {}
+
+
+def __getattr__(name: str) -> Any:
+    """PEP 562: 惰性加载 ConnClient，避免导入期触发 numpy/pydantic/websockets 等重依赖。"""
+    if name == "ConnClient":
+        if name not in _LAZY_IMPORTS:
+            from dimine_python_sdk.conn import ConnClient as _ConnClient
+
+            _LAZY_IMPORTS[name] = _ConnClient
+        return _LAZY_IMPORTS[name]
+    raise AttributeError(f"module '{__name__}' has no attribute '{name}'")
+
+
+def __dir__() -> list[str]:
+    """确保 dir() 和 IDE 自动补全能看到惰性加载的属性。"""
+    return sorted(set(list(globals()) + __all__ + list(_LAZY_IMPORTS)))
 
 
 __all__ = [
     "ConnClient",
     "DOCS_PATH",
-    "__VERSION__"
+    "__VERSION__",
 ]

dimine_python_sdk/cli/commands/camera.py

@@ -1,7 +1,5 @@
 """相机与截图相关 CLI 命令。"""
 
-import asyncio
-
 from dimine_python_sdk.cli.utils._utils import (
     get_client,
     handle_sdk_error,
@@ -9,6 +7,7 @@ from dimine_python_sdk.cli.utils._utils import (
     output_result,
     parse_json_arg,
     require_remote_sdk,
+    run_cli_async,
 )
 
 
@@ -35,7 +34,7 @@ def cmd_camera_set(fmt: str, center_point: str, normal_vector: str) -> None:
         }
 
     try:
-        result = asyncio.run(_run())
+        result = run_cli_async(_run())
         output_result(result, fmt)
     except Exception as e:
         handle_sdk_error(e, fmt, "设置相机视角失败")
@@ -56,7 +55,7 @@ def cmd_camera_screenshot(fmt: str) -> None:
         }
 
     try:
-        result = asyncio.run(_run())
+        result = run_cli_async(_run())
         output_result(result, fmt)
     except Exception as e:
         handle_sdk_error(e, fmt, "截图失败")

dimine_python_sdk/cli/commands/entity.py

@@ -1,7 +1,5 @@
 """实体相关 CLI 命令。"""
 
-import asyncio
-
 from dimine_python_sdk.cli.utils._utils import (
     ENTITY_TYPE_CN,
     fmt_selected_item,
@@ -11,6 +9,7 @@ from dimine_python_sdk.cli.utils._utils import (
     output_result,
     parse_entity_ids,
     require_remote_sdk,
+    run_cli_async,
     safe_int,
 )
 
@@ -57,7 +56,7 @@ def cmd_get_selected(fmt: str, page_size: int, page: int) -> None:
         }
 
     try:
-        result = asyncio.run(_run())
+        result = run_cli_async(_run())
         output_result(result, fmt)
     except Exception as e:
         handle_sdk_error(e, fmt, "获取选中实体失败")
@@ -100,7 +99,7 @@ def cmd_select(fmt: str, file_id: str | None, ids: str | None, mode: str) -> Non
         }
 
     try:
-        result = asyncio.run(_run())
+        result = run_cli_async(_run())
         output_result(result, fmt)
     except Exception as e:
         handle_sdk_error(e, fmt, "选中操作失败")
@@ -127,7 +126,7 @@ def cmd_delete(fmt: str, file_id: str | None, ids: str) -> None:
         }
 
     try:
-        result = asyncio.run(_run())
+        result = run_cli_async(_run())
         output_result(result, fmt)
     except Exception as e:
         handle_sdk_error(e, fmt, "删除实体失败")
@@ -162,7 +161,7 @@ def _set_visibility(fmt: str, file_id: str | None, raw_ids: str, action: str) ->
         }
 
     try:
-        result = asyncio.run(_run())
+        result = run_cli_async(_run())
         output_result(result, fmt)
     except Exception as e:
         handle_sdk_error(e, fmt, "设置可见性失败")

dimine_python_sdk/cli/commands/feature.py

@@ -1,7 +1,5 @@
 """要素/特征定义相关 CLI 命令。"""
 
-import asyncio
-
 from dimine_python_sdk.cli.utils._utils import (
     get_client,
     handle_sdk_error,
@@ -10,6 +8,7 @@ from dimine_python_sdk.cli.utils._utils import (
     parse_fields_arg,
     raise_or_exit,
     require_remote_sdk,
+    run_cli_async,
 )
 
 
@@ -38,7 +37,7 @@ def cmd_feature_list(fmt: str, file_id: str | None) -> None:
         return {"file_id": file_id, "feature_count": len(result), "features": result}
 
     try:
-        result = asyncio.run(_run())
+        result = run_cli_async(_run())
         output_result(result, fmt)
     except SystemExit:
         raise
@@ -70,7 +69,7 @@ def cmd_feature_create(fmt: str, file_id: str, name: str, fields: str) -> None:
         }
 
     try:
-        result = asyncio.run(_run())
+        result = run_cli_async(_run())
         output_result(result, fmt)
     except Exception as e:
         handle_sdk_error(e, fmt, "创建要素失败")
@@ -100,7 +99,7 @@ def cmd_feature_update(fmt: str, file_id: str, name: str, fields: str) -> None:
         }
 
     try:
-        result = asyncio.run(_run())
+        result = run_cli_async(_run())
         output_result(result, fmt)
     except Exception as e:
         handle_sdk_error(e, fmt, "更新要素失败")
@@ -123,7 +122,7 @@ def cmd_feature_delete(fmt: str, file_id: str, name: str) -> None:
         }
 
     try:
-        result = asyncio.run(_run())
+        result = run_cli_async(_run())
         output_result(result, fmt)
     except Exception as e:
         handle_sdk_error(e, fmt, "删除要素失败")

dimine_python_sdk/cli/commands/file.py

@@ -1,16 +1,14 @@
 """文件相关 CLI 命令。"""
 
-import asyncio
-
 from dimine_python_sdk.cli.utils._utils import (
     get_client,
     handle_sdk_error,
-    open_client,
     output_error,
     output_result,
     raise_or_exit,
     require_remote_sdk,
     resolve_path,
+    run_cli_async,
 )
 
 
@@ -36,7 +34,7 @@ def cmd_file_tree(fmt: str) -> None:
         return {"file_count": len(result), "files": result}
 
     try:
-        result = asyncio.run(_run())
+        result = run_cli_async(_run())
         output_result(result, fmt)
     except Exception as e:
         handle_sdk_error(e, fmt, "获取文件树失败")
@@ -52,21 +50,20 @@ def cmd_file_save(fmt: str, output_path: str, file_id: str | None) -> None:
 
     async def _run():
         nonlocal file_id
+        client = await get_client()
         if not file_id:
-            async with open_client() as client:
-                files = await client.get_files()
-                if not files:
-                    raise_or_exit("没有打开的文件。请先在 Dimine 中打开文件，或提供 --file-id 参数。", fmt)
-                if len(files) == 1:
-                    file_id = files[0].id
-                else:
-                    file_list = "\n".join([f"  - id: {f.id}, name: {f.name}" for f in files])
-                    raise_or_exit(
-                        f"当前打开了 {len(files)} 个文件，请指定 --file-id：\n{file_list}",
-                        fmt,
-                    )
-        async with open_client() as client:
-            await client.export_file(file_id=file_id, file_path=save_path)
+            files = await client.get_files()
+            if not files:
+                raise_or_exit("没有打开的文件。请先在 Dimine 中打开文件，或提供 --file-id 参数。", fmt)
+            if len(files) == 1:
+                file_id = files[0].id
+            else:
+                file_list = "\n".join([f"  - id: {f.id}, name: {f.name}" for f in files])
+                raise_or_exit(
+                    f"当前打开了 {len(files)} 个文件，请指定 --file-id：\n{file_list}",
+                    fmt,
+                )
+        await client.export_file(file_id=file_id, file_path=save_path)
         return {
             "success": True,
             "file_id": file_id,
@@ -75,7 +72,7 @@ def cmd_file_save(fmt: str, output_path: str, file_id: str | None) -> None:
         }
 
     try:
-        result = asyncio.run(_run())
+        result = run_cli_async(_run())
         output_result(result, fmt)
     except SystemExit:
         raise
@@ -84,7 +81,7 @@ def cmd_file_save(fmt: str, output_path: str, file_id: str | None) -> None:
 
 
 def cmd_file_open(fmt: str, path: str) -> None:
-    """在 Dimine 中打开文件（需 Dimine 运行）。"""
+    """在 Dimine 中打开文件（需 Dimine 运行）。如果文件已在 Dimine 中打开，先关闭再重新打开。"""
     err = require_remote_sdk()
     if err:
         output_error(err, fmt)
@@ -93,6 +90,16 @@ def cmd_file_open(fmt: str, path: str) -> None:
 
     async def _run():
         client = await get_client()
+
+        # 检查是否有同名文件已打开，如果有则先关闭
+        target_name = path
+        opened_files = await client.get_files()
+        for f in opened_files:
+            if f.name == target_name:
+                await client.close_file(f.id)
+                break
+
+        # 打开文件
         await client.open_file(file_path)
         return {
             "success": True,
@@ -101,7 +108,7 @@ def cmd_file_open(fmt: str, path: str) -> None:
         }
 
     try:
-        result = asyncio.run(_run())
+        result = run_cli_async(_run())
         output_result(result, fmt)
     except Exception as e:
         handle_sdk_error(e, fmt, "打开文件失败")
@@ -123,7 +130,7 @@ def cmd_file_close(fmt: str, file_id: str) -> None:
         }
 
     try:
-        result = asyncio.run(_run())
+        result = run_cli_async(_run())
         output_result(result, fmt)
     except Exception as e:
         handle_sdk_error(e, fmt, "关闭文件失败")
@@ -147,7 +154,7 @@ def cmd_file_create(fmt: str, path: str) -> None:
         }
 
     try:
-        result = asyncio.run(_run())
+        result = run_cli_async(_run())
         output_result(result, fmt)
     except Exception as e:
         handle_sdk_error(e, fmt, "创建文件失败")
@@ -180,7 +187,7 @@ def cmd_file_visibility(fmt: str, file_id: str, action: str) -> None:
         }
 
     try:
-        result = asyncio.run(_run())
+        result = run_cli_async(_run())
         output_result(result, fmt)
     except Exception as e:
         handle_sdk_error(e, fmt, "设置文件可见性失败")

dimine_python_sdk/cli/commands/geometry.py

@@ -1,6 +1,5 @@
 """几何体相关 CLI 命令。"""
 
-import asyncio
 import sys
 
 from dimine_python_sdk.cli.utils._utils import (
@@ -13,6 +12,7 @@ from dimine_python_sdk.cli.utils._utils import (
     parse_color,
     output_result,
     require_remote_sdk,
+    run_cli_async,
 )
 
 
@@ -308,9 +308,9 @@ def _build_partial_geometry_objects(geometries: list) -> list:
     return result
 
 
-def cmd_geometry_get(fmt: str, file_id: str, layer_id: str | None,
-                     entity_types: str | None = None, features: str | None = None,
-                     with_geometry: bool = False) -> None:
+def cmd_geometry_list(fmt: str, file_id: str, layer_id: str | None,
+                      entity_types: str | None = None, features: str | None = None,
+                      with_geometry: bool = False) -> None:
     """获取图层中的几何体对象（需 Dimine 运行）。
 
     默认只返回几何体的基础信息（id、file、layer、feature、type、color、properties）。
@@ -366,7 +366,7 @@ def cmd_geometry_get(fmt: str, file_id: str, layer_id: str | None,
             }
 
     try:
-        result = asyncio.run(_run())
+        result = run_cli_async(_run())
         output_result(result, fmt)
     except Exception as e:
         handle_sdk_error(e, fmt, "获取几何体失败")
@@ -423,7 +423,7 @@ def cmd_geometry_create(fmt: str, geometries: str | None = None,
         }
 
     try:
-        result = asyncio.run(_run())
+        result = run_cli_async(_run())
         output_result(result, fmt)
     except Exception as e:
         handle_sdk_error(e, fmt, "创建几何体失败")
@@ -483,7 +483,7 @@ def cmd_geometry_update(fmt: str, geometries: str | None = None,
         }
 
     try:
-        result = asyncio.run(_run())
+        result = run_cli_async(_run())
         output_result(result, fmt)
     except Exception as e:
         handle_sdk_error(e, fmt, "更新几何体失败")
@@ -557,7 +557,7 @@ def cmd_geometry_upsert(fmt: str, geometries: str | None = None,
         }
 
     try:
-        result = asyncio.run(_run())
+        result = run_cli_async(_run())
         output_result(result, fmt)
     except Exception as e:
         handle_sdk_error(e, fmt, "处理几何体失败")
@@ -610,7 +610,7 @@ def register_commands(subparsers, format_parent) -> None:
 
 
 COMMAND_HANDLERS = {
-    "geometry-list": lambda args: cmd_geometry_get(args.format, args.file_id, args.layer_id,
+    "geometry-list": lambda args: cmd_geometry_list(args.format, args.file_id, args.layer_id,
                                                    args.entity_types, args.features,
                                                    args.with_geometry),
     "geometry-create": lambda args: cmd_geometry_create(args.format, args.geometries,

dimine_python_sdk/cli/commands/laneway.py

@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-import asyncio
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
@@ -13,6 +12,7 @@ from dimine_python_sdk.cli.utils._utils import (
     get_client,
     output_error,
     output_result,
+    run_cli_async,
     require_local_sdk,
     require_remote_sdk,
     safe_float,
@@ -170,7 +170,7 @@ def cmd_tunnel(fmt: str, section_type: int, width: float, height: float | None,
         if err:
             output_error(f"未提供 --center-lines，需要从 Dimine 获取选中线段: {err}", fmt)
         try:
-            lines = asyncio.run(_fetch_center_lines_from_selection())
+            lines = run_cli_async(_fetch_center_lines_from_selection())
         except Exception as e:
             output_error(f"获取选中线段失败: {e}", fmt)
     else:
@@ -228,7 +228,7 @@ def cmd_tunnel(fmt: str, section_type: int, width: float, height: float | None,
         }
 
         if import_to_dimine:
-            import_result = asyncio.run(_import_to_dimine(geometries))
+            import_result = run_cli_async(_import_to_dimine(geometries))
             result["imported"] = import_result
         else:
             # 仅在明确不导入时返回简化模型摘要，不含原始坐标

dimine_python_sdk/cli/commands/layer.py

@@ -1,7 +1,5 @@
 """图层相关 CLI 命令。"""
 
-import asyncio
-
 from dimine_python_sdk.cli.utils._utils import (
     get_client,
     handle_sdk_error,
@@ -9,6 +7,7 @@ from dimine_python_sdk.cli.utils._utils import (
     output_result,
     raise_or_exit,
     require_remote_sdk,
+    run_cli_async,
 )
 
 
@@ -31,7 +30,7 @@ def cmd_layers(fmt: str, file_id: str | None) -> None:
         return {"file_id": file_id, "layer_count": len(result), "layers": result}
 
     try:
-        result = asyncio.run(_run())
+        result = run_cli_async(_run())
         output_result(result, fmt)
     except SystemExit:
         raise
@@ -63,7 +62,7 @@ def cmd_layer_create(fmt: str, name: str, file_id: str | None) -> None:
         }
 
     try:
-        result = asyncio.run(_run())
+        result = run_cli_async(_run())
         output_result(result, fmt)
     except SystemExit:
         raise
@@ -99,7 +98,7 @@ def cmd_layer_visibility(fmt: str, file_id: str, layer_name: str, action: str) -
         }
 
     try:
-        result = asyncio.run(_run())
+        result = run_cli_async(_run())
         output_result(result, fmt)
     except Exception as e:
         handle_sdk_error(e, fmt, "设置图层可见性失败")
@@ -128,7 +127,7 @@ def cmd_layer_delete(fmt: str, name: str, file_id: str | None) -> None:
         }
 
     try:
-        result = asyncio.run(_run())
+        result = run_cli_async(_run())
         output_result(result, fmt)
     except SystemExit:
         raise

dimine_python_sdk/cli/commands/text.py

@@ -1,7 +1,5 @@
 """文字标注相关 CLI 命令。"""
 
-import asyncio
-
 from dimine_python_sdk.cli.utils._utils import (
     get_client,
     handle_sdk_error,
@@ -11,8 +9,8 @@ from dimine_python_sdk.cli.utils._utils import (
     parse_json_arg,
     parse_point3d,
     require_remote_sdk,
+    run_cli_async,
 )
-from dimine_python_sdk.models.types import TextInfo
 
 
 def cmd_text_add(
@@ -37,6 +35,8 @@ def cmd_text_add(
         text_infos = []
         if geometries is not None:
             # 批量模式：从 JSON 解析完整的 TextInfo 列表
+            from dimine_python_sdk.models.types import TextInfo
+
             items = parse_json_arg(geometries, "geometries")
             if not isinstance(items, list):
                 raise ValueError("--geometries 必须是 JSON 数组格式")
@@ -76,7 +76,7 @@ def cmd_text_add(
         }
 
     try:
-        result = asyncio.run(_run())
+        result = run_cli_async(_run())
         output_result(result, fmt)
     except Exception as e:
         handle_sdk_error(e, fmt, "添加文字标注失败")

dimine_python_sdk/cli/utils/_utils.py

@@ -8,60 +8,77 @@
 - JSON/文本输出格式化
 """
 
-import asyncio
+from __future__ import annotations
+
 import json
 import os
 import re
 import sys
-from typing import Any, Optional
+from typing import TYPE_CHECKING, Any, Optional
 
-from dimine_python_sdk.conn.conn_client import ConnClient
+if TYPE_CHECKING:
+    from dimine_python_sdk.conn.conn_client import ConnClient
 
 # ==============================================================================
 # SDK 状态检查
 # ==============================================================================
 
-_SDK_AVAILABLE = False
-_local_sdk_available = False
+_SDK_AVAILABLE: bool | None = None  # None = 尚未检查
+_local_sdk_available: bool | None = None  # None = 尚未检查
 _import_error: str = ""
-open_client = None  # type: ignore[assignment]
-
-try:
-    from dimine_python_sdk.conn.conn_client import open_client as _open_client  # type: ignore[no-redef]
-    open_client = _open_client
-    _SDK_AVAILABLE = True
-except ImportError as e:
-    _import_error = str(e)
-except Exception as e:
-    _import_error = str(e)
-
-try:
-    from dimine_python_sdk.lib.native._core import Dm  # noqa: F401
-    _local_sdk_available = True
-except ImportError:
-    pass
-except Exception:
-    pass
+_open_client: Any = None  # 惰性缓存的 open_client 函数（私有，勿直接 import）
+
+
+def _check_remote_sdk() -> bool:
+    """惰性检查远程 SDK 是否可用。首次调用时导入 conn 模块链并缓存结果。"""
+    global _SDK_AVAILABLE, _import_error, _open_client
+    if _SDK_AVAILABLE is not None:
+        return _SDK_AVAILABLE
+    try:
+        from dimine_python_sdk.conn.conn_client import open_client as _conn_open_client
+        _open_client = _conn_open_client
+        _SDK_AVAILABLE = True
+    except ImportError as e:
+        _import_error = str(e)
+        _SDK_AVAILABLE = False
+    except Exception as e:
+        _import_error = str(e)
+        _SDK_AVAILABLE = False
+    return _SDK_AVAILABLE
+
+
+def _check_local_sdk() -> bool:
+    """惰性检查本地 SDK 是否可用。首次调用时加载 DmPyBindInterface.pyd 并缓存结果。"""
+    global _local_sdk_available
+    if _local_sdk_available is not None:
+        return _local_sdk_available
+    try:
+        from dimine_python_sdk.lib.native._core import Dm  # noqa: F401
+        _local_sdk_available = True
+    except (ImportError, Exception):
+        _local_sdk_available = False
+    return _local_sdk_available
 
 
 def is_remote_sdk_available() -> bool:
     """返回远程 SDK 是否可用。"""
-    return _SDK_AVAILABLE
+    return _check_remote_sdk()
 
 
 def is_local_sdk_available() -> bool:
     """返回本地 SDK 是否可用。"""
-    return _local_sdk_available
+    return _check_local_sdk()
 
 
 def get_import_error() -> str:
     """返回 SDK 导入错误信息。"""
+    _check_remote_sdk()  # 确保已检查
     return _import_error
 
 
 def require_remote_sdk() -> str:
     """返回远程 SDK 不可用时的错误消息（空字符串表示可用）。"""
-    if _SDK_AVAILABLE:
+    if _check_remote_sdk():
         return ""
     return (
         f"Dimine Python SDK 不可用: {_import_error}\n\n"
@@ -75,7 +92,7 @@ def require_remote_sdk() -> str:
 
 def require_local_sdk() -> str:
     """返回本地 SDK 不可用时的错误消息（空字符串表示可用）。"""
-    if _local_sdk_available:
+    if _check_local_sdk():
         return ""
     return (
         f"Dimine Python SDK 本地模块不可用。\n"
@@ -94,12 +111,37 @@ _client_instance: Optional[Any] = None
 _client_loop_id: Optional[int] = None
 
 
+async def _run_with_cleanup(coro):
+    """包装协程，确保在事件循环关闭前清理 WebSocket 客户端。
+
+    防止 Windows ProactorEventLoop 关闭时因未清理的 IOCP 句柄导致
+    进程退出码变为 0xC0000409 (-1073740791)。
+    """
+    try:
+        return await coro
+    finally:
+        await close_client()
+
+
+def run_cli_async(coro):
+    """CLI 命令统一入口：运行异步操作并确保客户端清理。
+
+    替代裸 asyncio.run()，在所有 CLI 命令的 _run() 之后调用。
+    用法：result = run_cli_async(_run())
+    """
+    import asyncio
+
+    return asyncio.run(_run_with_cleanup(coro))
+
+
 async def get_client()->ConnClient:
     """获取或创建共享的 WebSocket 客户端，避免每次操作都建立新连接。
 
     如果检测到事件循环已变更（如 asyncio.run() 多次调用场景），
     自动丢弃旧连接并重新建立，避免跨事件循环使用 WebSocket 导致的 RuntimeError。
     """
+    import asyncio
+
     global _client_ctx, _client_instance, _client_loop_id
 
     # 检测事件循环是否变更（asyncio.run() 每次创建新的事件循环）
@@ -115,7 +157,7 @@ async def get_client()->ConnClient:
         _client_loop_id = None
 
     if _client_instance is None:
-        _client_ctx = open_client()
+        _client_ctx = _open_client()
         _client_instance = await _client_ctx.__aenter__()
         _client_loop_id = id(asyncio.get_running_loop())
     return _client_instance

dimine_python_sdk/conn/base_conn_client.py

@@ -19,6 +19,7 @@ class BaseConnClient:
     model_config = {"arbitrary_types_allowed": True}
 
     url: Optional[str] = "ws://127.0.0.1:8000"
+    max_size: Optional[int] = None
     is_connected: Optional[bool] = False
     pending_requests: Dict[str, Tuple[asyncio.Future, Callable]] = field(default_factory=dict)
     event_handlers: Dict[str, List[Callable]] = field(default_factory=dict)
@@ -106,7 +107,10 @@ class BaseConnClient:
 
     async def connect(self)-> bool:
         try:
-            self.websocket = await websockets.connect(self.url, close_timeout=1)
+            connect_kwargs: Dict[str, Any] = {"close_timeout": 1}
+            if self.max_size is not None:
+                connect_kwargs["max_size"] = self.max_size
+            self.websocket = await websockets.connect(self.url, **connect_kwargs)
             self.is_connected = True
             logger.info("success connected to %s", self.url)
             if self.receive_task is None or self.receive_task.done():