Merge branch 'main' into main

Author: SoldierSacha

README.md

@@ -1840,7 +1840,7 @@ import asyncio
 
 from mcp.client.session import ClientSession
 from mcp.client.stdio import StdioServerParameters, stdio_client
-from mcp.types import Resource
+from mcp.types import PaginatedRequestParams, Resource
 
 
 async def list_all_resources() -> None:
@@ -1857,7 +1857,7 @@ async def list_all_resources() -> None:
 
             while True:
                 # Fetch a page of resources
-                result = await session.list_resources(cursor=cursor)
+                result = await session.list_resources(params=PaginatedRequestParams(cursor=cursor))
                 all_resources.extend(result.resources)
 
                 print(f"Fetched {len(result.resources)} resources")

examples/clients/simple-auth-client/pyproject.toml

@@ -14,10 +14,7 @@ classifiers = [
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.10",
 ]
-dependencies = [
-    "click>=8.2.0",
-    "mcp>=1.0.0",
-]
+dependencies = ["click>=8.2.0", "mcp"]
 
 [project.scripts]
 mcp-simple-auth-client = "mcp_simple_auth_client.main:cli"
@@ -44,9 +41,3 @@ target-version = "py310"
 
 [tool.uv]
 dev-dependencies = ["pyright>=1.1.379", "pytest>=8.3.3", "ruff>=0.6.9"]
-
-[tool.uv.sources]
-mcp = { path = "../../../" }
-
-[[tool.uv.index]]
-url = "https://pypi.org/simple"

examples/clients/simple-auth-client/uv.lock

@@ -401,7 +401,7 @@ async def start(self) -> None:
             await self.cleanup_servers()
 
 
-async def main() -> None:
+async def run() -> None:
     """Initialize and run the chat session."""
     config = Configuration()
     server_config = config.load_config("servers_config.json")
@@ -411,5 +411,9 @@ async def main() -> None:
     await chat_session.start()
 
 
+def main() -> None:
+    asyncio.run(run())
+
+
 if __name__ == "__main__":
-    asyncio.run(main())
+    main()

examples/clients/simple-chatbot/mcp_simple_chatbot/main.py

@@ -17,12 +17,12 @@ classifiers = [
 dependencies = [
     "python-dotenv>=1.0.0",
     "requests>=2.31.0",
-    "mcp>=1.0.0",
-    "uvicorn>=0.32.1"
+    "mcp",
+    "uvicorn>=0.32.1",
 ]
 
 [project.scripts]
-mcp-simple-chatbot = "mcp_simple_chatbot.client:main"
+mcp-simple-chatbot = "mcp_simple_chatbot.main:main"
 
 [build-system]
 requires = ["hatchling"]

examples/clients/simple-chatbot/pyproject.toml

@@ -45,11 +45,6 @@ class ResourceServerSettings(BaseSettings):
     # RFC 8707 resource validation
     oauth_strict: bool = False
 
-    # TODO(Marcelo): Is this even needed? I didn't have time to check.
-    def __init__(self, **data: Any):
-        """Initialize settings with values from environment variables."""
-        super().__init__(**data)
-
 
 def create_resource_server(settings: ResourceServerSettings) -> FastMCP:
     """

examples/clients/simple-chatbot/uv.lock

@@ -6,7 +6,7 @@
 
 from mcp.client.session import ClientSession
 from mcp.client.stdio import StdioServerParameters, stdio_client
-from mcp.types import Resource
+from mcp.types import PaginatedRequestParams, Resource
 
 
 async def list_all_resources() -> None:
@@ -23,7 +23,7 @@ async def list_all_resources() -> None:
 
             while True:
                 # Fetch a page of resources
-                result = await session.list_resources(cursor=cursor)
+                result = await session.list_resources(params=PaginatedRequestParams(cursor=cursor))
                 all_resources.extend(result.resources)
 
                 print(f"Fetched {len(result.resources)} resources")

examples/servers/simple-auth/mcp_simple_auth/server.py

@@ -98,8 +98,8 @@ venv = ".venv"
 # those private functions instead of testing the private functions directly. It makes it easier to maintain the code source
 # and refactor code that is not public.
 executionEnvironments = [
-  { root = "tests", reportUnusedFunction = false, reportPrivateUsage = false },
-  { root = "examples/servers", reportUnusedFunction = false },
+    { root = "tests", reportUnusedFunction = false, reportPrivateUsage = false },
+    { root = "examples/servers", reportUnusedFunction = false },
 ]
 
 [tool.ruff]
@@ -109,17 +109,17 @@ extend-exclude = ["README.md"]
 
 [tool.ruff.lint]
 select = [
-    "C4",    # flake8-comprehensions
-    "C90",   # mccabe
-    "E",     # pycodestyle
-    "F",     # pyflakes
-    "I",     # isort
-    "PERF",  # Perflint
-    "PL",    # Pylint
-    "UP",    # pyupgrade
+    "C4",   # flake8-comprehensions
+    "C90",  # mccabe
+    "E",    # pycodestyle
+    "F",    # pyflakes
+    "I",    # isort
+    "PERF", # Perflint
+    "PL",   # Pylint
+    "UP",   # pyupgrade
 ]
 ignore = ["PERF203", "PLC0415", "PLR0402"]
-mccabe.max-complexity = 24  # Default is 10
+mccabe.max-complexity = 24 # Default is 10
 
 [tool.ruff.lint.per-file-ignores]
 "__init__.py" = ["F401"]
@@ -128,13 +128,13 @@ mccabe.max-complexity = 24  # Default is 10
 
 [tool.ruff.lint.pylint]
 allow-magic-value-types = ["bytes", "float", "int", "str"]
-max-args = 23         # Default is 5
-max-branches = 23     # Default is 12
-max-returns = 13      # Default is 6
-max-statements = 102  # Default is 50
+max-args = 23                                              # Default is 5
+max-branches = 23                                          # Default is 12
+max-returns = 13                                           # Default is 6
+max-statements = 102                                       # Default is 50
 
 [tool.uv.workspace]
-members = ["examples/servers/*", "examples/snippets"]
+members = ["examples/clients/*", "examples/servers/*", "examples/snippets"]
 
 [tool.uv.sources]
 mcp = { workspace = true }
@@ -154,16 +154,16 @@ filterwarnings = [
     "ignore:websockets.server.WebSocketServerProtocol is deprecated:DeprecationWarning",
     "ignore:Returning str or bytes.*:DeprecationWarning:mcp.server.lowlevel",
     # pywin32 internal deprecation warning
-    "ignore:getargs.*The 'u' format is deprecated:DeprecationWarning"
+    "ignore:getargs.*The 'u' format is deprecated:DeprecationWarning",
 ]
 
 [tool.markdown.lint]
-default=true
-MD004=false  # ul-style - Unordered list style
-MD007.indent=2  # ul-indent - Unordered list indentation
-MD013=false  # line-length - Line length
-MD029=false  # ol-prefix - Ordered list item prefix
-MD033=false  # no-inline-html Inline HTML
-MD041=false  # first-line-heading/first-line-h1
-MD046=false  # indented-code-blocks
-MD059=false  # descriptive-link-text
+default = true
+MD004 = false    # ul-style - Unordered list style
+MD007.indent = 2 # ul-indent - Unordered list indentation
+MD013 = false    # line-length - Line length
+MD029 = false    # ol-prefix - Ordered list item prefix
+MD033 = false    # no-inline-html Inline HTML
+MD041 = false    # first-line-heading/first-line-h1
+MD046 = false    # indented-code-blocks
+MD059 = false    # descriptive-link-text