Update app.py

app.py

@@ -20,7 +20,7 @@ task_counter = 0
 # 新增日志函数
 def print_log(task_id, filename, stage, status):
     if log_to_terminal:
-        print(f"任务 ID: {task_id}, 文件名: {filename}, 状态: [{status}], 阶段: {stage}")
+        print(f"任务{task_id}: {filename}, [{status}] {stage}")
 
 # 修改 start_process 函数，处理新增输入
 def start_process(input1, input2, shape0_str, shape1_str, input_suffix=".pth"):
@@ -57,7 +57,7 @@ def start_process(input1, input2, shape0_str, shape1_str, input_suffix=".pth"):
                 log += f"开始下载文件…\n"
                 yield [], log
                 # 生成唯一文件名
-                file_name = str(uuid.uuid4()) + input_suffix
+                file_name = str(task_id) + input_suffix
                 file_path = os.path.join(os.getcwd(), file_name)
                 if url.startswith('ftp://'):
                     try:
@@ -199,7 +199,7 @@ def start_process(input1, input2, shape0_str, shape1_str, input_suffix=".pth"):
                 if output == '' and process.poll() is not None:
                     break
                 if output:
-                    log += output.strip() + '\n'
+                    # log += output.strip() + '\n'
                     if log_to_terminal:
                         print(output.strip())
             returncode = process.poll()
@@ -215,8 +215,8 @@ def start_process(input1, input2, shape0_str, shape1_str, input_suffix=".pth"):
         print_log(task_id, input2, "执行命令", "完成")
         yield output_files, log
     except Exception as e:
-        log += f"发生错误: {str(e)}\n"
-        print_log(task_id, input2,str(e) , f"失败")
+        log += f"发生错误: {e}\n"
+        print_log(task_id, input2, e , f"失败")
         yield [], log
 
 # 创建 Gradio 界面
@@ -232,17 +232,27 @@ with gr.Blocks() as demo:
             # 修改为字符串输入控件
             shape0_str = gr.Textbox(label="shape0 (逗号分隔的整数)", value="1,3,128,128")
             shape1_str = gr.Textbox(label="shape1 (逗号分隔的整数)", value="0,0,0,0")
-            start_button = gr.Button("开始")
+            with gr.Row():
+                start_button = gr.Button("开始")
+                # 添加取消按钮
+                cancel_button = gr.Button("取消")
         # 右侧列，包含输出组件和日志文本框
         with gr.Column():
             output = gr.File(label="输出文件", file_count="multiple")
             log_textbox = gr.Textbox(label="日志", lines=10, interactive=False)
 
     # 绑定事件，修改输入参数
-    start_button.click(
+    process = start_button.click(
         fn=start_process,
         inputs=[input1_file if input1_file.value else input1, input2, shape0_str, shape1_str],
         outputs=[output, log_textbox]
     )
+    # 为取消按钮添加点击事件绑定，使用 cancels 属性取消 start_process 任务
+    cancel_button.click(
+        fn=None,
+        inputs=None,
+        outputs=None,
+        cancels=[process]
+    )
 
 demo.launch()