Use python 3.10 types everywhere

Author: praboud-ant

src/mcp/shared/auth.py

@@ -1,4 +1,4 @@
-from typing import Any, List, Literal, Optional
+from typing import Any, Literal
 
 from pydantic import AnyHttpUrl, BaseModel, Field
 
@@ -10,9 +10,9 @@ class OAuthToken(BaseModel):
 
     access_token: str
     token_type: Literal["bearer"] = "bearer"
-    expires_in: Optional[int] = None
-    scope: Optional[str] = None
-    refresh_token: Optional[str] = None
+    expires_in: int | None = None
+    scope: str | None = None
+    refresh_token: str | None = None
 
 
 class OAuthClientMetadata(BaseModel):
@@ -22,33 +22,33 @@ class OAuthClientMetadata(BaseModel):
     for the full specification.
     """
 
-    redirect_uris: List[AnyHttpUrl] = Field(..., min_length=1)
+    redirect_uris: list[AnyHttpUrl] = Field(..., min_length=1)
     # token_endpoint_auth_method: this implementation only supports none &
     # client_secret_post;
     # ie: we do not support client_secret_basic
     token_endpoint_auth_method: Literal["none", "client_secret_post"] = (
         "client_secret_post"
     )
     # grant_types: this implementation only supports authorization_code & refresh_token
-    grant_types: List[Literal["authorization_code", "refresh_token"]] = [
+    grant_types: list[Literal["authorization_code", "refresh_token"]] = [
         "authorization_code"
     ]
     # this implementation only supports code; ie: it does not support implicit grants
-    response_types: List[Literal["code"]] = ["code"]
-    scope: Optional[str] = None
+    response_types: list[Literal["code"]] = ["code"]
+    scope: str | None = None
 
     # these fields are currently unused, but we support & store them for potential
     # future use
-    client_name: Optional[str] = None
-    client_uri: Optional[AnyHttpUrl] = None
-    logo_uri: Optional[AnyHttpUrl] = None
-    contacts: Optional[List[str]] = None
-    tos_uri: Optional[AnyHttpUrl] = None
-    policy_uri: Optional[AnyHttpUrl] = None
-    jwks_uri: Optional[AnyHttpUrl] = None
-    jwks: Optional[Any] = None
-    software_id: Optional[str] = None
-    software_version: Optional[str] = None
+    client_name: str | None = None
+    client_uri: AnyHttpUrl | None = None
+    logo_uri: AnyHttpUrl | None = None
+    contacts: list[str] | None = None
+    tos_uri: AnyHttpUrl | None = None
+    policy_uri: AnyHttpUrl | None = None
+    jwks_uri: AnyHttpUrl | None = None
+    jwks: Any | None = None
+    software_id: str | None = None
+    software_version: str | None = None
 
 
 class OAuthClientInformationFull(OAuthClientMetadata):
@@ -58,9 +58,9 @@ class OAuthClientInformationFull(OAuthClientMetadata):
     """
 
     client_id: str
-    client_secret: Optional[str] = None
-    client_id_issued_at: Optional[int] = None
-    client_secret_expires_at: Optional[int] = None
+    client_secret: str | None = None
+    client_id_issued_at: int | None = None
+    client_secret_expires_at: int | None = None
 
 
 class OAuthMetadata(BaseModel):

tests/server/fastmcp/auth/test_auth_integration.py

@@ -8,7 +8,7 @@
 import secrets
 import time
 import unittest.mock
-from typing import List, Literal, Optional
+from typing import Literal
 from urllib.parse import parse_qs, urlparse
 
 import anyio
@@ -48,7 +48,7 @@ class MockClientStore:
     def __init__(self):
         self.clients = {}
 
-    async def get_client(self, client_id: str) -> Optional[OAuthClientInformationFull]:
+    async def get_client(self, client_id: str) -> OAuthClientInformationFull | None:
         return self.clients.get(client_id)
 
     async def register_client(self, client_info: OAuthClientInformationFull):
@@ -145,7 +145,7 @@ async def exchange_refresh_token(
         self,
         client: OAuthClientInformationFull,
         refresh_token: RefreshToken,
-        scopes: List[str],
+        scopes: list[str],
     ) -> OAuthToken:
         # Check if refresh token exists
         assert refresh_token.token in self.refresh_tokens