fix: oauth

echo_server.py

@@ -1,26 +1,22 @@
 from fastmcp import FastMCP
 from fastmcp.server.auth import RemoteAuthProvider
-from fastmcp.server.auth.providers.oauth2 import OAuth2Provider
+from fastmcp.server.auth.providers.jwt import JWTVerifier
 from pydantic import AnyHttpUrl
 import os
 
-# OAuth 2.0 configuration for Twitter/X
-oauth2_provider = OAuth2Provider(
-    client_id=os.getenv("TWITTER_CLIENT_ID", "your_twitter_client_id"),
-    client_secret=os.getenv("TWITTER_CLIENT_SECRET", "your_twitter_client_secret"),
-    authorization_url="https://twitter.com/i/oauth2/authorize",
-    token_url="https://api.twitter.com/2/oauth2/token",
+# For OAuth 2.0 with Twitter, we'll use JWT verification
+# Twitter provides JWKS for token verification
+token_verifier = JWTVerifier(
     jwks_uri="https://api.twitter.com/2/oauth2/jwks",
-    scopes=["tweet.read", "users.read"],  # Add more scopes as needed
+    issuer="https://api.twitter.com",
+    audience=os.getenv("TWITTER_CLIENT_ID", "your_twitter_client_id"),
 )
 
 # Create the remote auth provider
 auth = RemoteAuthProvider(
-    token_verifier=oauth2_provider,
+    token_verifier=token_verifier,
     authorization_servers=[AnyHttpUrl("https://twitter.com")],
-    base_url=os.getenv("BASE_URL", "http://localhost:8000"),  # Your server base URL
-    # Twitter OAuth 2.0 redirect URIs
-    allowed_client_redirect_uris=["*"],  # Allow all URIs for testing
+    base_url=os.getenv("BASE_URL", "https://myuniverse01-deploy1.hf.space/echo"),
 )
 
 mcp = FastMCP(name="EchoServer", stateless_http=True, auth=auth)

math_server.py

@@ -1,28 +1,28 @@
-from mcp.server.fastmcp import FastMCP
-from typing import List
-import math
-import statistics
+from fastmcp import FastMCP
 
-mcp = FastMCP(name="MathServer", stateless_http=True)
+mcp = FastMCP(name='MathServer', stateless_http=True)
 
 
-@mcp.tool(description="A simple add tool")
+@mcp.tool(description='A simple add tool')
 def add_two(a: int, b: int) -> int:
     return a + b
 
 
-@mcp.tool(description="Subtract two numbers: a - b")
+@mcp.tool(description='Subtract two numbers: a - b')
 def subtract_two(a: int, b: int) -> int:
     return a - b
 
 
-@mcp.tool(description="Multiply two numbers")
+@mcp.tool(description='Multiply two numbers')
 def multiply(a: int, b: int) -> int:
     return a * b
 
 
-@mcp.tool(description="Divide two numbers: a / b. Raises ValueError on division by zero.")
+@mcp.tool(
+    description='Divide two numbers: a / b. '
+    'Raises ValueError on division by zero.'
+)
 def divide(a: float, b: float) -> float:
     if b == 0:
-        raise ValueError("Division by zero is not allowed")
+        raise ValueError('Division by zero is not allowed')
     return a / b

server.py

@@ -1,6 +1,6 @@
 import contextlib
 from fastapi import FastAPI, Request
-from fastapi.responses import HTMLResponse, FileResponse
+from fastapi.responses import HTMLResponse
 from fastapi.staticfiles import StaticFiles
 from fastapi.templating import Jinja2Templates
 from echo_server import mcp as echo_mcp
@@ -8,42 +8,41 @@ from math_server import mcp as math_mcp
 import os
 
 
-# Create a combined lifespan to manage both session managers
+# Create a simple lifespan (no session management needed for stateless HTTP)
 @contextlib.asynccontextmanager
 async def lifespan(app: FastAPI):
-    async with contextlib.AsyncExitStack() as stack:
-        await stack.enter_async_context(echo_mcp.session_manager.run())
-        await stack.enter_async_context(math_mcp.session_manager.run())
-        yield
+    yield
 
 
 BASE_DIR = os.path.dirname(__file__)
-STATIC_DIR = os.path.join(BASE_DIR, "static")
-TEMPLATES_DIR = os.path.join(BASE_DIR, "templates")
+STATIC_DIR = os.path.join(BASE_DIR, 'static')
+TEMPLATES_DIR = os.path.join(BASE_DIR, 'templates')
 
 app = FastAPI(lifespan=lifespan)
 
 # Serve static assets (screenshot, styles)
-app.mount("/static", StaticFiles(directory=STATIC_DIR), name="static")
+app.mount('/static', StaticFiles(directory=STATIC_DIR), name='static')
 
 templates = Jinja2Templates(directory=TEMPLATES_DIR)
 
 
-@app.get("/", response_class=HTMLResponse)
+@app.get('/', response_class=HTMLResponse)
 async def index(request: Request):
-    space_host = os.environ.get("SPACE_HOST")
+    space_host = os.environ.get('SPACE_HOST')
     if space_host and space_host.strip():
-        base_url = space_host.strip().rstrip("/")
+        base_url = space_host.strip().rstrip('/')
     else:
-        base_url = f"{request.url.scheme}://{request.url.netloc}"
-    return templates.TemplateResponse("index.html", {"request": request, "base_url": base_url})
+        base_url = f'{request.url.scheme}://{request.url.netloc}'
+    return templates.TemplateResponse(
+        'index.html', {'request': request, 'base_url': base_url}
+    )
 
 
-app.mount("/echo", echo_mcp.streamable_http_app())
-app.mount("/math", math_mcp.streamable_http_app())
+app.mount('/echo', echo_mcp.streamable_http_app())
+app.mount('/math', math_mcp.streamable_http_app())
 
-PORT = int(os.environ.get("PORT", "10000"))
+PORT = int(os.environ.get('PORT', '10000'))
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     import uvicorn
-    uvicorn.run(app, host="0.0.0.0", port=PORT)
+    uvicorn.run(app, host='0.0.0.0', port=PORT)