update4

app.py

@@ -3,10 +3,10 @@ import json
 import importlib
 import os
 import sys
+import time
 from pathlib import Path
 import concurrent.futures
 import multiprocessing
-import time
 import threading
 import queue
 from datetime import datetime, timedelta
@@ -20,6 +20,118 @@ if current_dir not in sys.path:
 if src_dir not in sys.path:
     sys.path.append(src_dir)
 
+# 创建全局任务队列和任务状态跟踪
+task_queue = queue.Queue()
+task_results = {}
+active_tasks = {}
+completed_tasks = []
+task_id_counter = 0
+task_lock = threading.Lock()
+
+def get_next_task_id():
+    global task_id_counter
+    with task_lock:
+        task_id_counter += 1
+        return f"task_{task_id_counter}"
+
+def submit_task(input_data):
+    """提交任务到队列
+    
+    Args:
+        input_data: 列表(批量处理多个测试用例)
+        
+    Returns:
+        str: 任务ID
+    """
+    try:
+        if not isinstance(input_data, list):
+            return {"status": "error", "message": "Input must be a list"}
+            
+        task_id = get_next_task_id()
+        with task_lock:
+            estimated_time = estimate_completion_time(input_data)
+            task_info = {
+                "id": task_id,
+                "data": input_data,
+                "status": "queued",
+                "submitted_at": datetime.now(),
+                "estimated_completion_time": estimated_time,
+                "items_count": len(input_data)
+            }
+            active_tasks[task_id] = task_info
+            task_queue.put(task_info)
+            
+        # 如果这是第一个任务，启动处理线程
+        if len(active_tasks) == 1:
+            threading.Thread(target=process_task_queue, daemon=True).start()
+            
+        return {"status": "success", "task_id": task_id}
+            
+    except Exception as e:
+        return {"status": "error", "message": str(e)}
+
+def estimate_completion_time(input_data):
+    """估计完成任务所需的时间
+    
+    Args:
+        input_data: 任务数据
+        
+    Returns:
+        timedelta: 估计的完成时间
+    """
+    # 假设每个任务项平均需要2秒处理
+    # 这个值可以根据实际情况调整或从历史数据中学习
+    avg_time_per_item = 2  
+    total_items = len(input_data)
+    
+    # 考虑并行处理因素
+    cpu_count = multiprocessing.cpu_count()
+    parallel_factor = min(cpu_count, total_items)
+    
+    if parallel_factor > 0:
+        estimated_seconds = (total_items * avg_time_per_item) / parallel_factor
+        return timedelta(seconds=estimated_seconds)
+    else:
+        return timedelta(seconds=0)
+
+def process_task_queue():
+    """处理任务队列的后台线程"""
+    while True:
+        try:
+            if task_queue.empty():
+                time.sleep(0.5)
+                continue
+                
+            task_info = task_queue.get()
+            task_id = task_info["id"]
+            
+            # 更新任务状态
+            with task_lock:
+                active_tasks[task_id]["status"] = "processing"
+            
+            # 处理任务
+            result = evaluate(task_info["data"])
+            
+            # 更新任务结果
+            with task_lock:
+                active_tasks[task_id]["status"] = "completed"
+                active_tasks[task_id]["completed_at"] = datetime.now()
+                active_tasks[task_id]["result"] = result
+                
+                # 将任务移至已完成列表
+                completed_tasks.append(active_tasks[task_id])
+                del active_tasks[task_id]
+                
+                # 保留最近的20个已完成任务
+                if len(completed_tasks) > 20:
+                    completed_tasks.pop(0)
+            
+            task_queue.task_done()
+            
+        except Exception as e:
+            print(f"Error processing task queue: {str(e)}")
+            time.sleep(1)
+
 def evaluate(input_data):
     """评估代码的主函数
     
@@ -79,7 +191,7 @@ def evaluate_single_case(input_data):
             results.append(result)
             
         return results[0]
-                
+           
     except Exception as e:
         return {"status": "Exception", "error": str(e)}
 
@@ -101,242 +213,270 @@ def evaluate_code(code, language):
     except Exception as e:
         return {"status": "Exception", "error": str(e)}
 
-# 创建任务队列和相关变量
-task_queue = queue.Queue()
-tasks_info = []
-tasks_lock = threading.Lock()
-total_tasks_count = 0
-completed_tasks_count = 0
-estimated_completion_time = None
-average_task_time = 5  # 默认平均任务时间（秒）
-
-def add_task(input_data):
-    """添加任务到队列
+def get_queue_status():
+    """获取当前队列状态
     
-    Args:
-        input_data: 任务数据
-        
     Returns:
-        dict: 包含任务ID和状态的字典
+        dict: 包含队列状态的字典
     """
