Update app.py

app.py

@@ -11,99 +11,90 @@ CREATE_TASK_URL = "https://www.runninghub.cn/task/openapi/create"
 GET_TASK_INFO_URL = "https://www.runninghub.cn/task/openapi/getTaskInfo"
 HEADERS = {"Host": "www.runninghub.cn"}
 
-# 你的工作流中需要修改的節點ID
+# 工作流節點 ID
 LOAD_IMAGE_NODE_ID = "141"
 POSITIVE_PROMPT_NODE_ID = "144"
 SEED_NODE_ID = "132"
 
-# --- 核心邏輯函式 ---
-def process_image_with_runninghub(uploaded_image, positive_prompt, seed):
-    """
-    處理上傳圖片，調用 RunningHub API 進行圖像生成。
-    """
-    if uploaded_image is None:
-        return "請先上傳一張圖片！", None
+# --- 核心函式 ---
+def process_image_workflow(image_path, positive_prompt, seed=-1):
+    if image_path is None:
+        return "請先上傳圖片！", None
 
-    # 步驟 1: 上傳圖片到 RunningHub
+    # --- 步驟 1: 上傳圖片 ---
     yield "正在上傳圖片...", None
     try:
-        # 準備 multipart/form-data 的數據
-        files = {'file': open(uploaded_image, 'rb')}
-        data = {'apiKey': API_KEY}
+        with open(image_path, "rb") as f:
+            files = {"file": f}
+            data = {"apiKey": API_KEY, "fileType": "image"}
+            upload_response = requests.post(UPLOAD_URL, headers=HEADERS, data=data, files=files)
+            upload_response.raise_for_status()
+            upload_data = upload_response.json()
+            print("上傳回傳:", upload_data)
 
-        # requests 函式庫會自動處理正確的 content-type
-        upload_response = requests.post(UPLOAD_URL, data=data, files=files)
-        upload_response.raise_for_status()
-        upload_data = upload_response.json()
+            if upload_data.get("code") != 0:
+                return f"圖片上傳失敗！訊息: {upload_data.get('msg')}", None
 
-        # 除錯：印出上傳 API 的回傳內容
-        print(f"上傳 API 回傳: {upload_data}")
-
-        if upload_data.get("code") != 0:
-            return f"圖片上傳失敗！訊息: {upload_data.get('msg')}", None
-
-        # 從回傳結果中取得檔案名稱
-        rh_image_path = upload_data["data"]["fileName"]
-        yield f"圖片上傳成功！路徑: {rh_image_path}", None
+            rh_image_path = upload_data["data"]["fileName"]
+            yield f"圖片上傳成功！fileName: {rh_image_path}", None
 
     except requests.exceptions.RequestException as e:
         return f"上傳連線錯誤: {e}", None
 
-    # 步驟 2: 建立 ComfyUI 任務
-    yield "正在建立算圖任務...", None
-
+    # --- 步驟 2: 建立工作流任務 ---
+    yield "正在建立任務...", None
     node_info_list = [
         {"nodeId": LOAD_IMAGE_NODE_ID, "fieldName": "image", "fieldValue": rh_image_path},
         {"nodeId": POSITIVE_PROMPT_NODE_ID, "fieldName": "ShowText_0", "fieldValue": positive_prompt},
         {"nodeId": SEED_NODE_ID, "fieldName": "seed", "fieldValue": seed}
     ]
-
-    payload = {
-        "apiKey": API_KEY,
-        "workflowId": WORKFLOW_ID,
-        "nodeInfoList": node_info_list
-    }
-
-    headers = {'Content-Type': 'application/json'}
+    payload = {"apiKey": API_KEY, "workflowId": WORKFLOW_ID, "nodeInfoList": node_info_list}
 
     try:
-        create_response = requests.post(CREATE_TASK_URL, headers=headers, data=json.dumps(payload))
+        create_response = requests.post(CREATE_TASK_URL, headers={"Content-Type": "application/json"}, data=json.dumps(payload))
         create_response.raise_for_status()
         create_data = create_response.json()
+        print("建立任務回傳:", create_data)
 
         if create_data.get("code") != 0:
-            return f"任務建立失敗！錯誤碼: {create_data.get('code')}, 訊息: {create_data.get('msg')}", None
+            return f"任務建立失敗！訊息: {create_data.get('msg')}", None
 
         task_id = create_data["data"]["taskId"]
-        yield f"任務已建立！任務ID: {task_id}", None
+        yield f"任務建立成功！TaskID: {task_id}", None
 
     except requests.exceptions.RequestException as e:
         return f"任務建立連線錯誤: {e}", None
 
