update

Dockerfile

@@ -8,8 +8,5 @@ RUN pip install -r requirements.txt
 COPY . .
 
 # Hugging Face Space 必须监听 7860 端口
-# 用 shell 脚本同时跑 FastAPI(8008) + Gradio(7860)
-# 给启动脚本执行权限
-RUN chmod +x /app/start_services.sh
-
-CMD ["/app/start_services.sh"]
+# 直接启动 Gradio 服务，内置所有功能
+CMD ["python", "app.py"]

app.py

@@ -1,35 +1,52 @@
 import gradio as gr
-import httpx
 import asyncio
 import json
+import subprocess
+import sys
+from typing import AsyncGenerator
+
+# 预定义的200个常用英文单词
+ENGLISH_WORDS = [
+    "the", "be", "to", "of", "and", "a", "in", "that", "have", "I",
+    "it", "for", "not", "on", "with", "he", "as", "you", "do", "at",
+    "this", "but", "his", "by", "from", "they", "we", "say", "her", "she",
+    "or", "an", "will", "my", "one", "all", "would", "there", "their", "what",
+    "so", "up", "out", "if", "about", "who", "get", "which", "go", "me",
+    "when", "make", "can", "like", "time", "no", "just", "him", "know", "take",
+    "people", "into", "year", "your", "good", "some", "could", "them", "see", "other",
+    "than", "then", "now", "look", "only", "come", "its", "over", "think", "also",
+    "back", "after", "use", "two", "how", "our", "work", "first", "well", "way",
+    "even", "new", "want", "because", "any", "these", "give", "day", "most", "us",
+    "very", "life", "after", "call", "world", "over", "still", "take", "every", "through",
+    "before", "long", "where", "much", "should", "well", "people", "down", "own", "work",
+    "first", "good", "new", "write", "our", "used", "me", "man", "too", "any",
+    "day", "same", "right", "look", "think", "also", "around", "another", "came"
+]
+
+async def generate_words_stream(query: str) -> AsyncGenerator[str, None]:
+    """生成200个英文单词的流式输出（Gradio版本）"""
+    # 发送开始标记
+    yield f"🚀 开始生成200个英文单词...\n"
+    
+    # 流式输出200个单词
+    for i, word in enumerate(ENGLISH_WORDS, 1):
+        # 模拟一些处理时间，让流式效果更明显
+        await asyncio.sleep(0.05)
+        
+        # 发送单词
+        yield word
+    
+    # 发送完成标记
+    yield f"\n✅ 200个英文单词生成完成！"
 
-API_URL = "http://localhost:8008/stream-words"
-
-async def stream_words(query: str):
-    """异步获取 FastAPI 的流式输出"""
-    async with httpx.AsyncClient(timeout=None) as client:
-        async with client.stream("GET", API_URL, params={"query": query}) as response:
-            async for line in response.aiter_lines():
-                if line.startswith("data: "):
-                    try:
-                        data = json.loads(line[6:])
-                        if data.get('status') == 'word':
-                            yield data.get('word', '')
-                        elif data.get('status') == 'start':
-                            yield f"🚀 {data.get('message', '开始生成单词...')}\n"
-                        elif data.get('status') == 'complete':
-                            yield f"\n✅ {data.get('message', '生成完成！')}"
-                    except json.JSONDecodeError:
-                        continue
-
-def stream_words_mcp(query: str = "give me some english words"):
+def generate_words_mcp(query: str = "give me some english words") -> str:
     """MCP工具包装函数：流式获取英文单词，返回结果给MCP客户端"""
     try:
         # 调用原始函数并收集结果
         result = []
         # 注意：这里需要处理异步函数
         async def collect_tokens():
-            async for token in stream_words(query):
+            async for token in generate_words_stream(query):
                 if token.strip():
                     result.append(token)
             return result
@@ -45,10 +62,10 @@ def stream_words_mcp(query: str = "give me some english words"):
     except Exception as e:
         return f"生成单词时出错: {str(e)}"
 
-async def stream_words_mcp_stream(query: str = "give me some english words"):
+async def generate_words_mcp_stream(query: str = "give me some english words") -> AsyncGenerator[str, None]:
     """MCP工具：流式返回英文单词"""
     try:
-        async for token in stream_words(query):
+        async for token in generate_words_stream(query):
             if token.strip():
                 yield token
     except Exception as e:
@@ -104,7 +121,7 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
 
         # 流式拼接回复
         full_response = ""
-        async for token in stream_words(last_user_msg):
+        async for token in generate_words_stream(last_user_msg):
             if token.strip():
                 full_response += " " + token
                 messages[-1] = {"role": "assistant", "content": full_response.strip()}
@@ -120,9 +137,9 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
     clear_btn.click(clear_chat, outputs=chatbot)
 
     # 注册MCP工具 - 使用包装函数并正确配置输出
-    demo.load(stream_words_mcp, inputs=None, outputs=gr.Textbox(label="MCP结果", visible=False))
+    demo.load(generate_words_mcp, inputs=None, outputs=gr.Textbox(label="MCP结果", visible=False))
     # 注册流式MCP工具
-    demo.load(stream_words_mcp_stream, inputs=None, outputs=gr.Textbox(label="流式MCP结果", visible=False))
+    demo.load(generate_words_mcp_stream, inputs=None, outputs=gr.Textbox(label="流式MCP结果", visible=False))
 
 # 开启 MCP server
 demo.launch(mcp_server=True, server_port=7860)

