Skip to content

Commit 2f8ec76

Browse files
committed
Small PR cleanup
1 parent dee2bb5 commit 2f8ec76

File tree

5 files changed

+13
-173
lines changed

5 files changed

+13
-173
lines changed

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ testpaths = ["tests"]
118118
python_files = ["test_*.py", "*_test.py"]
119119
python_classes = ["Test*"]
120120
python_functions = ["test_*"]
121-
addopts = ["--inline-snapshot=fix,create"]
121+
addopts = ["--inline-snapshot=disable"]
122122

123123
[tool.ty.src]
124124
include = ["src", "tests"]

src/fastmcp/client/auth/oauth.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,20 @@
55
import webbrowser
66
from asyncio import Future
77
from collections.abc import AsyncGenerator
8-
from datetime import datetime
9-
from pathlib import Path
108
from typing import Any
119
from urllib.parse import urlparse
1210

1311
import anyio
1412
import httpx
1513
from kv_store_adapter.adapters.pydantic import PydanticAdapter
16-
from kv_store_adapter.stores.disk import DiskStore
1714
from kv_store_adapter.types import KVStoreProtocol
1815
from mcp.client.auth import OAuthClientProvider, TokenStorage
1916
from mcp.shared.auth import (
2017
OAuthClientInformationFull,
2118
OAuthClientMetadata,
2219
OAuthToken,
2320
)
24-
from pydantic import AnyHttpUrl, BaseModel
21+
from pydantic import AnyHttpUrl
2522
from uvicorn.server import Server
2623

2724
from fastmcp import settings

src/fastmcp/server/auth/oauth_proxy.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
from authlib.common.security import generate_token
3030
from authlib.integrations.httpx_client import AsyncOAuth2Client
3131
from kv_store_adapter.adapters.pydantic import PydanticAdapter
32-
from kv_store_adapter.stores.disk import DiskStore
3332
from kv_store_adapter.types import KVStoreProtocol
3433
from mcp.server.auth.provider import (
3534
AccessToken,

src/fastmcp/settings.py

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from pathlib import Path
77
from typing import TYPE_CHECKING, Annotated, Any, Literal
88

9-
from kv_store_adapter.stores.disk import DiskStore
9+
from kv_store_adapter.types import KVStoreProtocol
1010
from pydantic import Field, ImportString, field_validator
1111
from pydantic.fields import FieldInfo
1212
from pydantic_settings import (
@@ -149,7 +149,7 @@ def settings(self) -> Self:
149149

150150
home: Path = Path.home() / ".fastmcp"
151151

152-
data_path: Path = home / "data.db"
152+
data_path: Path | None = home / "data.db"
153153

154154
test_mode: bool = False
155155

@@ -384,8 +384,15 @@ def server_auth_class(self) -> AuthProvider | None:
384384
return auth_class
385385

386386
@cached_property
387-
def data_store(self) -> DiskStore:
388-
return DiskStore(path=str(self.data_path), size_limit=1024 * 1024 * 10) # 10MB
387+
def data_store(self) -> KVStoreProtocol:
388+
if not self.data_path:
389+
from kv_store_adapter.stores.memory import MemoryStore
390+
391+
return MemoryStore()
392+
393+
from kv_store_adapter.stores.disk import DiskStore
394+
395+
return DiskStore(path=str(self.data_path), size_limit=1024 * 1024 * 10) # 10MB
389396

390397

391398
def __getattr__(name: str):

tests/client/auth/test_oauth_token_expiry.py

Lines changed: 0 additions & 163 deletions
This file was deleted.

0 commit comments

Comments
 (0)