-    global total_tasks_count, tasks_info
-    
-    try:
-        if not isinstance(input_data, list):
-            return {"status": "错误", "message": "输入必须是列表格式"}
+    with task_lock:
+        queued_tasks = [task for task in active_tasks.values() if task["status"] == "queued"]
+        processing_tasks = [task for task in active_tasks.values() if task["status"] == "processing"]
         
-        task_id = int(time.time() * 1000)  # 使用时间戳作为任务ID
-        task_count = len(input_data)
+        # 计算总的预计完成时间
+        total_estimated_time = timedelta(seconds=0)
+        for task in active_tasks.values():
+            if isinstance(task["estimated_completion_time"], timedelta):
+                total_estimated_time += task["estimated_completion_time"]
         
-        with tasks_lock:
-            for item in input_data:
-                task_queue.put((task_id, item))
-                total_tasks_count += 1
-            
-            # 更新任务信息
-            task_info = {
-                "id": task_id,
-                "count": task_count,
-                "status": "等待中",
-                "submit_time": datetime.now().strftime("%Y-%m-%d %H:%M:%S"),
-                "completed": 0
-            }
-            tasks_info.append(task_info)
-            
-            # 更新预计完成时间
-            update_estimated_completion_time()
+        # 计算队列中的项目总数
+        total_items = sum(task["items_count"] for task in active_tasks.values())
         
-        return {"status": "成功", "task_id": task_id, "message": f"已添加{task_count}个任务到队列"}
-    
-    except Exception as e:
-        return {"status": "错误", "message": str(e)}
+        return {
+            "queued_tasks": len(queued_tasks),
+            "processing_tasks": len(processing_tasks),
+            "total_tasks": len(active_tasks),
+            "total_items": total_items,
+            "estimated_completion_time": str(total_estimated_time),
+            "active_tasks": [
+                {
+                    "id": task["id"],
+                    "status": task["status"],
+                    "items_count": task["items_count"],
+                    "submitted_at": task["submitted_at"].strftime("%Y-%m-%d %H:%M:%S"),
+                    "estimated_completion": str(task["estimated_completion_time"])
+                } for task in active_tasks.values()
+            ],
+            "recent_completed": [
+                {
+                    "id": task["id"],
+                    "items_count": task["items_count"],
+                    "submitted_at": task["submitted_at"].strftime("%Y-%m-%d %H:%M:%S"),
+                    "completed_at": task["completed_at"].strftime("%Y-%m-%d %H:%M:%S") if "completed_at" in task else "",
+                    "duration": str(task["completed_at"] - task["submitted_at"]) if "completed_at" in task else ""
+                } for task in completed_tasks[-5:]  # 只显示最近5个完成的任务
+            ]
+        }
 
