Update app.py

app.py

@@ -20,7 +20,7 @@ LLM_API = os.environ.get("LLM_API", "").strip()
 LLM_URL = os.environ.get("LLM_URL")
 USER_ID = "HuggingFace Space"
 
-async def send_chat_message(LLM_URL, LLM_API, category, file_id):
+async def send_chat_message(LLM_URL, LLM_API, category, file_url):
     payload = {
         "inputs": {},
         "query": category,
@@ -29,32 +29,62 @@ async def send_chat_message(LLM_URL, LLM_API, category, file_id):
         "files": [
             {
                 "type": "image",
-                "transfer_method": "local_file",
-                "upload_file_id": file_id
+                "transfer_method": "remote_url",
+                "url": file_url
             }
         ]
     }
 
-    try:
-        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:
-
-                if response.status != 200:
-                    error_text = await response.text()
-                    return f"Error: Server returned status {response.status} - {error_text}"
-
-                try:
-                    data = await response.json()
-                    return data.get("thought", "Error: No thought in response")
-                except Exception as e:
-                    return f"Error: Failed to parse JSON - {e}"
-
-    except Exception as e:
-        return f"Error: Unexpected exception - {e}"
+    async with aiohttp.ClientSession() as session:
+        async with session.post(
+            f"{LLM_URL}/chat-messages",
+            headers={
+                "Authorization": f"Bearer {LLM_API}",
+                "Content-Type": "application/json"
+            },
+            json=payload
+        ) as response:
+            if response.status != 200:
+                error_text = await response.text()
+                return f"Error: Server returned status {response.status} - {error_text}"
+            data = await response.json()
+            return data.get("answer") or data.get("thought") or "No answer returned"
+            
+# async def send_chat_message(LLM_URL, LLM_API, category, file_id):
+#     payload = {
+#         "inputs": {},
+#         "query": category,
+#         "conversation_id": "",
+#         "user": USER_ID,
+#         "files": [
+#             {
+#                 "type": "image",
+#                 "transfer_method": "remote_url",
+#                 "upload_file_id": file_id
+#             }
+#         ]
+#     }
+
+#     try:
+#         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:
+
+#                 if response.status != 200:
+#                     error_text = await response.text()
+#                     return f"Error: Server returned status {response.status} - {error_text}"
+
+#                 try:
+#                     data = await response.json()
+#                     return data.get("thought", "Error: No thought in response")
+#                 except Exception as e:
+#                     return f"Error: Failed to parse JSON - {e}"
+
+#     except Exception as e:
+#         return f"Error: Unexpected exception - {e}"
 
 async def upload_file(LLM_URL, LLM_API, file_path, user_id):
     if not os.path.exists(file_path):
@@ -87,17 +117,25 @@ async def upload_file(LLM_URL, LLM_API, file_path, user_id):
                     return "Error: Invalid JSON response"
 
 async def handle_input(file_path, category):
-    # 如果 tmp 路徑不存在，改成 repo 內的 DEMO 路徑
-    if not os.path.exists(file_path):
-        file_path = os.path.join("DEMO", os.path.basename(file_path))
+    # 取得檔名
+    filename = os.path.basename(file_path)
+
+    # 直接用 HuggingFace repo URL
+    file_url = f"https://huggingface.co/spaces/DeepLearning101/Multimodal-Playground/blob/main/DEMO/{filename}?raw=true"
+
+    return await send_chat_message(LLM_URL, LLM_API, category, file_url)
+# async def handle_input(file_path, category):
+#     # 如果 tmp 路徑不存在，改成 repo 內的 DEMO 路徑
+#     if not os.path.exists(file_path):
+#         file_path = os.path.join("DEMO", os.path.basename(file_path))
     
-    upload_response = await upload_file(LLM_URL, LLM_API, file_path, USER_ID)
-    if isinstance(upload_response, str) and upload_response.startswith("Error"):
-        return upload_response
-    file_id = upload_response.get("id")
-    if not file_id:
-        return "Error: No file ID returned from upload"
-    return await send_chat_message(LLM_URL, LLM_API, category, file_id)
+#     upload_response = await upload_file(LLM_URL, LLM_API, file_path, USER_ID)
+#     if isinstance(upload_response, str) and upload_response.startswith("Error"):
+#         return upload_response
+#     file_id = upload_response.get("id")
+#     if not file_id:
+#         return "Error: No file ID returned from upload"
+#     return await send_chat_message(LLM_URL, LLM_API, category, file_id)
 
 # UI 元件 & 資料
 examples = [