-    # 步驟 3: 輪詢任務狀態
+    # --- 步驟 3: 輪詢任務狀態 ---
     max_retries = 30
     retry_interval = 5
-
     for i in range(max_retries):
-        yield f"正在查詢任務狀態... (第 {i+1} 次)", None
+        yield f"查詢任務狀態... (第 {i+1} 次)", None
         time.sleep(retry_interval)
-
-        status_payload = {"apiKey": API_KEY, "taskId": task_id}
-
         try:
-            status_response = requests.post(GET_TASK_INFO_URL, headers=headers, data=json.dumps(status_payload))
+            status_payload = {"apiKey": API_KEY, "taskId": task_id}
+            status_response = requests.post(GET_TASK_INFO_URL, headers={"Content-Type": "application/json"}, data=json.dumps(status_payload))
             status_response.raise_for_status()
             status_data = status_response.json()
+            print("查詢回傳:", status_data)
 
-            current_status = status_data["data"]["taskStatus"]
+            # ��呆檢查
+            if status_data.get("code") != 0:
+                yield f"查詢任務失敗！訊息: {status_data.get('msg')}", None
+                return f"查詢任務失敗！訊息: {status_data.get('msg')}", None
 
-            if current_status == "SUCCESS":
-                image_url = status_data["data"]["imageInfoList"][0]["fileUrl"]
-                yield f"任務完成！", image_url
-                return f"任務完成！", image_url
+            data = status_data.get("data")
+            if not data:
+                yield "查詢回傳 data 為空，請稍後重試。", None
+                return "查詢回傳 data 為空，請稍後重試。", None
 
+            current_status = data.get("taskStatus")
+            if current_status == "SUCCESS":
+                image_url = data["imageInfoList"][0]["fileUrl"]
+                yield "任務完成！", image_url
+                return "任務完成！", image_url
             elif current_status == "FAILED":
-                error_msg = status_data.get("data", {}).get("errorMsg", "Unknown error")
+                error_msg = data.get("errorMsg", "Unknown error")
                 yield f"任務失敗！錯誤訊息: {error_msg}", None
                 return f"任務失敗！錯誤訊息: {error_msg}", None
 
@@ -111,36 +102,29 @@ def process_image_with_runninghub(uploaded_image, positive_prompt, seed):
             yield f"查詢連線錯誤: {e}", None
             return f"查詢連線錯誤: {e}", None
 
-    yield "查詢任務超時，請稍後使用任務ID手動查詢。", None
-    return "查詢任務超時，請稍後使用任務ID手動查詢。", None
+    yield "任務查詢超時，請使用 TaskID 手動查詢。", None
+    return "任務查詢超時，請使用 TaskID 手動查詢。", None
 
-# --- Gradio 介面設定 ---
-with gr.Blocks(theme=gr.themes.Soft()) as demo:
-    gr.Markdown("# RunningHub - 圖像處理工作流")
-    gr.Markdown("上傳一張圖片，輸入提示詞和種子值，然後啟動遠端圖像處理任務。")
+# --- Gradio 介面 ---
+with gr.Blocks() as demo:
+    gr.Markdown("# RunningHub 工作流圖生圖")
+    gr.Markdown("上傳圖片，輸入正向提示詞與種子值，啟動遠端工作流任務。")
 
     with gr.Row():
         with gr.Column():
-            with gr.Row():
-                image_input = gr.Image(type="filepath", label="上傳圖片")
-
-            with gr.Column():
-                prompt_input = gr.Textbox(lines=3, label="正向提示詞 (Positive Prompt)", placeholder="輸入你想要生成的內容...")
-                seed_input = gr.Number(label="種子值 (Seed)", value=-1, precision=0)
-
-            process_button = gr.Button("開始處理圖像", variant="primary")
-
+            image_input = gr.Image(type="filepath", label="上傳圖片")
+            prompt_input = gr.Textbox(lines=3, label="正向提示詞 (Positive Prompt)", placeholder="輸入你想生成的內容...")
+            seed_input = gr.Number(label="種子值 (Seed)", value=-1, precision=0)
+            process_button = gr.Button("開始處理圖像")
         with gr.Column():
-            with gr.Row():
-                image_output = gr.Image(label="生成的圖像")
-            with gr.Row():
-                status_output = gr.Textbox(label="任務狀態", interactive=False)
+            status_output = gr.Textbox(label="任務狀態", interactive=False)
+            image_output = gr.Image(label="生成圖片")
 
     process_button.click(
-        fn=process_image_with_runninghub,
+        fn=process_image_workflow,
         inputs=[image_input, prompt_input, seed_input],
         outputs=[status_output, image_output]
     )
 
 if __name__ == "__main__":
-    demo.launch()
+    demo.launch()