-def update_estimated_completion_time():
-    """更新预计完成时间"""
-    global estimated_completion_time, average_task_time
-    
-    remaining_tasks = total_tasks_count - completed_tasks_count
-    if remaining_tasks > 0:
-        # 计算预计完成时间
-        estimated_seconds = remaining_tasks * average_task_time
-        estimated_completion_time = datetime.now() + timedelta(seconds=estimated_seconds)
-    else:
-        estimated_completion_time = None
-
-def process_tasks():
-    """处理队列中的任务"""
-    global completed_tasks_count, average_task_time, tasks_info
-    
-    while True:
-        try:
-            if not task_queue.empty():
-                start_time = time.time()
-                
-                # 获取任务并处理
-                task_id, task_data = task_queue.get()
-                result = evaluate_single_case(task_data)
-                
-                # 更新任务状态
-                with tasks_lock:
-                    completed_tasks_count += 1
-                    
-                    # 更新平均任务时间（使用移动平均）
-                    task_time = time.time() - start_time
-                    average_task_time = (average_task_time * 0.9) + (task_time * 0.1)
-                    
-                    # 更新任务信息
-                    for task in tasks_info:
-                        if task["id"] == task_id:
-                            task["completed"] += 1
-                            if task["completed"] >= task["count"]:
-                                task["status"] = "已完成"
-                            break
-                    
-                    # 更新预计完成时间
-                    update_estimated_completion_time()
-                
-                task_queue.task_done()
-            else:
-                time.sleep(0.1)
-        except Exception as e:
-            print(f"处理任务时出错: {str(e)}")
-            time.sleep(1)
-
-# 启动任务处理线程
-for _ in range(multiprocessing.cpu_count()):
-    threading.Thread(target=process_tasks, daemon=True).start()
-
-def get_queue_status():
-    """获取队列状态
+def render_queue_status():
+    """渲染队列状态UI
     
     Returns:
-        tuple: 包含任务信息、完成进度和预计完成时间的元组
+        str: HTML格式的队列状态显示
     """
-    with tasks_lock:
-        # 复制任务信息以避免并发问题
-        current_tasks = tasks_info.copy()
+    status = get_queue_status()
+    
+    html = f"""
+    <div style="font-family: Arial, sans-serif; max-width: 900px; margin: 0 auto; padding: 20px; background: #f9f9f9; border-radius: 10px; box-shadow: 0 4px 12px rgba(0,0,0,0.1);">
+        <div style="display: flex; justify-content: space-between; margin-bottom: 20px;">
+            <div style="background: #fff; padding: 15px; border-radius: 8px; width: 30%; box-shadow: 0 2px 6px rgba(0,0,0,0.05);">
+                <h3 style="margin: 0 0 10px; color: #444; font-size: 16px;">排队任务</h3>
+                <p style="font-size: 28px; font-weight: bold; margin: 0; color: #3498db;">{status['queued_tasks']}</p>
+            </div>
+            <div style="background: #fff; padding: 15px; border-radius: 8px; width: 30%; box-shadow: 0 2px 6px rgba(0,0,0,0.05);">
+                <h3 style="margin: 0 0 10px; color: #444; font-size: 16px;">处理中任务</h3>
+                <p style="font-size: 28px; font-weight: bold; margin: 0; color: #e74c3c;">{status['processing_tasks']}</p>
+            </div>
+            <div style="background: #fff; padding: 15px; border-radius: 8px; width: 30%; box-shadow: 0 2px 6px rgba(0,0,0,0.05);">
+                <h3 style="margin: 0 0 10px; color: #444; font-size: 16px;">总项目数</h3>
+                <p style="font-size: 28px; font-weight: bold; margin: 0; color: #2ecc71;">{status['total_items']}</p>
+            </div>
+        </div>
         
-        # 计算进度
-        if total_tasks_count > 0:
-            progress = completed_tasks_count / total_tasks_count
-        else:
-            progress = 0
+        <div style="background: #fff; padding: 20px; border-radius: 8px; margin-bottom: 20px; box-shadow: 0 2px 6px rgba(0,0,0,0.05);">
+            <h2 style="margin: 0 0 15px; color: #333; font-size: 18px;">预计完成时间</h2>
+            <div style="display: flex; align-items: center;">
+                <div style="font-size: 24px; font-weight: bold; color: #9b59b6;">{status['estimated_completion_time']}</div>
+                <div style="margin-left: 10px; color: #777; font-size: 14px;">（小时:分钟:秒）</div>
+            </div>
+        </div>
         
