298977887/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2025-01-11 02:15:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add a node_errors to the /prompt error json response.

Browse Source 
"node_errors" contains a dict keyed by node ids. The contents are a message
and a list of dependent outputs.
This commit is contained in:
comfyanonymous 2023-05-22 13:22:38 -04:00
parent 6cc450579b
commit ffc56c53c9
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
execution.py
View File

@ -299,18 +299,18 @@ def validate_inputs(prompt, item, validated):
required_inputs = class_inputs['required'] required_inputs = class_inputs['required']
for x in required_inputs: for x in required_inputs:
if x not in inputs: if x not in inputs:
return (False, "Required input is missing. {}, {}".format(class_type, x)) return (False, "Required input is missing. {}, {}".format(class_type, x), unique_id)
val = inputs[x] val = inputs[x]
info = required_inputs[x] info = required_inputs[x]
type_input = info[0] type_input = info[0]
if isinstance(val, list): if isinstance(val, list):
if len(val) != 2: if len(val) != 2:
return (False, "Bad Input. {}, {}".format(class_type, x)) return (False, "Bad Input. {}, {}".format(class_type, x), unique_id)
o_id = val[0] o_id = val[0]
o_class_type = prompt[o_id]['class_type'] o_class_type = prompt[o_id]['class_type']
r = nodes.NODE_CLASS_MAPPINGS[o_class_type].RETURN_TYPES r = nodes.NODE_CLASS_MAPPINGS[o_class_type].RETURN_TYPES
if r[val[1]] != type_input: if r[val[1]] != type_input:
return (False, "Return type mismatch. {}, {}, {} != {}".format(class_type, x, r[val[1]], type_input)) return (False, "Return type mismatch. {}, {}, {} != {}".format(class_type, x, r[val[1]], type_input), unique_id)
r = validate_inputs(prompt, o_id, validated) r = validate_inputs(prompt, o_id, validated)
if r[0] == False: if r[0] == False:
validated[o_id] = r validated[o_id] = r
@ -328,9 +328,9 @@ def validate_inputs(prompt, item, validated):
if len(info) > 1: if len(info) > 1:
if "min" in info[1] and val < info[1]["min"]: if "min" in info[1] and val < info[1]["min"]:
return (False, "Value {} smaller than min of {}. {}, {}".format(val, info[1]["min"], class_type, x)) return (False, "Value {} smaller than min of {}. {}, {}".format(val, info[1]["min"], class_type, x), unique_id)
if "max" in info[1] and val > info[1]["max"]: if "max" in info[1] and val > info[1]["max"]:
return (False, "Value {} bigger than max of {}. {}, {}".format(val, info[1]["max"], class_type, x)) return (False, "Value {} bigger than max of {}. {}, {}".format(val, info[1]["max"], class_type, x), unique_id)
if hasattr(obj_class, "VALIDATE_INPUTS"): if hasattr(obj_class, "VALIDATE_INPUTS"):
input_data_all = get_input_data(inputs, obj_class, unique_id) input_data_all = get_input_data(inputs, obj_class, unique_id)
@ -338,13 +338,13 @@ def validate_inputs(prompt, item, validated):
ret = map_node_over_list(obj_class, input_data_all, "VALIDATE_INPUTS") ret = map_node_over_list(obj_class, input_data_all, "VALIDATE_INPUTS")
for r in ret: for r in ret:
if r != True: if r != True:
return (False, "{}, {}".format(class_type, r)) return (False, "{}, {}".format(class_type, r), unique_id)
else: else:
if isinstance(type_input, list): if isinstance(type_input, list):
if val not in type_input: if val not in type_input:
return (False, "Value not in list. {}, {}: {} not in {}".format(class_type, x, val, type_input)) return (False, "Value not in list. {}, {}: {} not in {}".format(class_type, x, val, type_input), unique_id)
ret = (True, "") ret = (True, "", unique_id)
validated[unique_id] = ret validated[unique_id] = ret
return ret return ret
@ -356,10 +356,11 @@ def validate_prompt(prompt):
outputs.add(x) outputs.add(x)
if len(outputs) == 0: if len(outputs) == 0:
return (False, "Prompt has no outputs") return (False, "Prompt has no outputs", [], [])
good_outputs = set() good_outputs = set()
errors = [] errors = []
node_errors = {}
validated = {} validated = {}
for o in outputs: for o in outputs:
valid = False valid = False
@ -368,6 +369,7 @@ def validate_prompt(prompt):
m = validate_inputs(prompt, o, validated) m = validate_inputs(prompt, o, validated)
valid = m[0] valid = m[0]
reason = m[1] reason = m[1]
node_id = m[2]
except Exception as e: except Exception as e:
print(traceback.format_exc()) print(traceback.format_exc())
valid = False valid = False
@ -379,12 +381,15 @@ def validate_prompt(prompt):
print("Failed to validate prompt for output {} {}".format(o, reason)) print("Failed to validate prompt for output {} {}".format(o, reason))
print("output will be ignored") print("output will be ignored")
errors += [(o, reason)] errors += [(o, reason)]
if node_id not in node_errors:
node_errors[node_id] = {"message": reason, "dependent_outputs": []}
node_errors[node_id]["dependent_outputs"].append(o)
if len(good_outputs) == 0: if len(good_outputs) == 0:
errors_list = "\n".join(set(map(lambda a: "{}".format(a[1]), errors))) errors_list = "\n".join(set(map(lambda a: "{}".format(a[1]), errors)))
return (False, "Prompt has no properly connected outputs\n {}".format(errors_list)) return (False, "Prompt has no properly connected outputs\n {}".format(errors_list), list(good_outputs), node_errors)
return (True, "", list(good_outputs)) return (True, "", list(good_outputs), node_errors)
class PromptQueue: class PromptQueue:

4
server.py
View File

@ -336,9 +336,9 @@ class PromptServer():
return web.json_response({"prompt_id": prompt_id}) return web.json_response({"prompt_id": prompt_id})
else: else:
print("invalid prompt:", valid[1]) print("invalid prompt:", valid[1])
return web.json_response({"error": valid[1]}, status=400) return web.json_response({"error": valid[1], "node_errors": valid[3]}, status=400)
else: else:
return web.json_response({"error": "no prompt"}, status=400) return web.json_response({"error": "no prompt", "node_errors": []}, status=400)
@routes.post("/queue") @routes.post("/queue")
async def post_queue(request): async def post_queue(request):