no extra type file

fix pyproject groups

fix lockfile

add pre-commit ci

actually run ruff and fix things

Author: zzstoatzz

Diff for: .github/workflows/lint.yml

@@ -0,0 +1,30 @@
+name: Run Pre-commits
+
+env:
+  # enable colored output
+  # https://github.com/pytest-dev/pytest/issues/7443
+  PY_COLORS: 1
+
+on:
+  push:
+    branches: ["main"]
+  pull_request:
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  static_analysis:
+    timeout-minutes: 1
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+      - name: Run pre-commit
+        uses: pre-commit/[email protected]

Diff for: pyproject.toml

@@ -24,15 +24,16 @@ build-backend = "setuptools.build_meta"
 [tool.setuptools_scm]
 write_to = "src/fastmcp/_version.py"
 
-[dependency-groups]
+[project.optional-dependencies]
 dev = [
     "copychat>=0.5.2",
     "ipython>=8.12.3",
     "pdbpp>=0.10.3",
-    "pre-commit>=3.10.1",
+    "pre-commit",
     "pytest-xdist>=3.6.1",
     "pytest>=8.3.3",
     "pytest-asyncio>=0.23.5",
+    "ruff",
 ]
 
 [tool.pytest.ini_options]

Diff for: src/fastmcp/resources/base.py

@@ -1,11 +1,33 @@
 """Base classes and interfaces for FastMCP resources."""
 
 import abc
-from typing import Union
+from typing import Annotated, Union
 
-from pydantic import BaseModel, ConfigDict, Field, ValidationInfo, field_validator
+from pydantic import (
+    AnyUrl,
+    BaseModel,
+    BeforeValidator,
+    ConfigDict,
+    Field,
+    FileUrl,
+    ValidationInfo,
+    field_validator,
+)
 
-from fastmcp.types import LaxAnyUrl
+
+def maybe_cast_str_to_any_url(x) -> AnyUrl:
+    if isinstance(x, FileUrl):
+        return x
+    elif isinstance(x, AnyUrl):
+        return x
+    elif isinstance(x, str):
+        if x.startswith("file://"):
+            return FileUrl(x)
+        return AnyUrl(x)
+    raise ValueError(f"Expected str or AnyUrl, got {type(x)}")
+
+
+LaxAnyUrl = Annotated[AnyUrl, BeforeValidator(maybe_cast_str_to_any_url)]
 
 
 class Resource(BaseModel, abc.ABC):

Diff for: src/fastmcp/resources/types.py

@@ -1,13 +1,13 @@
 """Concrete resource implementations."""
 
-import pydantic_core
 import asyncio
 import json
 from pathlib import Path
 from typing import Any, Callable, Union
 
 import httpx
 import pydantic.json
+import pydantic_core
 from pydantic import Field
 
 from fastmcp.resources.base import Resource

Diff for: src/fastmcp/types.py

@@ -1,16 +1,18 @@
+import base64
+from pathlib import Path
+from typing import TYPE_CHECKING, Union
+
+import pytest
+from mcp.shared.exceptions import McpError
 from mcp.shared.memory import (
     create_connected_server_and_client_session as client_session,
 )
-from mcp.shared.exceptions import McpError
-from fastmcp import FastMCP, Context
+from mcp.types import ImageContent, TextContent
+
+from fastmcp import Context, FastMCP
+from fastmcp.prompts.base import EmbeddedResource, Message, UserMessage
 from fastmcp.resources import FileResource, FunctionResource
 from fastmcp.utilities.types import Image
-from mcp.types import TextContent, ImageContent
-from fastmcp.prompts.base import Message, UserMessage, TextContent, EmbeddedResource
-import pytest
-from pathlib import Path
-import base64
-from typing import Union, TYPE_CHECKING
 
 if TYPE_CHECKING:
     from fastmcp import Context

Diff for: tests/test_server.py

@@ -1,7 +1,8 @@
 import logging
+from typing import Optional
+
 import pytest
 from pydantic import BaseModel
-from typing import Optional
 
 from fastmcp.exceptions import ToolError
 from fastmcp.tools import ToolManager
@@ -69,7 +70,7 @@ def create_user(user: UserInput, flag: bool) -> dict:
     def test_add_invalid_tool(self):
         manager = ToolManager()
         with pytest.raises(AttributeError):
-            manager.add_tool(1)
+            manager.add_tool(1)  # type: ignore
 
     def test_add_lambda(self):
         manager = ToolManager()
@@ -185,7 +186,7 @@ def tool_with_context(x: int, ctx: Context) -> str:
             return str(x)
 
         manager = ToolManager()
-        tool = manager.add_tool(tool_with_context)
+        manager.add_tool(tool_with_context)
 
         mcp = FastMCP()
         ctx = mcp.get_context()
@@ -201,7 +202,7 @@ async def async_tool(x: int, ctx: Context) -> str:
             return str(x)
 
         manager = ToolManager()
-        tool = manager.add_tool(async_tool)
+        manager.add_tool(async_tool)
 
         mcp = FastMCP()
         ctx = mcp.get_context()
@@ -216,7 +217,7 @@ def tool_with_context(x: int, ctx: Optional[Context] = None) -> str:
             return str(x)
 
         manager = ToolManager()
-        tool = manager.add_tool(tool_with_context)
+        manager.add_tool(tool_with_context)
         # Should not raise an error when context is not provided
         result = await manager.call_tool("tool_with_context", {"x": 42})
         assert result == "42"
@@ -229,7 +230,7 @@ def tool_with_context(x: int, ctx: Context) -> str:
             raise ValueError("Test error")
 
         manager = ToolManager()
-        tool = manager.add_tool(tool_with_context)
+        manager.add_tool(tool_with_context)
 
         mcp = FastMCP()
         ctx = mcp.get_context()