update app.py

app.py

@@ -62,17 +62,21 @@ def handle_submission(zip_file, dataset_choice):
     shutil.rmtree(SUBMIT_DIR, ignore_errors=True)
     os.makedirs(SUBMIT_DIR, exist_ok=True)
 
-    with zipfile.ZipFile(zip_file.name, "r") as zip_ref:
-        # print(f"正在解压缩 {zip_file.name} 到 {SUBMIT_DIR}...")
-        print(f"Extracting {zip_file.name} to {SUBMIT_DIR}...")
+    # 解压操作
+    with zipfile.ZipFile(zip_file, "r") as zip_ref:
+        print(f"Extracting {zip_file} to {SUBMIT_DIR}...")
         zip_ref.extractall(SUBMIT_DIR)
 
+    # 获取当前时间戳
     timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
     print(f"Submission dir: {SUBMIT_DIR}")
-    print(os.path.splitext(zip_file.name))
-    unzipped_dir = os.path.join(
-        SUBMIT_DIR, os.path.basename(zip_file.name).replace(".zip", "")
-    )
+
+    # 如果 SUBMIT_DIR 下只有一个子目录，就使用这个子目录，否则使用 SUBMIT_DIR 本身
+    subdirs = [d for d in os.listdir(SUBMIT_DIR) if os.path.isdir(os.path.join(SUBMIT_DIR, d))]
+    if len(subdirs) == 1:
+        unzipped_dir = os.path.join(SUBMIT_DIR, subdirs[0])
+    else:
+        unzipped_dir = SUBMIT_DIR  # 没有子目录或有多个子目录时使用 SUBMIT_DIR
     print(f"Unzipped directory: {unzipped_dir}")
     output_path = os.path.join(OUTPUT_DIR, f"result_main_{timestamp}.json")
     args = Arguments(splits=dataset_choice, result_dir=unzipped_dir)
@@ -138,18 +142,6 @@ with gr.Blocks() as demo:
     # submit_btn = gr.Button("开始测评")
     submit_btn = gr.Button("Start Evaluation")
 
-    
-    # 添加三个进度条
-    # schema_progress = gr.Slider(
-    #     label="Schema 阶段进度", minimum=0, maximum=100, value=0, interactive=False
-    # )
-    # commonsense_progress = gr.Slider(
-    #     label="Commonsense 阶段进度", minimum=0, maximum=100, value=0, interactive=False
-    # )
-    # logic_progress = gr.Slider(
-    #     label="Logic 阶段进度", minimum=0, maximum=100, value=0, interactive=False
-    # )
-
     schema_progress = gr.Slider(
         label="Schema Stage Progress", minimum=0, maximum=100, value=0, interactive=False
     )