From a3d113b8a88f1d154c1d3b8c1315cffdfb90e871 Mon Sep 17 00:00:00 2001 From: iHeyTang Date: Tue, 12 Aug 2025 16:17:53 +0800 Subject: [PATCH] =?UTF-8?q?REFINE=20=E6=9B=B4=E6=96=B0=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=97=A5=E5=BF=97=EF=BC=8C=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=9C=8D=E5=8A=A1=E5=95=86=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E4=BF=AE=E6=AD=A3=E6=88=90=E5=8A=9F=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=88=A4=E6=96=AD=E4=B8=BA=E5=B8=83=E5=B0=94=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nodes/image_modal_nodes.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/nodes/image_modal_nodes.py b/nodes/image_modal_nodes.py index 03742fd..cdd7355 100644 --- a/nodes/image_modal_nodes.py +++ b/nodes/image_modal_nodes.py @@ -252,7 +252,7 @@ class ModalMidJourneyGenerateImage: "STRING", {"default": "一幅宏大壮美的山川画卷", "multiline": True}, ), - "provider": (["ttapi", "302ai"],), + "provider": (["ttapi", "302"],), "endpoint": ( "STRING", { @@ -291,12 +291,16 @@ class ModalMidJourneyGenerateImage: files = None interval = 3 - logger.info("提交任务") + logger.info(f"提交任务, 服务商: {provider}") logger.info(f"https://{endpoint}/api/custom/image/submit/task") job_resp = send_request( "post", f"https://{endpoint}/api/custom/image/submit/task", - data={"model_name": "302/mj", "prompt": prompt, "mode": "turbo"}, + data={ + "model_name": f"{provider}/mj", + "prompt": prompt, + "mode": "turbo", + }, files=files, timeout=timeout, ) @@ -307,7 +311,9 @@ class ModalMidJourneyGenerateImage: job_id = job_resp["data"] start_time = time() while start_time + timeout > time(): - logger.info(f"已等待 {(int(time() - start_time))} 秒,{interval} 秒后查询...") + logger.info( + f"已等待 {(int(time() - start_time))} 秒,{interval} 秒后查询..." + ) sleep(interval) logger.info(f"开始查询结果 {job_id}") resp = send_request( @@ -322,7 +328,8 @@ class ModalMidJourneyGenerateImage: continue if resp.json()["status"] == "failed": raise Exception(f"生成失败: {resp.json()['msg']}") - if resp.json()["status"] == "success": + if resp.json()["status"] == True: + # 注意,当任务成功时,status为布尔值True,而不是字符串 result_url = resp.json()["data"] if not isinstance(result_url, list): raise Exception("生成失败,返回结果为空")