π The fast, Pythonic way to build MCP servers and clients.
Remove deprecated component-import __getattr__ shims
Jeremiah Lowin7c2133a52fa7
diff --git a/fastmcp_slim/fastmcp/prompts/base.py b/fastmcp_slim/fastmcp/prompts/base.pyindex a34a8bc93..f56243e57 100644--- a/fastmcp_slim/fastmcp/prompts/base.py+++ b/fastmcp_slim/fastmcp/prompts/base.py@@ -2,7 +2,6 @@from __future__ import annotations as _annotations-import warningsfrom collections.abc import Callablefrom typing import TYPE_CHECKING, Any, ClassVar, Literal, overload@@ -29,7 +28,6 @@ from mcp_types import PromptArgument as SDKPromptArgumentfrom pydantic import Fieldfrom pydantic.json_schema import SkipJsonSchema-from fastmcp.exceptions import FastMCPDeprecationWarningfrom fastmcp.utilities.authorization import AuthCheckfrom fastmcp.utilities.components import FastMCPComponentfrom fastmcp.utilities.logging import get_logger@@ -414,27 +412,3 @@ __all__ = ["PromptArgument","PromptResult",]---def __getattr__(name: str) -> Any:- """Deprecated re-exports for backwards compatibility."""- deprecated_exports = {- "FunctionPrompt": "FunctionPrompt",- "prompt": "prompt",- }-- if name in deprecated_exports:- import fastmcp-- if fastmcp.settings.deprecation_warnings:- warnings.warn(- f"Importing {name} from fastmcp.prompts.prompt is deprecated. "- f"Import from fastmcp.prompts.function_prompt instead.",- FastMCPDeprecationWarning,- stacklevel=2,- )- from fastmcp.prompts import function_prompt-- return getattr(function_prompt, name)-- raise AttributeError(f"module {__name__!r} has no attribute {name!r}")diff --git a/fastmcp_slim/fastmcp/resources/base.py b/fastmcp_slim/fastmcp/resources/base.pyindex 358a2080d..b4e4d0d1d 100644--- a/fastmcp_slim/fastmcp/resources/base.py+++ b/fastmcp_slim/fastmcp/resources/base.py@@ -30,7 +30,6 @@ from pydantic import (from pydantic.json_schema import SkipJsonSchemafrom typing_extensions import Self-from fastmcp.exceptions import FastMCPDeprecationWarningfrom fastmcp.utilities.authorization import AuthCheckfrom fastmcp.utilities.components import FastMCPComponentfrom fastmcp.utilities.tasks import TaskConfig, TaskMeta@@ -469,29 +468,3 @@ __all__ = ["ResourceContent","ResourceResult",]---def __getattr__(name: str) -> Any:- """Deprecated re-exports for backwards compatibility."""- deprecated_exports = {- "FunctionResource": "FunctionResource",- "resource": "resource",- }-- if name in deprecated_exports:- import warnings-- import fastmcp-- if fastmcp.settings.deprecation_warnings:- warnings.warn(- f"Importing {name} from fastmcp.resources.resource is deprecated. "- f"Import from fastmcp.resources.function_resource instead.",- FastMCPDeprecationWarning,- stacklevel=2,- )- from fastmcp.resources import function_resource-- return getattr(function_resource, name)-- raise AttributeError(f"module {__name__!r} has no attribute {name!r}")diff --git a/fastmcp_slim/fastmcp/tools/base.py b/fastmcp_slim/fastmcp/tools/base.pyindex de725e8eb..011cacd27 100644--- a/fastmcp_slim/fastmcp/tools/base.py+++ b/fastmcp_slim/fastmcp/tools/base.py@@ -1,6 +1,5 @@from __future__ import annotations-import warningsfrom collections.abc import Callablefrom typing import (TYPE_CHECKING,@@ -25,7 +24,6 @@ from mcp_types import Tool as MCPToolfrom pydantic import BaseModel, Field, model_validatorfrom pydantic.json_schema import SkipJsonSchema-from fastmcp.exceptions import FastMCPDeprecationWarningfrom fastmcp.utilities.authorization import AuthCheckfrom fastmcp.utilities.components import FastMCPComponentfrom fastmcp.utilities.logging import get_logger@@ -593,28 +591,3 @@ def _convert_to_content(__all__ = ["Tool", "ToolResult"]---def __getattr__(name: str) -> Any:- """Deprecated re-exports for backwards compatibility."""- deprecated_exports = {- "FunctionTool": "FunctionTool",- "ParsedFunction": "ParsedFunction",- "tool": "tool",- }-- if name in deprecated_exports:- import fastmcp-- if fastmcp.settings.deprecation_warnings:- warnings.warn(- f"Importing {name} from fastmcp.tools.tool is deprecated. "- f"Import from fastmcp.tools.function_tool instead.",- FastMCPDeprecationWarning,- stacklevel=2,- )- from fastmcp.tools import function_tool-- return getattr(function_tool, name)-- raise AttributeError(f"module {__name__!r} has no attribute {name!r}")diff --git a/tests/deprecated/test_function_component_imports.py b/tests/deprecated/test_function_component_imports.pydeleted file mode 100644index 73c07dec9..000000000--- a/tests/deprecated/test_function_component_imports.py+++ /dev/null@@ -1,121 +0,0 @@-"""Test that deprecated import paths for function components still work."""--import warnings--import pytest--from fastmcp.utilities.tests import temporary_settings---class TestDeprecatedFunctionToolImports:- def test_function_tool_from_tool_module(self):- with temporary_settings(deprecation_warnings=True):- with pytest.warns(- DeprecationWarning, match="Import from fastmcp.tools.function_tool"- ):- from fastmcp.tools.base import FunctionTool-- # Verify it's the real class- from fastmcp.tools.function_tool import (- FunctionTool as CanonicalFunctionTool,- )-- assert FunctionTool is CanonicalFunctionTool-- def test_parsed_function_from_tool_module(self):- with temporary_settings(deprecation_warnings=True):- with pytest.warns(- DeprecationWarning, match="Import from fastmcp.tools.function_tool"- ):- from fastmcp.tools.base import ParsedFunction-- from fastmcp.tools.function_tool import (- ParsedFunction as CanonicalParsedFunction,- )-- assert ParsedFunction is CanonicalParsedFunction-- def test_tool_decorator_from_tool_module(self):- with temporary_settings(deprecation_warnings=True):- with pytest.warns(- DeprecationWarning, match="Import from fastmcp.tools.function_tool"- ):- from fastmcp.tools.base import tool-- from fastmcp.tools.function_tool import tool as canonical_tool-- assert tool is canonical_tool-- def test_no_warning_when_disabled(self):- with temporary_settings(deprecation_warnings=False):- with warnings.catch_warnings():- warnings.simplefilter("error")- from fastmcp.tools.base import FunctionTool # noqa: F401---class TestDeprecatedFunctionResourceImports:- def test_function_resource_from_resource_module(self):- with temporary_settings(deprecation_warnings=True):- with pytest.warns(- DeprecationWarning,- match="Import from fastmcp.resources.function_resource",- ):- from fastmcp.resources.base import FunctionResource-- from fastmcp.resources.function_resource import (- FunctionResource as CanonicalFunctionResource,- )-- assert FunctionResource is CanonicalFunctionResource-- def test_resource_decorator_from_resource_module(self):- with temporary_settings(deprecation_warnings=True):- with pytest.warns(- DeprecationWarning,- match="Import from fastmcp.resources.function_resource",- ):- from fastmcp.resources.base import resource-- from fastmcp.resources.function_resource import (- resource as canonical_resource,- )-- assert resource is canonical_resource-- def test_no_warning_when_disabled(self):- with temporary_settings(deprecation_warnings=False):- with warnings.catch_warnings():- warnings.simplefilter("error")- from fastmcp.resources.base import FunctionResource # noqa: F401---class TestDeprecatedFunctionPromptImports:- def test_function_prompt_from_prompt_module(self):- with temporary_settings(deprecation_warnings=True):- with pytest.warns(- DeprecationWarning, match="Import from fastmcp.prompts.function_prompt"- ):- from fastmcp.prompts.base import FunctionPrompt-- from fastmcp.prompts.function_prompt import (- FunctionPrompt as CanonicalFunctionPrompt,- )-- assert FunctionPrompt is CanonicalFunctionPrompt-- def test_prompt_decorator_from_prompt_module(self):- with temporary_settings(deprecation_warnings=True):- with pytest.warns(- DeprecationWarning, match="Import from fastmcp.prompts.function_prompt"- ):- from fastmcp.prompts.base import prompt-- from fastmcp.prompts.function_prompt import prompt as canonical_prompt-- assert prompt is canonical_prompt-- def test_no_warning_when_disabled(self):- with temporary_settings(deprecation_warnings=False):- with warnings.catch_warnings():- warnings.simplefilter("error")- from fastmcp.prompts.base import FunctionPrompt # noqa: F401