Update app.py

app.py

@@ -43,6 +43,20 @@ def calculate(course_input, course_profile, course_hour):
     except requests.exceptions.RequestException as e:
         return f"請求失敗: {str(e)}", "無職能項目", "無職能項目"
 
+# 驗證輸入欄位是否為空
+def validate_input(course_input, course_profile, course_hour):
+    errors = []
+    if not course_input.strip():
+        errors.append("課程名稱為必填項目")
+    if not course_profile.strip():
+        errors.append("課程簡介為必填項目")
+    if not course_hour.strip():
+        errors.append("課程時數為必填項目")
+
+    if errors:
+        return "\n".join(errors), "", ""  # 直接回傳錯誤訊息，阻止請求
+    return None  # 表示輸入有效，允許繼續執行
+
 def setup_gradio_interface():
     with gr.Blocks() as demo:
         with gr.Row():
@@ -53,28 +67,27 @@ def setup_gradio_interface():
         with gr.Row():
             submit_button = gr.Button("計算職能項目")
         with gr.Row():
-            txt_response = gr.Textbox(label="計算狀態", placeholder="計算結果")
-            course_competencies = gr.Textbox(label="職能項目", placeholder="職能項目")
+            txt_response = gr.Textbox(label="計算狀態", placeholder="計算結果", interactive=False)
+            course_competencies = gr.Textbox(label="職能項目", placeholder="職能項目", interactive=False)
         with gr.Row():
-            json_competencies = gr.Textbox(label="JSON內容", placeholder="職能項目")
-        # 修正 inputs 和 outputs
+            json_competencies = gr.Textbox(label="JSON內容", placeholder="職能項目", interactive=False)
+
+        # 先驗證輸入，再進行計算
+        def validate_and_calculate(course_input, course_profile, course_hour):
+            validation_result = validate_input(course_input, course_profile, course_hour)
+            if validation_result:
+                return validation_result  # 若輸入無效，回傳錯誤訊息
+            return calculate(course_input, course_profile, course_hour)  # 若有效則繼續計算
+
         submit_button.click(
-            calculate,
+            validate_and_calculate,
             inputs=[course_input, course_profile, course_hour],
             outputs=[txt_response, course_competencies, json_competencies]
         )
 
     return demo
 
-try:
-    import gradio as gr
-except ImportError:
-    import sys
-    import gradio as gr
-
-# Run the interface
+# 運行 Gradio 介面
 if __name__ == "__main__":
     demo = setup_gradio_interface()
-    #port = int(os.environ.get("PORT", 7860))
     demo.launch()
-    #demo.launch(server_name="0.0.0.0", server_port=port)