dicom-mcp 1.1.7 → 1.2.1

package/CHANGELOG.md

@@ -5,6 +5,44 @@
 格式遵循 [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
+
+### 新功能
+
+- **实时下载进度反馈**: 在下载过程中向用户显示详细的进度信息
+  - 下载开始：显示下载数量、输出目录、扫描参数
+  - 下载进行中：显示逐个 URL 的处理进度 [1/N], [2/N]...
+  - 下载完成：显示每个 URL 保存的文件数
+  - 最终汇总：显示总共下载的文件数量
+  - 失败处理：显示详细的错误信息
+
+### 改进
+
+- **可选的 pip 进度显示**: 添加环保变量控制 pip 安装输出
+  - 默认：抑制 pip 输出（用于 Claude Desktop，避免 JSON 污染）
+  - 调试模式：设置 `DICOM_MCP_VERBOSE=1` 显示 pip 进度
+  - 用法：`DICOM_MCP_VERBOSE=1 npx dicom-mcp@latest`
+
+## [1.1.8] - 2025-01-13
+
+### 修复
+
+- **pip 输出完全抑制**: 彻底解决 pip 安装大量日志污染 JSON 消息流
+  - 原因：pip 的 stdout 包含 Looking in、Installing、Requirements 等大量进度信息
+  - 解决：
+    - 添加 `-q`（quiet）参数到 pip 命令
+    - 改用 `stdio: 'pipe'` 完全抑制 stdout 输出
+  - 影响：MCP Inspector 现在可以正常运行，无 JSON 解析错误
+
 ## [1.1.7] - 2025-01-13
 
 ### 修复

package/bin/dicom-mcp.js

@@ -68,8 +68,14 @@ function installLocalPackage(pythonCmd) {
       process.exit(1);
     }
 
-    execSync(`${pythonCmd} -m pip install -e "${rootDir}"`, {
-      stdio: ['inherit', 'pipe', 'inherit'], // stdin: inherit, stdout: pipe (suppress), stderr: inherit
+    // Check if verbose mode is enabled (for debugging)
+    const verbose = process.env.DICOM_MCP_VERBOSE === '1' || process.env.DICOM_MCP_VERBOSE === 'true';
+    const quietFlag = verbose ? '' : '-q';
+    const stdioOption = verbose ? 'inherit' : 'pipe';
+    
+    // Install with optional verbosity
+    execSync(`${pythonCmd} -m pip install ${quietFlag} -e "${rootDir}"`, {
+      stdio: stdioOption,
     });
     console.error('✓ Local dicom_mcp package installed');
   } catch (error) {

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()
@@ -266,14 +284,15 @@ async def run_multi_download(
         cmd.extend(["--max-rounds", str(max_rounds)])
         cmd.extend(["--step-wait-ms", str(step_wait_ms)])
 
-        # Show progress banner (to stderr, not stdout)
+        # Show progress banner (to stderr, visible to Claude)
         print("\n" + "=" * 70, file=sys.stderr)
         print("🚀 DICOM 下载开始", file=sys.stderr)
         print("=" * 70, file=sys.stderr)
         print(f"📍 下载数量: {len(urls)} 个URL", file=sys.stderr)
         print(f"📁 输出目录: {output_parent}", file=sys.stderr)
         print(f"⚙️  扫描次数: {max_rounds}, 帧间延迟: {step_wait_ms}ms", file=sys.stderr)
-        print("⏳ 请稍候，下载中... (可能需要 2-10 分钟)\n", file=sys.stderr)
+        print("⏳ 请稍候，下载中... (可能需要 2-10 分钟)", file=sys.stderr)
+        print("", file=sys.stderr)
 
         # Run subprocess with real-time output streaming
         process = await asyncio.create_subprocess_exec(
@@ -292,15 +311,19 @@ async def run_multi_download(
 
         if returncode == 0:
             print("\n" + "=" * 70, file=sys.stderr)
-            print("✅ 下载完成！处理结果中...", file=sys.stderr)
-            print("=" * 70 + "\n", file=sys.stderr)
+            print("✅ 下载完成！", file=sys.stderr)
+            print("=" * 70, file=sys.stderr)
+            print("📊 处理结果中...", file=sys.stderr)
+            print("", file=sys.stderr)
             
             # Parse output directories from stdout
             results = []
-            for url in urls:
+            for idx, url in enumerate(urls, 1):
                 # Extract share_id and construct output dir
                 from common_utils import extract_share_id
 
+                print(f"[{idx}/{len(urls)}] 处理: {url}", file=sys.stderr)
+                
                 share_id = extract_share_id(url)
                 out_dir = os.path.join(output_parent, share_id)
                 file_count = count_files_recursive(out_dir)
@@ -310,6 +333,8 @@ async def run_multi_download(
                     else None
                 )
 
+                print(f"  ✓ 已保存 {file_count} 个文件到: {out_dir}", file=sys.stderr)
+                
                 results.append(
                     DownloadResult(
                         success=True,
@@ -320,13 +345,21 @@ async def run_multi_download(
                         file_count=file_count,
                     )
                 )
+            
+            # Final summary
+            total_files = sum(r.file_count or 0 for r in results)
+            print("=" * 70, file=sys.stderr)
+            print(f"📈 汇总: 共下载 {total_files} 个文件", file=sys.stderr)
+            print("=" * 70, file=sys.stderr)
+            print("", file=sys.stderr)
             return results
         else:
             error_msg = stderr if stderr else "Unknown error"
-            print("\n" + "=" * 70)
-            print("❌ 下载失败")
-            print("=" * 70)
-            print(f"错误信息: {error_msg}\n")
+            print("\n" + "=" * 70, file=sys.stderr)
+            print("❌ 下载失败", file=sys.stderr)
+            print("=" * 70, file=sys.stderr)
+            print(f"错误信息: {error_msg}", file=sys.stderr)
+            print("", file=sys.stderr)
             return [
                 DownloadResult(
                     success=False,

package/package.json

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