wangbo/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2025-12-18 10:33:01 +08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

include execution error in both responses

Browse Source
This commit is contained in:
Richard Yu 2025-12-03 16:16:48 -08:00
parent 048c413adc
commit 2e0b26bdf3
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
comfy_execution/jobs.py
View File

@ -59,6 +59,7 @@ def normalize_queue_item(item, status):
'create_time': create_time, 'create_time': create_time,
'execution_time': None, 'execution_time': None,
'error_message': None, 'error_message': None,
'execution_error': None,
'outputs_count': 0, 'outputs_count': 0,
'preview_output': None, 'preview_output': None,
'workflow_id': None, 'workflow_id': None,
@ -84,6 +85,7 @@ def normalize_history_item(prompt_id, history_item, include_outputs=False):
outputs_count, preview_output = get_outputs_summary(outputs) outputs_count, preview_output = get_outputs_summary(outputs)
error_message = None error_message = None
execution_error = None
if status == JobStatus.ERROR and status_info: if status == JobStatus.ERROR and status_info:
messages = status_info.get('messages', []) messages = status_info.get('messages', [])
for entry in messages: for entry in messages:
@ -91,6 +93,7 @@ def normalize_history_item(prompt_id, history_item, include_outputs=False):
detail = entry[1] detail = entry[1]
if isinstance(detail, dict): if isinstance(detail, dict):
error_message = str(detail.get('exception_message', '')) error_message = str(detail.get('exception_message', ''))
execution_error = detail
break break
execution_time = history_item.get('execution_time') execution_time = history_item.get('execution_time')
@ -112,6 +115,7 @@ def normalize_history_item(prompt_id, history_item, include_outputs=False):
job['prompt'] = prompt job['prompt'] = prompt
job['extra_data'] = extra_data job['extra_data'] = extra_data
job['outputs_to_execute'] = outputs_to_execute job['outputs_to_execute'] = outputs_to_execute
job['execution_error'] = execution_error
return job return job

21
tests/execution/test_jobs.py
View File

@ -283,6 +283,13 @@ class TestNormalizeHistoryItem:
def test_error_job(self): def test_error_job(self):
"""Error history item should have error status and message.""" """Error history item should have error status and message."""
error_detail = {
'node_id': '5',
'node_type': 'KSampler',
'exception_message': 'CUDA out of memory',
'exception_type': 'RuntimeError',
'traceback': ['Traceback...', 'RuntimeError: CUDA out of memory'],
}
history_item = { history_item = {
'prompt': ( 'prompt': (
5, 5,
@ -295,16 +302,24 @@ class TestNormalizeHistoryItem:
'status_str': 'error', 'status_str': 'error',
'completed': False, 'completed': False,
'messages': [ 'messages': [
('execution_error', {'exception_message': 'Node failed: OutOfMemory', 'node_id': '5'}) ('execution_error', error_detail)
] ]
}, },
'outputs': {}, 'outputs': {},
'execution_time': 1.0, 'execution_time': 1.0,
} }
job = normalize_history_item('prompt-789', history_item)
# List view - no execution_error
job = normalize_history_item('prompt-789', history_item)
assert job['status'] == 'error' assert job['status'] == 'error'
assert job['error_message'] == 'Node failed: OutOfMemory' assert job['error_message'] == 'CUDA out of memory'
assert 'execution_error' not in job
# Detail view - includes execution_error
job_detail = normalize_history_item('prompt-789', history_item, include_outputs=True)
assert job_detail['execution_error'] == error_detail
assert job_detail['execution_error']['node_id'] == '5'
assert job_detail['execution_error']['node_type'] == 'KSampler'
def test_include_outputs(self): def test_include_outputs(self):
"""When include_outputs=True, should include full output data.""" """When include_outputs=True, should include full output data."""