sync

app.py

@@ -3,13 +3,10 @@ import asyncio
 import os
 import json
 import urllib.request
-from openai import AsyncOpenAI
+from openai import AsyncOpenAI, OpenAI
 
 # 第一个功能：检查YouTube视频是否具有Creative Commons许可证
 
-# 请确保在环境变量中设置了您的YouTube Data API密钥
-API_KEY = "AIzaSyDyPpkFRUpUuSMQbhxwTFxCBLK5qTHU-ms"
-
 def get_youtube_id(youtube_url):
     if 'youtube.com' in youtube_url:
         video_id = youtube_url.split('v=')[-1]
@@ -55,17 +52,17 @@ def check_cc_license(youtube_url):
 from utils.generate_distractors import prepare_q_inputs, construct_prompt_textonly, generate_distractors
 from utils.api_utils import generate_from_openai_chat_completion
 
-async def generate_distractors_async(model_name: str, 
-                                     queries: list,
-                                     n: int=1,
-                                     max_tokens: int=4096):
+def generate_distractors_sync(model_name: str, 
+                              queries: list,
+                              n: int=1,
+                              max_tokens: int=4096):
     assert model_name in ["gpt-4o-mini", "gpt-4-turbo", "gpt-4o", "gpt-4o-2024-08-06"], "Invalid model name"
 
-    client = AsyncOpenAI(api_key=os.environ.get("OPENAI_API_KEY"), base_url="https://yanlp.zeabur.app/v1")
+    client = OpenAI(api_key=os.environ.get("OPENAI_API_KEY"), base_url="https://yanlp.zeabur.app/v1")
     messages = prepare_q_inputs(queries)
 
-    # 直接等待协程而不是使用asyncio.run()
-    responses = await generate_from_openai_chat_completion(
+    # 同步调用，不使用异步函数
+    responses = generate_from_openai_chat_completion(
         client,
         messages=messages, 
         engine_name=model_name,
@@ -90,8 +87,8 @@ async def generate_distractors_async(model_name: str,
 
     return queries
 
-# 定义异步处理函数
-async def generate_distractors_gradio(question, option1, option2, option3, option4, answer, answer_analysis):
+# 处理生成干扰项的同步版本
+def generate_distractors_gradio(question, option1, option2, option3, option4, answer, answer_analysis):
     is_valid, message = validate_inputs(question, option1, option2, option3, option4, answer, answer_analysis)
     if not is_valid:
         return {"error": message}, ""  # Output error message
@@ -106,17 +103,16 @@ async def generate_distractors_gradio(question, option1, option2, option3, optio
         'answer_analysis': answer_analysis
     }
 
-    queries = [query]  # 因为函数期望的是一个列表
+    queries = [query]
 
-    # 调用异步生成干扰项的函数
-    results = await generate_distractors_async(
+    # 调用同步生成干扰项的函数
+    results = generate_distractors_sync(
         model_name="gpt-4o",
         queries=queries,
         n=1,
         max_tokens=4096
     )
 
-    # 提取结果
     result = results[0]
     new_options = {
         'E': result.get('option_5', ''),
@@ -126,7 +122,6 @@ async def generate_distractors_gradio(question, option1, option2, option3, optio
     new_option_str = f"E: {new_options['E']}\nF:{new_options['F']}\nG:{new_options['G']}"
     distractor_analysis = result.get('distractor_analysis', '')
 
-    # 返回新的干扰项和分析
     return new_option_str, distractor_analysis
 
 def validate_inputs(question, option1, option2, option3, option4,  answer, analysis):