dicom-mcp 1.2.0 → 1.2.5

package/CHANGELOG.md

@@ -5,6 +5,54 @@
 格式遵循 [Keep a Changelog](https://keepachangelog.com/)，
 版本号遵循 [Semantic Versioning](https://semver.org/)。
 
+## [1.2.5] - 2025-01-13
+
+### 改进
+
+- **支持多格式密码提取**: 增强密码识别的灵活性
+  - 支持：`安全码:8492`、`密码:8492`、`password:8492`、`code:8492`、`验证码:8492`
+  - 同时支持半角冒号 `:` 和全角冒号 `：`
+  - 自动清理 URL 中的密码部分
+  - 添加诊断日志显示提取的密码
+
+## [1.2.4] - 2025-01-13
+
+### 改进
+
+- **标准化安全码提取**: 简化并规范化密码提取逻辑
+  - 只支持标准格式：`URL 安全码:8492` 或 `URL 安全码：8492`
+  - 自动清理 URL 中的安全码部分
+  - 添加诊断日志显示提取的密码
+  - 代码更清晰，性能更好
+
+## [1.2.3] - 2025-01-13
+
+### 新功能
+
+- **自动密码提取**: 从 URL 中自动识别和提取安全码/密码
+  - 支持多种格式：`安全码:8492`、`密码:8492`、`password:8492`、`code:8492`
+  - 用户只需粘贴原始链接，无需手动提取密码
+  - 自动清理 URL，将密码传递给下载脚本
+  - 例如：`https://ylyyx.shdc.org.cn/code.html?... 安全码:8492`
+
+## [1.2.2] - 2025-01-13
+
+### 新功能
+
+- **安全码/密码支持**: 支持需要安全码（password）的医院链接
+  - 添加 `password` 参数到 `download_dicom` 和 `batch_download_dicom` 工具
+  - 自动将密码传递给底层下载脚本
+  - 用法：提供 URL 和密码参数即可自动填入
+
+## [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()
@@ -110,6 +128,9 @@ class BatchDownloadRequest(BaseModel):
     )
     mode: str = Field(default="all", description="Download mode")
     headless: bool = Field(default=True, description="Run in headless mode")
+    password: Optional[str] = Field(
+        default=None, description="Password/share code if required by the site"
+    )
     create_zip: bool = Field(default=True, description="Create ZIP archives")
     max_rounds: int = Field(
         default=_DEFAULT_MAX_ROUNDS,
@@ -214,6 +235,7 @@ async def run_multi_download(
     provider: str = "auto",
     mode: str = "all",
     headless: bool = True,
+    password: Optional[str] = None,
     create_zip: bool = True,
     max_rounds: int = 3,
     step_wait_ms: int = 40,
@@ -259,6 +281,9 @@ async def run_multi_download(
         else:
             cmd.append("--no-headless")
 
+        if password:
+            cmd.extend(["--password", password])
+
         if not create_zip:
             cmd.append("--no-zip")
         
@@ -358,6 +383,50 @@ async def run_multi_download(
             pass
 
 
+# ============================================================================
+# Helper Functions for Password Extraction
+# ============================================================================
+
+
+def _extract_password_from_url(url: str) -> tuple[str, Optional[str]]:
+    """
+    Extract password/security code from URL string.
+    
+    Supports multiple formats:
+    - URL 安全码:8492 or URL 安全码：8492
+    - URL 密码:8492 or URL 密码：8492
+    - URL password:8492 or URL password：8492
+    - URL code:8492 or URL code：8492
+    - URL 验证码:8492 or URL 验证码：8492
+    
+    Returns: (clean_url, password)
+    """
+    import re
+    
+    # Pattern: look for various password indicators with both half-width and full-width colons
+    patterns = [
+        r'\s*安全码[：:]\s*(\d+)',      # 安全码:8492 or 安全码：8492
+        r'\s*密码[：:]\s*(\d+)',        # 密码:8492 or 密码：8492
+        r'\s*验证码[：:]\s*(\d+)',      # 验证码:8492 or 验证码：8492
+        r'\s*password[：:]\s*(\S+)',    # password:8492 or password：8492
+        r'\s*code[：:]\s*(\d+)',        # code:8492 or code：8492
+    ]
+    
+    password = None
+    clean_url = url
+    
+    for pattern in patterns:
+        match = re.search(pattern, url)
+        if match:
+            password = match.group(1)
+            # Remove password from URL
+            clean_url = re.sub(pattern, '', url).strip()
+            print(f"[dicom-mcp] 提取密码: {password}", file=sys.stderr)
+            break
+    
+    return clean_url, password
+
+
 # ============================================================================
 # MCP Tools
 # ============================================================================
@@ -373,14 +442,22 @@ async def download_dicom(request: DownloadRequest) -> DownloadResult:
     - fz: 复肿 (ylyyx.shdc.org.cn)
     - nyfy: 宁夏总医院 (zhyl.nyfy.com.cn)
     - cloud: *.medicalimagecloud.com and other cloud-based systems
+    
+    Automatically extracts password/security code from URL if present.
+    Formats: "URL 安全码:8492", "URL password:8492", etc.
     """
+    # Auto-extract password from URL if not explicitly provided
+    clean_url, extracted_password = _extract_password_from_url(request.url)
+    password = request.password or extracted_password
+    
     os.makedirs(request.output_dir, exist_ok=True)
     results = await run_multi_download(
-        [request.url],
+        [clean_url],
         request.output_dir,
         provider=request.provider or "auto",
         mode=request.mode,
         headless=request.headless,
+        password=password,
         create_zip=request.create_zip,
         max_rounds=request.max_rounds,
         step_wait_ms=request.step_wait_ms,
@@ -400,14 +477,31 @@ async def batch_download_dicom(request: BatchDownloadRequest) -> list[DownloadRe
 
     Each URL gets its own subdirectory. Supports auto-detection of provider
     based on domain, or manual provider specification.
+    
+    Automatically extracts password/security code from URL if present.
+    Formats: "URL 安全码:8492", "URL password:8492", etc.
     """
+    # Auto-extract passwords from URLs
+    clean_urls = []
+    extracted_password = None
+    
+    for url in request.urls:
+        clean_url, pwd = _extract_password_from_url(url)
+        clean_urls.append(clean_url)
+        # Use first extracted password if no explicit password provided
+        if not extracted_password and pwd:
+            extracted_password = pwd
+    
+    password = request.password or extracted_password
+    
     os.makedirs(request.output_parent, exist_ok=True)
     return await run_multi_download(
-        request.urls,
+        clean_urls,
         request.output_parent,
         provider=request.provider,
         mode=request.mode,
         headless=request.headless,
+        password=password,
         create_zip=request.create_zip,
         max_rounds=request.max_rounds,
         step_wait_ms=request.step_wait_ms,

package/package.json

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