-        # 格式化预计完成时间
-        if estimated_completion_time:
-            eta = estimated_completion_time.strftime("%Y-%m-%d %H:%M:%S")
-            remaining_seconds = (estimated_completion_time - datetime.now()).total_seconds()
-            
-            if remaining_seconds < 60:
-                eta_text = f"{int(remaining_seconds)}秒后完成"
-            elif remaining_seconds < 3600:
-                eta_text = f"{int(remaining_seconds/60)}分钟后完成"
-            else:
-                eta_text = f"{int(remaining_seconds/3600)}小时{int((remaining_seconds%3600)/60)}分钟后完成"
-        else:
-            eta = "无任务"
-            eta_text = "无任务"
+        <div style="background: #fff; padding: 20px; border-radius: 8px; margin-bottom: 20px; box-shadow: 0 2px 6px rgba(0,0,0,0.05);">
+            <h2 style="margin: 0 0 15px; color: #333; font-size: 18px;">活跃任务</h2>
+            <table style="width: 100%; border-collapse: collapse;">
+                <thead>
+                    <tr style="background: #f2f2f2;">
+                        <th style="padding: 12px; text-align: left; border-bottom: 1px solid #ddd;">任务ID</th>
+                        <th style="padding: 12px; text-align: left; border-bottom: 1px solid #ddd;">状态</th>
+                        <th style="padding: 12px; text-align: left; border-bottom: 1px solid #ddd;">项目数</th>
+                        <th style="padding: 12px; text-align: left; border-bottom: 1px solid #ddd;">提交时间</th>
+                        <th style="padding: 12px; text-align: left; border-bottom: 1px solid #ddd;">预计完成</th>
+                    </tr>
+                </thead>
+                <tbody>
+    """
     
-    return current_tasks, progress, eta, eta_text
-
-# 创建Gradio界面
-with gr.Blocks(title="代码评估服务", theme=gr.themes.Soft(primary_hue="blue")) as demo:
-    gr.Markdown(
+    if status['active_tasks']:
+        for task in status['active_tasks']:
+            status_color = "#3498db" if task['status'] == "queued" else "#e74c3c"
+            html += f"""
+                    <tr>
+                        <td style="padding: 12px; border-bottom: 1px solid #eee;">{task['id']}</td>
+                        <td style="padding: 12px; border-bottom: 1px solid #eee;">
+                            <span style="padding: 4px 8px; border-radius: 4px; font-size: 12px; background: {status_color}; color: white;">
+                                {task['status']}
+                            </span>
+                        </td>
+                        <td style="padding: 12px; border-bottom: 1px solid #eee;">{task['items_count']}</td>
+                        <td style="padding: 12px; border-bottom: 1px solid #eee;">{task['submitted_at']}</td>
+                        <td style="padding: 12px; border-bottom: 1px solid #eee;">{task['estimated_completion']}</td>
+                    </tr>
+            """
+    else:
+        html += f"""
+                    <tr>
+                        <td colspan="5" style="padding: 15px; text-align: center; color: #777;">当前没有活跃任务</td>
+                    </tr>
         """
-        # 代码评估服务任务队列监控
         
-        实时监控系统中的任务队列状态和预计完成时间
-        """
-    )
+    html += """
+                </tbody>
+            </table>
+        </div>
+        
+        <div style="background: #fff; padding: 20px; border-radius: 8px; box-shadow: 0 2px 6px rgba(0,0,0,0.05);">
+            <h2 style="margin: 0 0 15px; color: #333; font-size: 18px;">最近完成的任务</h2>
+            <table style="width: 100%; border-collapse: collapse;">
+                <thead>
+                    <tr style="background: #f2f2f2;">
+                        <th style="padding: 12px; text-align: left; border-bottom: 1px solid #ddd;">任务ID</th>
+                        <th style="padding: 12px; text-align: left; border-bottom: 1px solid #ddd;">项目数</th>
+                        <th style="padding: 12px; text-align: left; border-bottom: 1px solid #ddd;">提交时间</th>
+                        <th style="padding: 12px; text-align: left; border-bottom: 1px solid #ddd;">完成时间</th>
+                        <th style="padding: 12px; text-align: left; border-bottom: 1px solid #ddd;">持续时间</th>
+                    </tr>
+                </thead>
+                <tbody>
+    """
     
