Merge pull request #171 from askui/fix/non-serializable-mcp-config-model

fix: non-serializable MCP config model

Author: adi-wan-askui

src/askui/chat/api/mcp_configs/models.py

@@ -1,13 +1,24 @@
-from typing import Literal
+from typing import Annotated, Literal
 
-from fastmcp.mcp_config import RemoteMCPServer, StdioMCPServer
-from pydantic import BaseModel
+from fastmcp.mcp_config import RemoteMCPServer as _RemoteMCPServer
+from fastmcp.mcp_config import StdioMCPServer
+from pydantic import BaseModel, Field
 
 from askui.chat.api.models import McpConfigId, WorkspaceId, WorkspaceResource
 from askui.utils.datetime_utils import UnixDatetime, now
 from askui.utils.id_utils import generate_time_ordered_id
 from askui.utils.not_given import NOT_GIVEN, BaseModelWithNotGiven, NotGiven
 
+
+class RemoteMCPServer(_RemoteMCPServer):
+    auth: Annotated[
+        str | Literal["oauth"] | None,  # noqa: PYI051
+        Field(
+            description='Either a string representing a Bearer token or the literal "oauth" to use OAuth authentication.',
+        ),
+    ] = None
+
+
 McpServer = StdioMCPServer | RemoteMCPServer
 
 

src/askui/chat/api/settings.py

@@ -1,10 +1,10 @@
 from pathlib import Path
 
-from fastmcp.mcp_config import RemoteMCPServer, StdioMCPServer
+from fastmcp.mcp_config import StdioMCPServer
 from pydantic import Field
 from pydantic_settings import BaseSettings, SettingsConfigDict
 
-from askui.chat.api.mcp_configs.models import McpConfig
+from askui.chat.api.mcp_configs.models import McpConfig, RemoteMCPServer
 from askui.chat.api.telemetry.integrations.fastapi.settings import TelemetrySettings
 from askui.chat.api.telemetry.logs.settings import LogFilter, LogSettings
 from askui.utils.datetime_utils import now