Update app.py

app.py

@@ -1,22 +1,21 @@
 import os
 import json
-import asyncio
 import httpx
-from fastapi import FastAPI, HTTPException
-from fastapi.responses import StreamingResponse
+from fastapi import FastAPI, HTTPException, APIRouter
 from datetime import datetime, timedelta
 from fastapi.middleware.cors import CORSMiddleware
 from fastmcp.server import FastMCP
 from contextlib import asynccontextmanager
 from typing import List, Dict, Optional
 
+# 初始化 MCP 服务器（必须在 FastAPI 之前）
+mcp_server = FastMCP(name="GitHubTrendingAPI")
+
 @asynccontextmanager
 async def lifespan(app: FastAPI):
-    # 初始化时获取数据
     await fetch_github_trending()
     yield
 
-# 创建主 FastAPI 应用
 app = FastAPI(lifespan=lifespan)
 
 # CORS 配置
@@ -26,107 +25,63 @@ app.add_middleware(
     allow_credentials=True,
     allow_methods=["*"],
     allow_headers=["*"],
-    expose_headers=["*"]
 )
 
-# 缓存设置
-cached_trending: List[Dict] = []
-last_updated: Optional[datetime] = None
-GITHUB_API_URL = "https://api.github.com/search/repositories"
-CACHE_EXPIRY = timedelta(minutes=30)
+# 缓存变量
+cached_trending = []
+last_updated = None
 
-async def fetch_github_trending() -> List[Dict]:
-    """获取 GitHub 热门项目"""
+async def fetch_github_trending():
     global cached_trending, last_updated
-    
-    params = {
-        "q": "stars:>1000",
-        "sort": "stars",
-        "order": "desc",
-        "per_page": 10
-    }
-    
-    headers = {
-        "Accept": "application/vnd.github.v3+json",
-        "User-Agent": "GitHub-Trending-API"
-    }
-    
-    if github_token := os.getenv("GITHUB_TOKEN"):
-        headers["Authorization"] = f"token {github_token}"
+    headers = {"Accept": "application/vnd.github.v3+json"}
+    if token := os.getenv("GITHUB_TOKEN"):
+        headers["Authorization"] = f"token {token}"
     
     try:
         async with httpx.AsyncClient() as client:
-            response = await client.get(
-                GITHUB_API_URL,
-                params=params,
-                headers=headers,
-                timeout=10.0
+            r = await client.get(
+                "https://api.github.com/search/repositories",
+                params={"q": "stars:>1000", "sort": "stars", "per_page": 10},
+                headers=headers
             )
-            response.raise_for_status()
-            
+            r.raise_for_status()
             cached_trending = [
                 {
-                    "name": item["full_name"],
-                    "url": item["html_url"],
-                    "stars": item["stargazers_count"],
-                    "description": item["description"],
-                    "language": item["language"]
+                    "name": repo["full_name"],
+                    "url": repo["html_url"],
+                    "stars": repo["stargazers_count"]
                 }
-                for item in response.json().get("items", [])
+                for repo in r.json()["items"]
             ]
             last_updated = datetime.now()
-            return cached_trending
-            
-    except httpx.HTTPStatusError as e:
-        print(f"GitHub API error: {e.response.status_code} - {e.response.text}")
-        if cached_trending:
-            return cached_trending
-        raise HTTPException(
-            status_code=429,
-            detail="GitHub API rate limit exceeded. Please try again later."
-        )
     except Exception as e:
-        print(f"Error fetching GitHub trending: {e}")
-        if cached_trending:
-            return cached_trending
-        raise HTTPException(
-            status_code=500,
-            detail="Failed to fetch trending repositories"
-        )
-
-# 初始化 MCP 服务器
-mcp_server = FastMCP(name="GitHubTrendingAPI")
+        print(f"Fetch error: {e}")
+        if not cached_trending:
+            raise HTTPException(500, "Failed to fetch data")
 
 @mcp_server.tool()
 async def get_trending_repos(num: int = 10) -> dict:
-    """获取 GitHub 热门仓库"""
-    if not last_updated or (datetime.now() - last_updated) > CACHE_EXPIRY:
+    if not last_updated or (datetime.now() - last_updated) > timedelta(minutes=30):
         await fetch_github_trending()
     return {"trending": cached_trending[:num]}
 
-# 创建独立的 FastAPI 子应用并挂载 MCP 服务
-mcp_subapp = FastAPI()
-mcp_subapp.router.routes.extend(mcp_server.http_app().routes)  # 手动合并路由
-app.mount("/mcp", mcp_subapp)  # 挂载到 /mcp 路径
+# 关键修改：手动注册 MCP 路由到主应用
+mcp_router = APIRouter()
+mcp_router.routes.extend(mcp_server.http_app().routes)
+app.include_router(mcp_router, prefix="/mcp")
 
 @app.get("/")
 async def root():
     return {
-        "message": "GitHub Trending API is running",
-        "documentation": "/docs",
-        "mcp_endpoint": "/mcp",
-        "trending_endpoint": "/trending"
+        "message": "API is running",
+        "endpoints": {
+            "mcp": "/mcp/tool/get_trending_repos",
+            "trending": "/trending"
+        }
     }
 
 @app.get("/trending")
 async def get_trending(num: int = 10):
-    """公开的 HTTP 端点"""
-    if not cached_trending or (datetime.now() - last_updated) > CACHE_EXPIRY:
+    if not cached_trending:
         await fetch_github_trending()
-    
-    return {
-        "trending": cached_trending[:num],
-        "last_updated": last_updated.isoformat() if last_updated else None,
-        "cache_expires_in": CACHE_EXPIRY.total_seconds(),
-        "rate_limit_info": "Consider adding a GitHub token for higher rate limits"
-    }
+    return {"trending": cached_trending[:num]}