dicom-mcp 1.2.0 → 1.2.1

package/CHANGELOG.md

@@ -5,6 +5,15 @@
 格式遵循 [Keep a Changelog](https://keepachangelog.com/)，
 版本号遵循 [Semantic Versioning](https://semver.org/)。
 
+## [1.2.1] - 2025-01-13
+
+### 改进
+
+- **增强的路径解析**: 改进 dicom_download 查找逻辑
+  - 支持本地开发、NPM 包和 PyPI 安装等多种部署方式
+  - 添加诊断日志，显示查找的路径和找到的位置
+  - 优化查找顺序，确保 multi_download.py 存在
+
 ## [1.2.0] - 2025-01-13
 
 ### 新功能

package/dicom_mcp/server.py

@@ -13,31 +13,49 @@ from dataclasses import dataclass
 from mcp.server.fastmcp import FastMCP
 from pydantic import BaseModel, Field
 
-# Resolve path to dicom_download - supports two deployment methods:
+# Resolve path to dicom_download - supports multiple deployment methods:
 # 1. Local development: git clone后，dicom_download 在 dicom_mcp 的上级目录
-# 2. Installed package: 从 PyPI/npm 安装时，dicom_download 作为依赖已安装
+# 2. NPM package: npx安装时，dicom_download 在node_modules同级
+# 3. Installed package: 从 PyPI 安装时，dicom_download 作为依赖已安装
 def _resolve_dicom_download_path() -> Path:
     """Resolve path to dicom_download module."""
-    # Method 1: Local development (git clone)
-    local_dev_path = Path(__file__).parent.parent.parent / "dicom_download"
-    if local_dev_path.exists():
+    current_dir = Path(__file__).parent
+    
+    # Method 1: Local development - check parent directory
+    local_dev_path = current_dir.parent.parent / "dicom_download"
+    if local_dev_path.exists() and (local_dev_path / "multi_download.py").exists():
+        print(f"[dicom-mcp] Found dicom_download at: {local_dev_path}", file=sys.stderr)
         return local_dev_path
     
-    # Method 2: Check site-packages or installation location
+    # Method 2: NPM package - check in the same package directory
+    npm_pkg_path = current_dir.parent / "dicom_download"
+    if npm_pkg_path.exists() and (npm_pkg_path / "multi_download.py").exists():
+        print(f"[dicom-mcp] Found dicom_download at: {npm_pkg_path}", file=sys.stderr)
+        return npm_pkg_path
+    
+    # Method 3: Check site-packages or installation location
     try:
         import dicom_download as dd_module
         if dd_module.__file__:
-            return Path(dd_module.__file__).parent
+            dd_path = Path(dd_module.__file__).parent
+            if (dd_path / "multi_download.py").exists():
+                print(f"[dicom-mcp] Found dicom_download at: {dd_path}", file=sys.stderr)
+                return dd_path
     except ImportError:
         pass
     
-    # Method 3: Try to find in Python path
+    # Method 4: Try to find in Python path
     for path_item in sys.path:
         candidate = Path(path_item) / "dicom_download"
-        if candidate.exists():
+        if candidate.exists() and (candidate / "multi_download.py").exists():
+            print(f"[dicom-mcp] Found dicom_download at: {candidate}", file=sys.stderr)
             return candidate
     
-    # Fallback to local dev path even if not exists
+    # Fallback - return the most likely path with diagnostic message
+    print(f"[dicom-mcp] WARNING: Could not find dicom_download. Tried paths:", file=sys.stderr)
+    print(f"  1. {local_dev_path}", file=sys.stderr)
+    print(f"  2. {npm_pkg_path}", file=sys.stderr)
+    print(f"  3. Python path entries", file=sys.stderr)
     return local_dev_path
 
 DICOM_DOWNLOAD_PATH = _resolve_dicom_download_path()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dicom-mcp",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "MCP server for DICOM image downloading from multiple medical imaging sources",
   "main": "lib/index.js",
   "type": "module",