logic fix to handle include/exclude conditions with len limit

Author: DougieHauser

fastapi_mcp/server.py

@@ -319,13 +319,14 @@ def _filter_tools(self, tools: List[types.Tool], openapi_schema: Dict[str, Any])
         Returns:
             Filtered list of tools
         """
-        if (
-            self._include_operations is None
-            and self._exclude_operations is None
-            and self._include_tags is None
-            and self._exclude_tags is None
-            and self._max_tool_name_length is None
-        ):
+        include_exclude_conditions_exist = (
+            self._include_operations is not None
+            or self._exclude_operations is not None
+            or self._include_tags is not None
+            or self._exclude_tags is not None
+        )
+
+        if not include_exclude_conditions_exist and self._max_tool_name_length is None:
             return tools
 
         operations_by_tag: Dict[str, List[str]] = {}
@@ -356,8 +357,6 @@ def _filter_tools(self, tools: List[types.Tool], openapi_schema: Dict[str, Any])
             operations_to_include.update(self._include_operations)
         elif self._exclude_operations is not None:
             operations_to_include.update(all_operations - set(self._exclude_operations))
-        elif self._max_tool_name_length is not None:
-            operations_to_include.update(all_operations)  # all_operations
 
         if self._include_tags is not None:
             for tag in self._include_tags:
@@ -369,6 +368,11 @@ def _filter_tools(self, tools: List[types.Tool], openapi_schema: Dict[str, Any])
 
             operations_to_include.update(all_operations - excluded_operations)
 
+        # This condition means that no include/exclude conditions exist,
+        # and we've reached this point because we have a max-length limit
+        if not include_exclude_conditions_exist:
+            operations_to_include = all_operations
+
         if self._max_tool_name_length is not None:
             long_operations = {
                 tool.name for tool in tools if len(self.get_combined_full_name(tool.name)) > self._max_tool_name_length

tests/test_configuration.py

@@ -414,6 +414,22 @@ async def search_items_long():
 
     max_long_name_mcp = FastApiMCP(app, name="mcp_server", max_tool_name_length=25)
     assert len(max_long_name_mcp.tools) == 6
+    assert {tool.name for tool in max_long_name_mcp.tools} == {
+        "list_items",
+        "get_item",
+        "create_item",
+        "update_item",
+        "delete_item",
+        "search_items",
+    }
+
+    combined_exclude_and_max_tags_mcp = FastApiMCP(app, exclude_tags=["write", "delete"], max_tool_name_length=25)
+    assert len(combined_exclude_and_max_tags_mcp.tools) == 3
+    assert {tool.name for tool in combined_exclude_and_max_tags_mcp.tools} == {
+        "get_item",
+        "list_items",
+        "search_items",
+    }
 
     # Test invalid combinations
     with pytest.raises(ValueError):