Update app.py

app.py

@@ -8,6 +8,9 @@ from urllib.parse import urlparse, urljoin
 from typing import Dict, Any, Optional, List
 from dataclasses import dataclass
 from datetime import datetime
+from fastapi import FastAPI, Request
+from fastapi.responses import StreamingResponse, RedirectResponse, JSONResponse
+from fastapi.middleware.cors import CORSMiddleware
 
 # 配置日志
 logging.basicConfig(
@@ -19,7 +22,7 @@ logging.basicConfig(
 class ProxyResponse:
     """代理响应数据类"""
     status: int
-    content: str
+    content: Any
     headers: Dict[str, str]
     redirect_url: Optional[str] = None
     error: Optional[str] = None
@@ -167,7 +170,7 @@ class GitHubProxy:
                 error="服务器内部错误"
             )
     
-    def proxy_request(self, url: str, request: gr.Request) -> Dict[str, Any]:
+    def proxy_request(self, url: str, request: Request) -> Dict[str, Any]:
         """处理代理请求"""
         # 记录请求
         logging.info(f"Proxy request from {request.client.host} to {url}")
@@ -233,20 +236,27 @@ class GitHubProxy:
             
         return result
 
+# 创建 FastAPI 应用
+api = FastAPI()
+
+# 配置 CORS
+api.add_middleware(
+    CORSMiddleware,
+    allow_origins=["*"],
+    allow_credentials=True,
+    allow_methods=["*"],
+    allow_headers=["*"],
+)
+
 def create_interface():
     """创建Gradio界面"""
     proxy = GitHubProxy()
     
-    def proxy_download(request: gr.Request):
+    @api.get("/{path:path}")
+    async def proxy_download(request: Request, path: str):
         """处理直接代理请求"""
-        # 从路径中提取GitHub URL
-        path = request.headers.get('x-path', '')
         if not path:
-            return gr.Error("无效的请求路径")
-            
-        # 移除开头的斜杠
-        if path.startswith('/'):
-            path = path[1:]
+            return JSONResponse({"error": "无效的请求路径"}, status_code=400)
             
         # 检查并处理URL
         if not path.startswith(('http://', 'https://')):
@@ -257,34 +267,27 @@ def create_interface():
             response = proxy.proxy_request(path, request)
             
             if 'error' in response:
-                return gr.Error(response['error'])
+                return JSONResponse({"error": response['error']}, status_code=response['status'])
                 
             if 'redirect_url' in response:
-                return gr.Redirect(response['redirect_url'])
+                return RedirectResponse(response['redirect_url'])
                 
             # 获取文件内容（使用流式传输）
             proxy_response = proxy.fetch_github_content(path, stream=True)
             if proxy_response.error:
-                return gr.Error(proxy_response.error)
+                return JSONResponse({"error": proxy_response.error}, status_code=proxy_response.status)
                 
-            # 返回文件响应
-            headers = {
-                'Content-Type': proxy_response.headers.get('content-type', 'application/octet-stream'),
-                'Content-Disposition': proxy_response.headers.get('content-disposition', 'attachment'),
-            }
-            return gr.FileBinaryResponse(
-                proxy_response.content.raw,
+            # 返回流式响应
+            headers = dict(proxy_response.headers)
+            return StreamingResponse(
+                proxy_response.content.iter_content(chunk_size=8192),
                 headers=headers,
-                status=proxy_response.status
+                status_code=proxy_response.status
             )
                 
         except Exception as e:
             logging.error(f"Proxy error: {str(e)}")
-            return gr.Error(f"代理请求失败: {str(e)}")
-    
-    # 添加直接代理路由
-    app = gr.App()
-    app.add_route("/.*", proxy_download, method="GET")
+            return JSONResponse({"error": f"代理请求失败: {str(e)}"}, status_code=500)
     
     with gr.Blocks(title="GitHub Proxy", theme=gr.themes.Soft()) as blocks:
         gr.Markdown("""
@@ -355,14 +358,12 @@ def create_interface():
             inputs=url_input
         )
     
-    app.blocks = blocks
-    return app
+    # 将 Gradio 界面挂载到 FastAPI
+    blocks.queue()
+    api.mount("/ui", blocks)
+    return api
 
 if __name__ == "__main__":
+    import uvicorn
     app = create_interface()
-    app.launch(
-        server_name="0.0.0.0",
-        server_port=7860,
-        show_error=True,
-        quiet=False
-    )
+    uvicorn.run(app, host="0.0.0.0", port=7860)