-    with gr.Row():
-        with gr.Column(scale=2):
-            # 任务提交区域
-            with gr.Group():
-                gr.Markdown("### 提交新任务")
-                input_json = gr.JSON(label="输入数据（JSON格式列表）")
-                submit_btn = gr.Button("提交任务", variant="primary")
+    if status['recent_completed']:
+        for task in status['recent_completed']:
+            html += f"""
+                    <tr>
+                        <td style="padding: 12px; border-bottom: 1px solid #eee;">{task['id']}</td>
+                        <td style="padding: 12px; border-bottom: 1px solid #eee;">{task['items_count']}</td>
+                        <td style="padding: 12px; border-bottom: 1px solid #eee;">{task['submitted_at']}</td>
+                        <td style="padding: 12px; border-bottom: 1px solid #eee;">{task['completed_at']}</td>
+                        <td style="padding: 12px; border-bottom: 1px solid #eee;">{task['duration']}</td>
+                    </tr>
+            """
+    else:
+        html += f"""
+                    <tr>
+                        <td colspan="5" style="padding: 15px; text-align: center; color: #777;">暂无已完成任务</td>
+                    </tr>
+        """
         
-        with gr.Column(scale=3):
-            # 状态概览区域
-            with gr.Group():
-                gr.Markdown("### 队列状态概览")
-                with gr.Row():
-                    with gr.Column():
-                        total_tasks = gr.Textbox(label="总任务数", value="0")
-                    with gr.Column():
-                        completed = gr.Textbox(label="已完成任务", value="0")
-                    with gr.Column():
-                        remaining = gr.Textbox(label="剩余任务", value="0")
-                
-                progress_bar = gr.Slider(minimum=0, maximum=1, value=0, label="完成进度", interactive=False)
-                eta_display = gr.Textbox(label="预计完成时间", value="无任务")
+    html += """
+                </tbody>
+            </table>
+        </div>
+    </div>
+    """
     
-    # 任务列表区域
-    with gr.Group():
-        gr.Markdown("### 任务队列详情")
-        task_table = gr.Dataframe(
-            headers=["任务ID", "任务数量", "状态", "提交时间", "已完成/总数"],
-            datatype=["str", "number", "str", "str", "str"],
-            row_count=10,
-            col_count=(5, "fixed"),
-            interactive=False
-        )
+    return html
+
+def refresh_ui():
+    """定期刷新UI函数"""
+    return render_queue_status()
+
+def submit_json_data(json_data):
+    """提交JSON数据处理接口"""
+    try:
+        # 解析JSON字符串
+        if isinstance(json_data, str):
+            data = json.loads(json_data)
+        else:
+            data = json_data
+            
+        result = submit_task(data)
+        return json.dumps(result, ensure_ascii=False, indent=2)
+    except Exception as e:
+        return json.dumps({"status": "error", "message": str(e)}, ensure_ascii=False, indent=2)
+
+# 创建Gradio接���
+with gr.Blocks(title="代码评估服务", theme=gr.themes.Soft()) as demo:
+    gr.Markdown("""
+    # 代码评估服务
+    ### 支持多种编程语言的代码评估服务
+    """)
     
