Merge pull request #47 from jlowin/warning-and-flake

fix warning and flake

Author: jlowin

Diff for: pyproject.toml

@@ -27,6 +27,7 @@ tests = [
     "pre-commit",
     "pytest>=8.3.3",
     "pytest-asyncio>=0.23.5",
+    "pytest-flakefinder",
     "pytest-xdist>=3.6.1",
     "ruff",
 ]

Diff for: tests/test_cli.py

@@ -3,12 +3,12 @@
 import json
 import sys
 from pathlib import Path
-from unittest.mock import patch, call
+from unittest.mock import call, patch
 
 import pytest
 from typer.testing import CliRunner
 
-from fastmcp.cli.cli import app, _parse_env_var, _parse_file_path
+from fastmcp.cli.cli import _parse_env_var, _parse_file_path, app
 
 
 @pytest.fixture
@@ -297,47 +297,53 @@ def test_dev_with_dependencies(mock_config, server_file):
             assert mock_run.call_args_list[0] == call(
                 ["npx.cmd", "--version"], check=True, capture_output=True, shell=True
             )
-            assert mock_run.call_args_list[1] == call(
-                [
-                    "npx.cmd",
-                    "@modelcontextprotocol/inspector",
-                    "uv",
-                    "run",
-                    "--with",
-                    "fastmcp",
-                    "--with",
-                    "numpy",
-                    "--with",
-                    "pandas",
-                    "fastmcp",
-                    "run",
-                    str(server_file),
-                ],
-                check=True,
-                shell=True,
+
+            # get the actual command and expected command without dependencies
+            actual_cmd = mock_run.call_args_list[1][0][0]
+            expected_start = [
+                "npx.cmd",
+                "@modelcontextprotocol/inspector",
+                "uv",
+                "run",
+                "--with",
+                "fastmcp",
+            ]
+            expected_end = ["fastmcp", "run", str(server_file)]
+
+            # verify start and end of command
+            assert actual_cmd[: len(expected_start)] == expected_start
+            assert actual_cmd[-len(expected_end) :] == expected_end
+
+            # verify dependencies are present (order-independent)
+            deps_section = actual_cmd[len(expected_start) : -len(expected_end)]
+            assert all(
+                x in deps_section for x in ["--with", "numpy", "--with", "pandas"]
             )
+
+            assert mock_run.call_args_list[1][1] == {"check": True, "shell": True}
         else:
-            # On Unix, expect one call
-            mock_run.assert_called_once_with(
-                [
-                    "npx",
-                    "@modelcontextprotocol/inspector",
-                    "uv",
-                    "run",
-                    "--with",
-                    "fastmcp",
-                    "--with",
-                    "numpy",
-                    "--with",
-                    "pandas",
-                    "fastmcp",
-                    "run",
-                    str(server_file),
-                ],
-                check=True,
-                shell=False,  # Note: shell=False on Unix
+            # same verification for unix, just with different command prefix
+            actual_cmd = mock_run.call_args_list[0][0][0]
+            expected_start = [
+                "npx",
+                "@modelcontextprotocol/inspector",
+                "uv",
+                "run",
+                "--with",
+                "fastmcp",
+            ]
+            expected_end = ["fastmcp", "run", str(server_file)]
+
+            assert actual_cmd[: len(expected_start)] == expected_start
+            assert actual_cmd[-len(expected_end) :] == expected_end
+
+            deps_section = actual_cmd[len(expected_start) : -len(expected_end)]
+            assert all(
+                x in deps_section for x in ["--with", "numpy", "--with", "pandas"]
             )
 
+            assert mock_run.call_args_list[0][1] == {"check": True, "shell": False}
+
 
 def test_run_with_dependencies(mock_config, server_file):
     """Test that run command does not handle dependencies."""

Diff for: tests/test_func_metadata.py

@@ -1,15 +1,17 @@
-from pydantic import BaseModel, Field
 from typing import Annotated
+
 import annotated_types
-from fastmcp.utilities.func_metadata import func_metadata
 import pytest
+from pydantic import BaseModel, Field
+
+from fastmcp.utilities.func_metadata import func_metadata
 
 
-class TestInputModelA(BaseModel):
+class SomeInputModelA(BaseModel):
     pass
 
 
-class TestInputModelB(BaseModel):
+class SomeInputModelB(BaseModel):
     class InnerModel(BaseModel):
         x: int
 
@@ -44,15 +46,15 @@ def complex_arguments_fn(
         int, Field(1)
     ],
     unannotated,
-    my_model_a: TestInputModelA,
-    my_model_a_forward_ref: "TestInputModelA",
-    my_model_b: TestInputModelB,
+    my_model_a: SomeInputModelA,
+    my_model_a_forward_ref: "SomeInputModelA",
+    my_model_b: SomeInputModelB,
     an_int_annotated_with_field_default: Annotated[
         int,
         Field(1, description="An int with a field"),
     ],
     unannotated_with_default=5,
-    my_model_a_with_default: TestInputModelA = TestInputModelA(),  # noqa: B008
+    my_model_a_with_default: SomeInputModelA = SomeInputModelA(),  # noqa: B008
     an_int_with_default: int = 1,
     must_be_none_with_default: None = None,
     an_int_with_equals_field: int = Field(1, ge=0),
@@ -239,12 +241,12 @@ def test_complex_function_json_schema():
                 "title": "InnerModel",
                 "type": "object",
             },
-            "TestInputModelA": {
+            "SomeInputModelA": {
                 "properties": {},
-                "title": "TestInputModelA",
+                "title": "SomeInputModelA",
                 "type": "object",
             },
-            "TestInputModelB": {
+            "SomeInputModelB": {
                 "properties": {
                     "how_many_shrimp": {
                         "description": "How many shrimp in the tank???",
@@ -255,7 +257,7 @@ def test_complex_function_json_schema():
                     "y": {"title": "Y", "type": "null"},
                 },
                 "required": ["how_many_shrimp", "ok", "y"],
-                "title": "TestInputModelB",
+                "title": "SomeInputModelB",
                 "type": "object",
             },
         },
@@ -299,9 +301,9 @@ def test_complex_function_json_schema():
                 "type": "integer",
             },
             "unannotated": {"title": "unannotated", "type": "string"},
-            "my_model_a": {"$ref": "#/$defs/TestInputModelA"},
-            "my_model_a_forward_ref": {"$ref": "#/$defs/TestInputModelA"},
-            "my_model_b": {"$ref": "#/$defs/TestInputModelB"},
+            "my_model_a": {"$ref": "#/$defs/SomeInputModelA"},
+            "my_model_a_forward_ref": {"$ref": "#/$defs/SomeInputModelA"},
+            "my_model_b": {"$ref": "#/$defs/SomeInputModelB"},
             "an_int_annotated_with_field_default": {
                 "default": 1,
                 "description": "An int with a field",
@@ -314,7 +316,7 @@ def test_complex_function_json_schema():
                 "type": "string",
             },
             "my_model_a_with_default": {
-                "$ref": "#/$defs/TestInputModelA",
+                "$ref": "#/$defs/SomeInputModelA",
                 "default": {},
             },
             "an_int_with_default": {