refactor: improve pyproject.toml and adjust related project files

Author: pengqun

.vscode/tasks.json

@@ -70,11 +70,11 @@
       "problemMatcher": []
     },
     {
-      "label": "uv run pytest -s",
-      "detail": "Run pytest tests with output",
+      "label": "uv run pytest",
+      "detail": "Run pytest tests",
       "type": "shell",
       "command": "uv",
-      "args": ["run", "pytest", "-s"],
+      "args": ["run", "pytest"],
       "group": {
         "kind": "test",
         "isDefault": false

demo.py

@@ -26,9 +26,7 @@ async def demo_get_current_user(client: Client) -> None:
         username = user_info.get("username", "N/A")
         email = user_info.get("email", "N/A")
         authenticated = user_info.get("authenticated", "N/A")
-        print(
-            f"   • Result: Username={username}, Email={email}, Authenticated={authenticated}"
-        )
+        print(f"   • Result: Username={username}, Email={email}, Authenticated={authenticated}")
     else:
         print("   • Result: No user information retrieved")
     print()
@@ -37,9 +35,7 @@ async def demo_get_current_user(client: Client) -> None:
 async def demo_search_models(client: Client) -> None:
     """Demo: Search models using various parameters."""
     print("2. 🛠️ Tool: search_models")
-    print(
-        "   • Task: 🔍 Search text-generation models (keyword='DeepSeek', support inference, limit 3 results)"
-    )
+    print("   • Task: 🔍 Search text-generation models (keyword='DeepSeek', support inference, limit 3 results)")
 
     result = await client.call_tool(
         "search_models",
@@ -68,9 +64,7 @@ async def demo_search_models(client: Client) -> None:
 async def demo_search_papers(client: Client) -> None:
     """Demo: Search papers using query."""
     print("3. 🛠️ Tool: search_papers")
-    print(
-        "   • Task: 📚 Search academic papers (keyword='Qwen3', sort='hot', limit 1 result)"
-    )
+    print("   • Task: 📚 Search academic papers (keyword='Qwen3', sort='hot', limit 1 result)")
 
     result = await client.call_tool(
         "search_papers",
@@ -85,9 +79,7 @@ async def demo_search_papers(client: Client) -> None:
             authors = paper.get("authors", "N/A")
             arxiv_id = paper.get("arxiv_id", "N/A")
             views = paper.get("view_count", 0)
-            print(
-                f"   • Result: '{title}' Authors={authors}, ArXiv ID={arxiv_id}, Views={views:,}"
-            )
+            print(f"   • Result: '{title}' Authors={authors}, ArXiv ID={arxiv_id}, Views={views:,}")
         else:
             print("   • Result: No papers found")
     else:
@@ -98,9 +90,7 @@ async def demo_search_papers(client: Client) -> None:
 async def demo_search_mcp_servers(client: Client) -> None:
     """Demo: Search MCP servers using various parameters."""
     print("4. 🛠️ Tool: search_mcp_servers")
-    print(
-        "   • Task: 🔍 Search MCP servers (keyword='Chrome', category='browser-automation', limit 3 results)"
-    )
+    print("   • Task: 🔍 Search MCP servers (keyword='Chrome', category='browser-automation', limit 3 results)")
 
     result = await client.call_tool(
         "search_mcp_servers",
@@ -119,9 +109,7 @@ async def demo_search_mcp_servers(client: Client) -> None:
             publisher = server.get("publisher", "N/A")
             views = server.get("view_count", 0)
             server_summary.append(f"{name} by {publisher} (Views {views:,})")
-        print(
-            f"   • Result: Found {len(servers)} servers - {' | '.join(server_summary)}"
-        )
+        print(f"   • Result: Found {len(servers)} servers - {' | '.join(server_summary)}")
     else:
         print("   • Result: No MCP servers found")
     print()
@@ -130,14 +118,12 @@ async def demo_search_mcp_servers(client: Client) -> None:
 async def demo_generate_image(client: Client) -> None:
     """Demo: Generate image URL from text prompt."""
     print("5. 🛠️ Tool: generate_image")
-    print(
-        "   • Task: 🎨 Generate image (prompt='A curious cat wearing a tiny wizard hat in candy cloud kingdom')"
-    )
+    print("   • Task: 🎨 Generate image (prompt='A curious cat wearing a tiny wizard hat in candy cloud kingdom')")
 
     result = await client.call_tool(
         "generate_image",
         {
-            "prompt": "A curious cat wearing a tiny wizard hat, casting magical rainbow sparkles while riding a flying donut through a candy cloud kingdom",
+            "prompt": "A curious cat wearing a tiny wizard hat in candy cloud kingdom",
         },
     )
 
@@ -150,7 +136,7 @@ async def demo_generate_image(client: Client) -> None:
 
 
 def setup_signal_handler():
-    """Setup signal handler for graceful shutdown."""
+    """Set up signal handler for graceful shutdown."""
 
     def signal_handler(signum, frame):
         print("\n🛑 Demo interrupted by user")
@@ -160,6 +146,7 @@ def signal_handler(signum, frame):
 
 
 async def main():
+    """Run the demo."""
     parser = argparse.ArgumentParser(description="ModelScope MCP server demo")
     parser.add_argument(
         "--full",
@@ -170,9 +157,7 @@ async def main():
 
     print(f"🤖 ModelScope MCP Server Demo (v{__version__})")
     if not args.full:
-        print(
-            "💡 Running basic demos only. Use --full to include slow demos (like image generation)"
-        )
+        print("💡 Running basic demos only. Use --full to include slow demos (like image generation)")
 
     # Set log level to WARNING to avoid too many logs
     settings.log_level = "WARNING"

pyproject.toml

@@ -1,9 +1,11 @@
 [project]
 name = "modelscope-mcp-server"
 dynamic = ["version"]
-description = "ModelScope MCP Server"
+description = "A Model Context Protocol (MCP) server that integrates with ModelScope's ecosystem."
 readme = "README.md"
-authors = [{ name = "ModelScope Team" }]
+authors = [
+    { name = "ModelScope Team", email = "contact@modelscope.cn" }
+]
 license = { file = "LICENSE" }
 requires-python = ">=3.10"
 dependencies = [
@@ -14,21 +16,16 @@ dependencies = [
 keywords = [
     "modelscope",
     "mcp",
-    "mcp server",
     "model-context-protocol",
-    "fastmcp",
     "llm",
-    "agent",
+    "ai",
 ]
 classifiers = [
     "Development Status :: 3 - Alpha",
     "Intended Audience :: Developers",
-    "License :: OSI Approved :: MIT License",
+    "License :: OSI Approved :: Apache Software License",
     "Topic :: Scientific/Engineering :: Artificial Intelligence",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.11",
-    "Programming Language :: Python :: 3.12",
 ]
 
 [project.urls]
@@ -50,35 +47,61 @@ packages = ["src/modelscope_mcp_server"]
 
 [dependency-groups]
 dev = [
-    "build>=1.2.2.post1",
-    "twine>=6.1.0",
     "pytest>=8.4.1",
-    "pyright>=1.1.403",
-    "pre-commit>=4.2.0",
-    "ruff>=0.12.3",
     "pytest-asyncio>=1.0.0",
     "pytest-cov>=6.2.1",
-    "pytest-env>=1.1.5",
-    "pytest-report>=0.2.1",
-    "pytest-timeout>=2.4.0",
+    "pyright>=1.1.403",
+    "ruff>=0.12.3",
 ]
 
 [tool.pytest.ini_options]
 asyncio_mode = "auto"
-env = ["MODELSCOPE_LOG_LEVEL=INFO"]
+testpaths = ["tests"]
+addopts = [
+    "--cov=src/modelscope_mcp_server",
+    "--cov-report=term-missing",
+]
+env = [
+    "MODELSCOPE_LOG_LEVEL=INFO"
+]
 
 
 [tool.pyright]
-include = ["src"]
-exclude = ["**/__pycache__", ".venv", ".git", "dist"]
+include = ["src", "tests"]
+exclude = ["**/__pycache__"]
 pythonVersion = "3.10"
-pythonPlatform = "Darwin"
 typeCheckingMode = "basic"
 reportMissingImports = true
 reportMissingTypeStubs = false
 useLibraryCodeForTypes = true
 venvPath = "."
 venv = ".venv"
 
+[tool.ruff]
+target-version = "py310"
+line-length = 120
+
 [tool.ruff.lint]
-extend-select = ["I", "UP"]
+extend-select = [
+    "E",   # pycodestyle errors (PEP 8 style violations)
+    "W",   # pycodestyle warnings (PEP 8 style warnings)
+    "F",   # pyflakes (unused imports, variables, etc.)
+    "I",   # isort (import sorting and organization)
+    "B",   # flake8-bugbear (common bug patterns)
+    "UP",  # pyupgrade (Python version upgrade suggestions)
+    "D",   # pydocstyle (docstring style checking)
+]
+ignore = [
+    "D203",  # 1 blank line required before class docstring (conflicts with D211)
+    "D213",  # Multi-line docstring summary should start at the second line (conflicts with D212)
+]
+
+[tool.ruff.lint.per-file-ignores]
+"tests/**/*" = ["D"]
+
+[tool.ruff.lint.isort]
+known-first-party = ["modelscope_mcp_server"]
+
+[tool.ruff.format]
+quote-style = "double"
+indent-style = "space"

scripts/bump_version.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
-"""
-Version bumping script for ModelScope MCP Server releases.
+"""Version bumping script for ModelScope MCP Server releases.
 
 Usage:
     python scripts/bump_version.py patch           # 1.2.3 -> 1.2.4
@@ -36,7 +35,7 @@ def get_current_version():
 
         return __version__
     except ImportError as e:
-        raise ValueError(f"Could not import version module: {e}")
+        raise ValueError(f"Could not import version module: {e}") from e
     finally:
         if str(SRC_DIR) in sys.path:
             sys.path.remove(str(SRC_DIR))
@@ -53,16 +52,14 @@ def parse_version(version_string):
     try:
         major, minor, patch = map(int, match.groups())
         return major, minor, patch
-    except ValueError:
-        raise ValueError(f"Invalid version format: {version_string}")
+    except ValueError as e:
+        raise ValueError(f"Invalid version format: {version_string}") from e
 
 
 def validate_version_format(version_string):
     """Validate that the version string follows PEP 440 format."""
     if not re.match(PEP440_PATTERN, version_string):
-        raise ValueError(
-            f"Invalid version format (should follow PEP 440): {version_string}"
-        )
+        raise ValueError(f"Invalid version format (should follow PEP 440): {version_string}")
 
 
 def bump_version(current_version, bump_type):
@@ -82,9 +79,7 @@ def bump_version(current_version, bump_type):
 def update_version(new_version):
     """Update version in _version.py and sync dependencies."""
     content = VERSION_FILE.read_text()
-    new_content = re.sub(
-        r'__version__ = "[^"]+"', f'__version__ = "{new_version}"', content
-    )
+    new_content = re.sub(r'__version__ = "[^"]+"', f'__version__ = "{new_version}"', content)
     VERSION_FILE.write_text(new_content)
 
     # Run uv sync to update lock file
@@ -95,7 +90,7 @@ def update_version(new_version):
 
 
 def handle_version_change(action_description, new_version):
-    """Common logic for handling version changes."""
+    """Handle version changes with common logic."""
     current = get_current_version()
     print(f"{action_description} from {current} to {new_version}")
     update_version(new_version)
@@ -106,17 +101,13 @@ def handle_version_change(action_description, new_version):
 def print_next_steps(version):
     """Print the next steps after version update."""
     print("\nNext steps:")
-    print(
-        f"1. Commit the change: git add {FILES_TO_COMMIT} && git commit -m 'chore: bump version to {version}'"
-    )
+    print(f"1. Commit the change: git add {FILES_TO_COMMIT} && git commit -m 'chore: bump version to {version}'")
     print(f"2. Create and push tag: git tag v{version} && git push origin v{version}")
-    print(
-        "3. The GitHub Action will automatically create a release and publish to PyPI and Container Registry"
-    )
+    print("3. The GitHub Action will automatically create a release and publish to PyPI and Container Registry")
 
 
 def main():
-    """Main function to handle version bumping."""
+    """Handle version bumping operations."""
     if len(sys.argv) not in [2, 3]:
         print(__doc__)
         sys.exit(1)

src/modelscope_mcp_server/__init__.py

@@ -1,11 +1,11 @@
-"""ModelScope MCP Server"""
+"""ModelScope MCP Server."""
 
 from ._version import __version__
 from .settings import settings
 
 
 def main():
-    """Main entry point for ModelScope MCP Server"""
+    """Serve as the main entry point for ModelScope MCP Server."""
     from .cli import main as cli_main
 
     cli_main()

src/modelscope_mcp_server/__main__.py

@@ -1,4 +1,4 @@
-"""Entry point for python -m modelscope_mcp_server"""
+"""Entry point for python -m modelscope_mcp_server."""
 
 from . import main
 

src/modelscope_mcp_server/cli.py

@@ -1,4 +1,4 @@
-"""Command line interface for ModelScope MCP Server"""
+"""Command line interface for ModelScope MCP Server."""
 
 import argparse
 import sys
@@ -52,7 +52,7 @@ def validate_args(args: argparse.Namespace) -> None:
 
 
 def main() -> None:
-    """Main CLI entry point."""
+    """Handle CLI entry point operations."""
     parser = create_parser()
     args = parser.parse_args()
 

src/modelscope_mcp_server/server.py

@@ -1,3 +1,5 @@
+"""ModelScope MCP Server implementation."""
+
 from typing import cast
 
 from fastmcp import FastMCP
@@ -22,7 +24,6 @@
 
 def create_mcp_server() -> FastMCP:
     """Create and configure the MCP server with all ModelScope tools."""
-
     fastmcp_settings.log_level = cast(LOG_LEVEL, settings.log_level)
 
     mcp = FastMCP(

src/modelscope_mcp_server/settings.py

@@ -24,9 +24,7 @@ class Settings(BaseSettings):
     )
 
     # ModelScope API settings
-    api_token: str | None = Field(
-        default=None, description="ModelScope API token for authentication"
-    )
+    api_token: str | None = Field(default=None, description="ModelScope API token for authentication")
     api_base_url: str = Field(
         default=MODELSCOPE_API_ENDPOINT,
         description="Base URL for ModelScope API",
@@ -86,9 +84,7 @@ def show_settings(self) -> None:
         # API Configuration
         print("🔑 API Configuration:")
         masked_token = (
-            self.api_token[:-8] + "********"
-            if self.api_token and len(self.api_token) > 4
-            else "Not configured"
+            self.api_token[:-8] + "********" if self.api_token and len(self.api_token) > 4 else "Not configured"
         )
         print(f"  • Token: {masked_token}")
         print(f"  • Base URL: {self.api_base_url}")

src/modelscope_mcp_server/tools/__init__.py

@@ -1,3 +1 @@
-"""
-ModelScope MCP Server tools package.
-"""
+"""ModelScope MCP Server tools package."""