REFINE 更新任务提交日志,动态记录服务商信息,并修正成功状态判断为布尔值
This commit is contained in:
parent
770562a569
commit
a3d113b8a8
|
|
@ -252,7 +252,7 @@ class ModalMidJourneyGenerateImage:
|
||||||
"STRING",
|
"STRING",
|
||||||
{"default": "一幅宏大壮美的山川画卷", "multiline": True},
|
{"default": "一幅宏大壮美的山川画卷", "multiline": True},
|
||||||
),
|
),
|
||||||
"provider": (["ttapi", "302ai"],),
|
"provider": (["ttapi", "302"],),
|
||||||
"endpoint": (
|
"endpoint": (
|
||||||
"STRING",
|
"STRING",
|
||||||
{
|
{
|
||||||
|
|
@ -291,12 +291,16 @@ class ModalMidJourneyGenerateImage:
|
||||||
files = None
|
files = None
|
||||||
|
|
||||||
interval = 3
|
interval = 3
|
||||||
logger.info("提交任务")
|
logger.info(f"提交任务, 服务商: {provider}")
|
||||||
logger.info(f"https://{endpoint}/api/custom/image/submit/task")
|
logger.info(f"https://{endpoint}/api/custom/image/submit/task")
|
||||||
job_resp = send_request(
|
job_resp = send_request(
|
||||||
"post",
|
"post",
|
||||||
f"https://{endpoint}/api/custom/image/submit/task",
|
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,
|
files=files,
|
||||||
timeout=timeout,
|
timeout=timeout,
|
||||||
)
|
)
|
||||||
|
|
@ -307,7 +311,9 @@ class ModalMidJourneyGenerateImage:
|
||||||
job_id = job_resp["data"]
|
job_id = job_resp["data"]
|
||||||
start_time = time()
|
start_time = time()
|
||||||
while start_time + timeout > time():
|
while start_time + timeout > time():
|
||||||
logger.info(f"已等待 {(int(time() - start_time))} 秒,{interval} 秒后查询...")
|
logger.info(
|
||||||
|
f"已等待 {(int(time() - start_time))} 秒,{interval} 秒后查询..."
|
||||||
|
)
|
||||||
sleep(interval)
|
sleep(interval)
|
||||||
logger.info(f"开始查询结果 {job_id}")
|
logger.info(f"开始查询结果 {job_id}")
|
||||||
resp = send_request(
|
resp = send_request(
|
||||||
|
|
@ -322,7 +328,8 @@ class ModalMidJourneyGenerateImage:
|
||||||
continue
|
continue
|
||||||
if resp.json()["status"] == "failed":
|
if resp.json()["status"] == "failed":
|
||||||
raise Exception(f"生成失败: {resp.json()['msg']}")
|
raise Exception(f"生成失败: {resp.json()['msg']}")
|
||||||
if resp.json()["status"] == "success":
|
if resp.json()["status"] == True:
|
||||||
|
# 注意,当任务成功时,status为布尔值True,而不是字符串
|
||||||
result_url = resp.json()["data"]
|
result_url = resp.json()["data"]
|
||||||
if not isinstance(result_url, list):
|
if not isinstance(result_url, list):
|
||||||
raise Exception("生成失败,返回结果为空")
|
raise Exception("生成失败,返回结果为空")
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue