Update app.py

app.py

@@ -4,9 +4,9 @@ import mimetypes
 import json, os
 import asyncio
 import aiohttp
-
 import subprocess
 
+# pip 升級
 def upgrade_pip():
     try:
         subprocess.check_call([os.sys.executable, "-m", "pip", "install", "--upgrade", "pip"])
@@ -14,13 +14,11 @@ def upgrade_pip():
     except subprocess.CalledProcessError:
         print("pip 升級失敗")
 
-# 呼叫升級函數
 upgrade_pip()
 
 LLM_API = os.environ.get("LLM_API")
 LLM_URL = os.environ.get("LLM_URL")
-
-USER_ID = "HuggingFace Space"  # Placeholder user ID
+USER_ID = "HuggingFace Space"
 
 async def send_chat_message(LLM_URL, LLM_API, category, file_id):
     payload = {
@@ -37,18 +35,14 @@ async def send_chat_message(LLM_URL, LLM_API, category, file_id):
             }
         ]
     }
-    print("Sending chat message payload:", payload)  # Debug information
     async with aiohttp.ClientSession() as session:
         async with session.post(
             f"{LLM_URL}/chat-messages",
             headers={"Authorization": f"Bearer {LLM_API}"},
             json=payload
         ) as response:
-            print("Request URL:", f"{LLM_URL}/chat-messages")
-            print("Response status code:", response.status)
             if response.status == 404:
                 return "Error: Endpoint not found (404)"
-            
             last_thought = None
             async for line in response.content:
                 if line:
@@ -58,11 +52,7 @@ async def send_chat_message(LLM_URL, LLM_API, category, file_id):
                             last_thought = data.get("thought")
                     except (IndexError, json.JSONDecodeError):
                         continue
-            
-            if last_thought:
-                return last_thought.strip()
-            else:
-                return "Error: No thought found in the response"
+            return last_thought.strip() if last_thought else "Error: No thought found in the response"
 
 async def upload_file(LLM_URL, LLM_API, file_path, user_id):
     if not os.path.exists(file_path):
@@ -73,17 +63,14 @@ async def upload_file(LLM_URL, LLM_API, file_path, user_id):
             form_data = aiohttp.FormData()
             form_data.add_field('file', f, filename=file_path, content_type=mime_type)
             form_data.add_field('user', user_id)
-            
             async with session.post(
                 f"{LLM_URL}/files/upload",
                 headers={"Authorization": f"Bearer {LLM_API}"},
                 data=form_data
             ) as response:
-                print("Upload response status code:", response.status)  # Debug information
                 if response.status == 404:
                     return "Error: Endpoint not found (404)"
                 response_text = await response.text()
-                print("Raw upload response text:", response_text)  # Debug information
                 try:
                     return json.loads(response_text)
                 except json.JSONDecodeError:
@@ -91,21 +78,14 @@ async def upload_file(LLM_URL, LLM_API, file_path, user_id):
 
 async def handle_input(file_path, category):
     upload_response = await upload_file(LLM_URL, LLM_API, file_path, USER_ID)
-    print("Upload response:", upload_response)  # Debug information
-    if "error" in upload_response:
+    if isinstance(upload_response, str) and upload_response.startswith("Error"):
         return upload_response
-    file_id = upload_response.get("id")  # Extract file ID from the response
+    file_id = upload_response.get("id")
     if not file_id:
         return "Error: No file ID returned from upload"
-    
-    chat_response = await send_chat_message(LLM_URL, LLM_API, category, file_id)
-    print("Chat response:", chat_response)  # Debug information
-    return chat_response
-
-# Define Gradio interface
-file_input = gr.Image(label='圖片上傳', type='filepath')
-category = gr.Radio(label="Message Category", choices=["機票", "計程車乘車證明", "通行明細 (etag)", "QRCODE發票", "超商高鐵車票", "高鐵車票", "超商台鐵車票", "台鐵車票"])
+    return await send_chat_message(LLM_URL, LLM_API, category, file_id)
 
+# UI 元件 & 資料
 examples = [
     ['DEMO/boarding-pass.png', '機票'],    
     ['DEMO/taxi.jpg', '計程車乘車證明'],    
@@ -134,16 +114,29 @@ LINKS = """
 <a href='https://blog.twman.org/2023/07/wsl.html' target='_blank'>用PPOCRLabel來幫PaddleOCR做OCR的微調和標註</a><br>
 <a href='https://blog.twman.org/2023/07/HugIE.html' target='_blank'>基於機器閱讀理解和指令微調的統一信息抽取框架之診斷書醫囑資訊擷取分析</a><br>
 """
+
+# Gradio Blocks 寫法（全新修正）
 with gr.Blocks() as iface:
     gr.HTML(TITLE)
     gr.HTML(SUBTITLE)
     gr.HTML(LINKS)
-    gr.Interface(
-        fn=handle_input,
-        inputs=[file_input, category],
-        outputs="text",
+
+    with gr.Row():
+        file_input = gr.Image(label='圖片上傳', type='filepath')
+        category = gr.Radio(label="Message Category", choices=[
+            "機票", "計程車乘車證明", "通行明細 (etag)", "QRCODE發票",
+            "超商高鐵車票", "高鐵車票", "超商台鐵車票", "台鐵車票"
+        ])
+    
+    submit_btn = gr.Button("解析")
+    output_text = gr.Textbox(label="解析結果", lines=10)
+
+    submit_btn.click(fn=handle_input, inputs=[file_input, category], outputs=output_text)
+
+    gr.Examples(
         examples=examples,
-        allow_flagging="never"
+        inputs=[file_input, category],
+        label="範例圖片與類型"
     )
 
-iface.launch()
+iface.launch()