-    # 刷新按钮
-    refresh_btn = gr.Button("刷新状态", variant="secondary")
+    with gr.Tab("任务队列状态"):
+        status_html = gr.HTML(render_queue_status)
+        refresh_button = gr.Button("刷新状态")
+        refresh_button.click(fn=refresh_ui, outputs=status_html)
+        # 设置自动刷新 (5秒一次)
+        demo.load(fn=refresh_ui, outputs=status_html, every=5)
     
-    # 添加任务的处理函数
-    def handle_submit(input_data):
-        result = add_task(input_data)
-        return update_ui_status(), result["message"]
+    with gr.Tab("提交新任务"):
+        with gr.Row():
+            with gr.Column():
+                json_input = gr.Textbox(
+                    label="输入JSON数据",
+                    placeholder='[{"language": "python", "prompt": "def add(a, b):\\n", "processed_completions": ["    return a + b"], "tests": "assert add(1, 2) == 3"}]',
+                    lines=10
+                )
+                submit_button = gr.Button("提交任务")
+            
+            with gr.Column():
+                result_output = gr.Textbox(label="提交结果", lines=5)
+                
+        submit_button.click(fn=submit_json_data, inputs=json_input, outputs=result_output)
     
-    # 更新UI状态的函数
-    def update_ui_status():
-        tasks, progress, eta, eta_text = get_queue_status()
+    with gr.Tab("API文档"):
+        gr.Markdown("""
+        ## API 文档
         
-        # 准备表格数据
-        table_data = []
-        for task in tasks:
-            table_data.append([
-                str(task["id"]),
-                task["count"],
-                task["status"],
-                task["submit_time"],
-                f"{task['completed']}/{task['count']}"
-            ])
+        ### 1. 提交任务
         
-        return (
-            table_data,
-            str(total_tasks_count),
-            str(completed_tasks_count),
-            str(total_tasks_count - completed_tasks_count),
-            progress,
-            eta_text
-        )
-    
-    # 设置事件处理
-    submit_btn.click(
-        handle_submit,
-        inputs=[input_json],
-        outputs=[task_table, total_tasks, completed, remaining, progress_bar, eta_display, gr.Textbox(visible=False)]
-    )
-    
-    refresh_btn.click(
-        update_ui_status,
-        inputs=[],
-        outputs=[task_table, total_tasks, completed, remaining, progress_bar, eta_display]
-    )
-    
-    # 定时刷新UI
-    demo.load(update_ui_status, inputs=[], outputs=[task_table, total_tasks, completed, remaining, progress_bar, eta_display])
-    # 注释掉不兼容的every方法，改用JavaScript实现自动刷新
-    refresh_interval = gr.Number(value=3, visible=False)
-    demo.load(lambda: None, None, js="(()=>{setInterval(()=>{document.querySelector('#refresh-btn').click();}, 3000);return [];})")    
-    
-    # 添加evaluate函数作为API端点
-    demo.queue()
-    demo.add_api_route("/evaluate", evaluate, methods=["POST"])
+        **请求:**
+        
+        ```
+        POST /api/predict
+        Content-Type: application/json
+        
+        [
+            {
+                "language": "python",
+                "prompt": "def add(a, b):\\n",
+                "processed_completions": ["    return a + b"],
+                "tests": "assert add(1, 2) == 3"
+            }
+        ]
+        ```
+        
+        **响应:**
+        
+        ```json
+        {
+            "status": "success",
+            "task_id": "task_1"
+        }
+        ```
+        
+        ### 2. 查询任务状态
+        
+        **请求:**
+        
+        ```
+        GET /api/status
+        ```
+        
+        **响应:**
+        
+        ```json
+        {
+            "queued_tasks": 1,
+            "processing_tasks": 2,
+            "total_tasks": 3,
+            "total_items": 15,
+            "estimated_completion_time": "0:05:30",
+            "active_tasks": [...],
+            "recent_completed": [...]
+        }
+        ```
+        """)
 
 if __name__ == "__main__":
+    demo.queue()
     demo.launch()