diff --git a/__init__.py b/__init__.py index 8c65a6e..dd65599 100644 --- a/__init__.py +++ b/__init__.py @@ -85,9 +85,9 @@ NODE_DISPLAY_NAME_MAPPINGS = { "Jinja2RenderTemplate": "Jinja2格式Prompt模板渲染", "JMGestureCorrect": "人物侧身图片转为正面图-即梦", "ModalClothesMask": "模特指定衣服替换为指定颜色", - "ModalEditCustom": "Prompt生/修图", - "ModalMidJourneyGenerateImage": "Prompt生/修图", - "ModalMidJourneyDescribeImage": "反推生图提示词", + "ModalEditCustom": "Prompt生/修图-Gemini", + "ModalMidJourneyGenerateImage": "Prompt生/修图-MJ", + "ModalMidJourneyDescribeImage": "反推生图提示词-MJ", "JMCustom": "Prompt生视频", "VideoMerge":"顺序合并视频" } diff --git a/nodes/image_modal_nodes.py b/nodes/image_modal_nodes.py index 7aa34ad..ade2efb 100644 --- a/nodes/image_modal_nodes.py +++ b/nodes/image_modal_nodes.py @@ -1,5 +1,6 @@ import io import json +import traceback from time import sleep import folder_paths @@ -241,8 +242,8 @@ class ModalMidJourneyGenerateImage: timeout=150) job_resp.raise_for_status() job_resp = job_resp.json() - if "失败" in job_resp["msg"] or "fail" in job_resp["msg"] or "error" in job_resp["msg"]: - raise Exception("生成失败") + if not job_resp["status"]: + raise Exception("生成失败, 可能因为风控") job_id = job_resp["data"] for _ in range(0, timeout // interval, interval): logger.info("查询结果") @@ -296,7 +297,7 @@ class ModalMidJourneyDescribeImage: timeout=150) job_resp.raise_for_status() job_resp = job_resp.json() - if "失败" in job_resp["msg"] or "fail" in job_resp["msg"] or "error" in job_resp["msg"]: + if not job_resp["status"]: raise Exception("描述失败") result = job_resp["data"] return (result,)