Update app.py

app.py

@@ -24,7 +24,7 @@ def print_log(task_id, filename, stage, status):
         print(f"任务{task_id}: {filename}, [{status}] {stage}")
 
 # 修改 start_process 函数，处理新增输入
-def start_process(input_file, input_url, input2, shape0_str, shape1_str, output_type=["TorchScript", "ONNX", "MNN", "ONNX"], input_suffix=".pth"):
+def start_process(input_file, input_url, input2, shape0_str, shape1_str, output_type, input_suffix=".pth"):
     global task_counter
     task_counter += 1
     task_id = task_counter
@@ -216,7 +216,7 @@ def start_process(input_file, input_url, input2, shape0_str, shape1_str, output_
         yield [], log
 
 
-        width_ratio = 4
+        width_ratio = 0
         if os.path.exists(pt_path):
             print_log(task_id, input2, "转换为TorchScript模型", "跳过")
             log += "跳过转换为TorchScript模型\n"
@@ -240,7 +240,7 @@ def start_process(input_file, input_url, input2, shape0_str, shape1_str, output_
 
         # 转换为 ONNX 模型
         if "ONNX" in output_type or "NCNN" in output_type or "MNN" in output_type:
-            if str(width_ratio) in input2:
+            if str(width_ratio) in input2 or width_ratio >0:
                 onnx_path = output_base + ".onnx"
             else:
                 onnx_path = output_base + "-x" + str(width_ratio) + ".onnx"
@@ -393,7 +393,7 @@ with gr.Blocks() as demo:
                 input2 = gr.Textbox(label="自定义文件名")
                 output_type = gr.Dropdown(
                     choices=["TorchScript", "ONNX", "Fixed", "MNN", "NCNN"],
-                    value=["TorchScript", "ONNX", "MNN", "ONNX"],
+                    value=["TorchScript", "ONNX", "MNN", "NCNN"],
                     multiselect=True,
                     label="模型类型",
                     info="1. 生成mnn和ncnn模型必须先生成onnx模型；2.如果选项中包含了Fixed，那么输出的onnx和mnn模型都使用固定shape的input。"
@@ -425,14 +425,14 @@ with gr.Blocks() as demo:
 
     # 添加范例
     examples = [
-        [None, "https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.5.0/realesr-general-x4v3.pth", "", "1,3,128,128", "0,0,0,0"],
-        [None, "https://github.com/Phhofm/models/releases/download/4xNomos8kSC/4xNomos8kSC.pth", "", "1,3,128,128", "0,0,0,0"],
-        [None, "https://github.com/Phhofm/models/releases/download/1xDeJPG/1xDeJPG_SRFormer_light.pth", "", "1,3,128,128", "0,0,0,0"],
-        [None, "https://objectstorage.us-phoenix-1.oraclecloud.com/n/ax6ygfvpvzka/b/open-modeldb-files/o/4x-WTP-ColorDS.pth", "", "1,3,128,128", "0,0,0,0"],
+        [None, "https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.5.0/realesr-general-x4v3.pth", "", "1,3,128,128", "0,0,0,0", ["TorchScript", "ONNX", "MNN", "ONNX"]],
+        [None, "https://github.com/Phhofm/models/releases/download/4xNomos8kSC/4xNomos8kSC.pth", "", "1,3,128,128", "0,0,0,0", ["TorchScript", "ONNX", "MNN", "ONNX"]],
+        [None, "https://github.com/Phhofm/models/releases/download/1xDeJPG/1xDeJPG_SRFormer_light.pth", "", "1,3,128,128", "0,0,0,0", ["TorchScript", "ONNX", "MNN", "ONNX"]],
+        [None, "https://objectstorage.us-phoenix-1.oraclecloud.com/n/ax6ygfvpvzka/b/open-modeldb-files/o/4x-WTP-ColorDS.pth", "", "1,3,128,128", "0,0,0,0", ["ONNX", "MNN"]],
     ]
     gr.Examples(
         examples=examples,
-        inputs=[input1_file, input1, input2, shape0_str, shape1_str],
+        inputs=[input1_file, input1, input2, shape0_str, shape1_str, output_type],
         outputs=[output, log_textbox],
         fn=start_process
     )