requirements.txt

@@ -1,4 +1 @@
-gradio[mcp]>=4.36.0
-httpx
-fastapi
-uvicorn
+gradio[mcp]>=4.36.0

server.py

@@ -1,77 +0,0 @@
-from fastapi import FastAPI, Request
-from fastapi.responses import StreamingResponse
-import asyncio
-import json
-from typing import AsyncGenerator
-
-app = FastAPI(title="Streaming English Words API", version="1.0.0")
-
-# 预定义的200个常用英文单词
-ENGLISH_WORDS = [
-    "the", "be", "to", "of", "and", "a", "in", "that", "have", "I",
-    "it", "for", "not", "on", "with", "he", "as", "you", "do", "at",
-    "this", "but", "his", "by", "from", "they", "we", "say", "her", "she",
-    "or", "an", "will", "my", "one", "all", "would", "there", "their", "what",
-    "so", "up", "out", "if", "about", "who", "get", "which", "go", "me",
-    "when", "make", "can", "like", "time", "no", "just", "him", "know", "take",
-    "people", "into", "year", "your", "good", "some", "could", "them", "see", "other",
-    "than", "then", "now", "look", "only", "come", "its", "over", "think", "also",
-    "back", "after", "use", "two", "how", "our", "work", "first", "well", "way",
-    "even", "new", "want", "because", "any", "these", "give", "day", "most", "us",
-    "very", "life", "after", "call", "world", "over", "still", "take", "every", "through",
-    "before", "long", "where", "much", "should", "well", "people", "down", "own", "work",
-    "first", "good", "new", "write", "our", "used", "me", "man", "too", "any",
-    "day", "same", "right", "look", "think", "also", "around", "another", "came"
-]
-
-async def generate_words_stream(query: str) -> AsyncGenerator[str, None]:
-    """生成200个英文单词的流式输出"""
-    # 发送开始标记
-    yield f"data: {json.dumps({'status': 'start', 'query': query, 'message': '开始生成200个英文单词...'})}\n\n"
-    
-    # 流式输出200个单词
-    for i, word in enumerate(ENGLISH_WORDS, 1):
-        # 模拟一些处理时间，让流式效果更明显
-        await asyncio.sleep(0.05)
-        
-        # 发送单词数据
-        data = {
-            'status': 'word',
-            'index': i,
-            'word': word,
-            'total': len(ENGLISH_WORDS)
-        }
-        yield f"data: {json.dumps(data)}\n\n"
-    
-    # 发送完成标记
-    yield f"data: {json.dumps({'status': 'complete', 'message': '200个英文单词生成完成！'})}\n\n"
-
-@app.get("/")
-async def root():
-    return {"message": "Streaming English Words API", "endpoint": "/stream-words"}
-
-@app.get("/stream-words")
-async def stream_words(query: str = "default"):
-    """流式输出200个英文单词"""
-    return StreamingResponse(
-        generate_words_stream(query),
-        media_type="text/plain",
-        headers={
-            "Cache-Control": "no-cache",
-            "Connection": "keep-alive",
-            "Content-Type": "text/event-stream",
-        }
-    )
-
-@app.get("/words")
-async def get_words(query: str = "default"):
-    """一次性返回所有200个英文单词"""
-    return {
-        "query": query,
-        "total_words": len(ENGLISH_WORDS),
-        "words": ENGLISH_WORDS
-    }
-
-if __name__ == "__main__":
-    import uvicorn
-    uvicorn.run(app, host="0.0.0.0", port=8008) 

start_services.sh

@@ -1,62 +0,0 @@
-#!/bin/bash
-# 启动脚本，替代supervisord
-
-# 设置错误时退出
-set -e
-
-# 函数：启动服务
-start_service() {
-    local name=$1
-    local command=$2
-    
-    echo "Starting $name..."
-    $command &
-    local pid=$!
-    echo "$name started with PID $pid"
-    echo $pid > "/tmp/${name}.pid"
-}
-
-# 函数：停止服务
-stop_service() {
-    local name=$1
-    local pid_file="/tmp/${name}.pid"
-    
-    if [ -f "$pid_file" ]; then
-        local pid=$(cat "$pid_file")
-        echo "Stopping $name (PID: $pid)..."
-        kill -TERM $pid 2>/dev/null || true
-        rm -f "$pid_file"
-    fi
-}
-
-# 函数：清理退出
-cleanup() {
-    echo "Received signal, cleaning up..."
-    stop_service "fastapi"
-    stop_service "gradio"
-    exit 0
-}
-
-# 设置信号处理
-trap cleanup SIGTERM SIGINT
-
-# 启动服务
-start_service "fastapi" "uvicorn server:app --host 0.0.0.0 --port 8008"
-start_service "gradio" "python app.py"
-
-# 等待信号
-echo "All services started, waiting for signal..."
-while true; do
-    # 检查进程是否还在运行
-    if ! kill -0 $(cat /tmp/fastapi.pid 2>/dev/null) 2>/dev/null; then
-        echo "FastAPI process died, restarting..."
-        start_service "fastapi" "uvicorn server:app --host 0.0.0.0 --port 8008"
-    fi
-    
-    if ! kill -0 $(cat /tmp/gradio.pid 2>/dev/null) 2>/dev/null; then
-        echo "Gradio process died, restarting..."
-        start_service "gradio" "python app.py"
-    fi
-    
-    sleep 5
-done