From d84c96cfa38b1492db91b54d439733c7ea29737f Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Mon, 17 Apr 2023 22:26:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=87=E9=80=89=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E5=8C=BA+=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.py    |  2 +-
 toolbox.py | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/main.py b/main.py
index 9264f01..5baf655 100644
--- a/main.py
+++ b/main.py
@@ -143,7 +143,7 @@ def main():
             click_handle = functional[k]["Button"].click(fn=ArgsGeneralWrapper(predict), inputs=[*input_combo, gr.State(True), gr.State(k)], outputs=output_combo)
             cancel_handles.append(click_handle)
         # 文件上传区，接收文件后与chatbot的互动
-        file_upload.upload(on_file_uploaded, [file_upload, chatbot, txt], [chatbot, txt])
+        file_upload.upload(on_file_uploaded, [file_upload, chatbot, txt, txt2, checkboxes], [chatbot, txt, txt2])
         # 函数插件-固定按钮区
         for k in crazy_fns:
             if not crazy_fns[k].get("AsButton", True): continue
diff --git a/toolbox.py b/toolbox.py
index 42c7a85..3688a33 100644
--- a/toolbox.py
+++ b/toolbox.py
@@ -370,7 +370,7 @@ def find_recent_files(directory):
     return recent_files
 
 
-def on_file_uploaded(files, chatbot, txt):
+def on_file_uploaded(files, chatbot, txt, txt2, checkboxes):
     if len(files) == 0:
         return chatbot, txt
     import shutil
@@ -392,13 +392,18 @@ def on_file_uploaded(files, chatbot, txt):
                                    dest_dir=f'private_upload/{time_tag}/{file_origin_name}.extract')
     moved_files = [fp for fp in glob.glob(
         'private_upload/**/*', recursive=True)]
-    txt = f'private_upload/{time_tag}'
+    if "底部输入区" in checkboxes:
+        txt = ""
+        txt2 = f'private_upload/{time_tag}'
+    else:
+        txt = f'private_upload/{time_tag}'
+        txt2 = ""
     moved_files_str = '\t\n\n'.join(moved_files)
     chatbot.append(['我上传了文件，请查收',
                     f'[Local Message] 收到以下文件: \n\n{moved_files_str}' +
                     f'\n\n调用路径参数已自动修正到: \n\n{txt}' +
                     f'\n\n现在您点击任意实验功能时，以上文件将被作为输入参数'+err_msg])
-    return chatbot, txt
+    return chatbot, txt, txt2
 
 
 def on_report_generated(files, chatbot):