Update app.py

app.py

@@ -10,6 +10,8 @@ from functools import wraps
 from filelock import FileLock
 from datasets import load_dataset, Audio
 from huggingface_hub import HfApi
+from multiprocessing import TimeoutError
+from concurrent.futures import ThreadPoolExecutor, TimeoutError as FutureTimeoutError
 
 dataset = load_dataset("intersteller2887/Turing-test-dataset", split="train")
 dataset = dataset.cast_column("audio", Audio(decode=False)) # Prevent calling 'torchcodec' from newer version of 'datasets'
@@ -376,44 +378,42 @@ def retry_with_timeout(max_retries=3, timeout=10, backoff=1):
             last_exception = None
             for attempt in range(max_retries):
                 try:
-                    import signal
-                    class TimeoutError(Exception):
-                        update_test_dimension_view
-
-                    def handle_timeout(signum, frame):
-                        raise TimeoutError("Operation timed out")
-
-                    signal.signal(signal.SIGALRM, handle_timeout)
-                    signal.alarm(timeout)
-
-                    try:
-                        result = func(*args, **kwargs)
-                        signal.alarm(0) # Cancel the clocker
-                        return result
-                    except TimeoutError:
-                        signal.alarm(0)
-                        raise
+                    with ThreadPoolExecutor(max_workers=1) as executor:
+                        future = executor.submit(func, *args, **kwargs)
+                        try:
+                            result = future.result(timeout=timeout)
+                            return result
+                        except FutureTimeoutError:
+                            future.cancel()
+                            raise TimeoutError(f"Operation timed out after {timeout} seconds")
                 except Exception as e:
                     last_exception = e
                     print(f"Attempt {attempt + 1} failed: {str(e)}")
                     if attempt < max_retries - 1:
                         time.sleep(backoff * (attempt + 1))
-                finally:
-                    signal.alarm(0) # Guarantee that the clocker will be canceled
-
+            
             print(f"All {max_retries} attempts failed")
             if last_exception:
                 raise last_exception
-            raise Exception("Unkown error occured")
+            raise Exception("Unknown error occurred")
         return wrapper
     return decorator
 
 def save_with_retry(all_results, user_data, count_data):
+    # 尝试上传到Hugging Face Hub
     try:
-        save_all_results_to_file(all_results, user_data, count_data)
-        return True
+        # 使用线程安全的保存方式
+        with ThreadPoolExecutor(max_workers=1) as executor:
+            future = executor.submit(save_all_results_to_file, all_results, user_data, count_data)
+            try:
+                future.result(timeout=30)  # 设置30秒超时
+                return True
+            except FutureTimeoutError:
+                future.cancel()
+                print("上传超时")
+                return False
     except Exception as e:
-        print(f"Fail to upload file to HuggingFace Dataset: {e}")
+        print(f"上传到Hub失败: {e}")
         return False
 
 def save_locally_with_retry(data, filename, max_retries=3):
@@ -423,7 +423,7 @@ def save_locally_with_retry(data, filename, max_retries=3):
                 json.dump(data, f, indent=4, ensure_ascii=False)
             return True
         except Exception as e:
-            print(f"Fail to save file to HugginigFace workspace: {e} for {attempt + 1} time")
+            print(f"本地保存尝试 {attempt + 1} 失败: {e}")
             if attempt < max_retries - 1:
                 time.sleep(1)
     return False
@@ -503,7 +503,7 @@ def update_count_with_retry(count_data, question_set, max_retries=3):
 
 def submit_question_and_advance(q_idx, d_idx, selections, final_choice, all_results, user_data):
     try:
-        # Data preperation
+        # 准备数据
         cleaned_selections = {}
         for dim_title, sub_scores in selections.items():
             cleaned_selections["final_choice"] = final_choice
@@ -525,6 +525,7 @@ def submit_question_and_advance(q_idx, d_idx, selections, final_choice, all_resu
             init_q_updates = init_test_question(user_data, q_idx)
             return init_q_updates + (all_results, gr.update(value=""))
         else:
+            # 准备完整结果数据
             result_str = "### 测试全部完成！\n\n你的提交结果概览：\n"
             for res in all_results:
                 result_str += f"##### 最终判断: **{res['selections'].get('final_choice', '未选择')}**\n"
@@ -535,13 +536,19 @@ def submit_question_and_advance(q_idx, d_idx, selections, final_choice, all_resu
                         result_str += f"  - *{sub_dim[:20]}...*: {score}/5\n"
             
             # 尝试上传（带重试）
-            success = save_with_retry(all_results, user_data, user_data.get("updated_count_data"))
+            try:
+                success = save_with_retry(all_results, user_data, user_data.get("updated_count_data"))
+            except Exception as e:
+                print(f"上传过程中发生错误: {e}")
+                success = False
             
             if not success:
+                # 上传失败，保存到本地
                 username = user_data.get("username", "anonymous")
                 timestamp = pd.Timestamp.now().strftime('%Y%m%d_%H%M%S')
                 local_filename = f"submission_{username}_{timestamp}.json"
- 
+                
+                # 准备数据包
                 user_info_clean = {
                     k: v for k, v in user_data.items() if k not in ["question_set", "updated_count_data"]
                 }
@@ -559,10 +566,14 @@ def submit_question_and_advance(q_idx, d_idx, selections, final_choice, all_resu
                     result_str += "\n\n❌ 上传失败且无法保存到本地文件，请联系管理员"
                 
                 # 更新count.json（剔除未完成的题目）
-                count_update_success = update_count_with_retry(
-                    user_data.get("updated_count_data", {}),
-                    user_data["question_set"]
-                )
+                try:
+                    count_update_success = update_count_with_retry(
+                        user_data.get("updated_count_data", {}),
+                        user_data["question_set"]
+                    )
+                except Exception as e:
+                    print(f"更新count.json失败: {e}")
+                    count_update_success = False
                 
                 if not count_update_success:
                     result_str += "\n\n⚠️ 无法更新题目计数，请联系管理员"
@@ -636,7 +647,6 @@ def submit_question_and_advance(q_idx, d_idx, selections, final_choice, all_resu
     except Exception as e:
         print(f"上传出错: {e}")"""
 
-@retry_with_timeout(max_retries=3, timeout=10)
 def save_all_results_to_file(all_results, user_data, count_data=None):
     repo_id = "intersteller2887/Turing-test-dataset"
     username = user_data.get("username", "user")
@@ -659,15 +669,14 @@ def save_all_results_to_file(all_results, user_data, count_data=None):
 
     api = HfApi()
 
-    # 上传提交文件
+    # 上传提交文件（不再使用装饰器，直接调用）
     api.upload_file(
         path_or_fileobj=bytes(json_string, "utf-8"),
         path_in_repo=f"submissions/{submission_filename}",
         repo_id=repo_id,
         repo_type="dataset",
         token=hf_token,
-        commit_message=f"Add new submission from {username}",
-        timeout=30
+        commit_message=f"Add new submission from {username}"
     )
 
     if count_data:
@@ -681,8 +690,7 @@ def save_all_results_to_file(all_results, user_data, count_data=None):
             repo_id=repo_id,
             repo_type="dataset",
             token=hf_token,
-            commit_message=f"Update count.json after submission by {username}",
-            timeout=30
+            commit_message=f"Update count.json after submission by {username}"
         )
 
 def toggle_reference_view(current):