wangbo/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2026-07-10 00:17:16 +08:00
Code Issues Actions 37 Packages Projects Releases Wiki Activity

Merge 5811947af1 into 7747c342d4

Browse Source
This commit is contained in:
Denis 2026-07-06 20:09:12 -04:00 committed by GitHub
commit 8cd9e7b61f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
comfy_execution/jobs.py
View File

@ -253,12 +253,17 @@ def get_outputs_summary(outputs: dict) -> tuple[int, Optional[dict]]:
Returns (outputs_count, preview_output). Returns (outputs_count, preview_output).
Preview priority (matching frontend): Preview priority (matching frontend):
1. type="output" with previewable media 1. type="output" media (saved images/video/audio/3d)
2. Any previewable media 2. any other previewable media (e.g. temp/preview images)
3. text (only when the job produced no media output)
Text is kept in its own slot so node/execution order can't let a text
output mask a visual one (e.g. a text node that runs before an image).
""" """
count = 0 count = 0
preview_output = None preview_output = None
fallback_preview = None fallback_preview = None
text_fallback = None
for node_id, node_outputs in outputs.items(): for node_id, node_outputs in outputs.items():
if not isinstance(node_outputs, dict): if not isinstance(node_outputs, dict):
@ -287,8 +292,8 @@ def get_outputs_summary(outputs: dict) -> tuple[int, Optional[dict]]:
'nodeId': node_id, 'nodeId': node_id,
'mediaType': media_type 'mediaType': media_type
} }
if fallback_preview is None: if text_fallback is None:
fallback_preview = enriched text_fallback = enriched
continue continue
# normalize_output_item returned a dict (e.g. 3D file) # normalize_output_item returned a dict (e.g. 3D file)
item = normalized item = normalized
@ -310,7 +315,7 @@ def get_outputs_summary(outputs: dict) -> tuple[int, Optional[dict]]:
elif fallback_preview is None: elif fallback_preview is None:
fallback_preview = enriched fallback_preview = enriched
return count, preview_output or fallback_preview return count, preview_output or fallback_preview or text_fallback
def apply_sorting(jobs: list[dict], sort_by: str, sort_order: str) -> list[dict]: def apply_sorting(jobs: list[dict], sort_by: str, sort_order: str) -> list[dict]:

22
tests/execution/test_jobs.py
View File

@ -280,6 +280,28 @@ class TestGetOutputsSummary:
assert preview['filename'] == 'model.glb' assert preview['filename'] == 'model.glb'
assert preview['mediaType'] == '3d' assert preview['mediaType'] == '3d'
def test_media_preview_preferred_over_text(self):
"""A visual output wins the preview even when a text node is iterated
first (regression: text could mask a later temp/preview image)."""
outputs = {
'text_node': {'text': ['a caption']},
'image_node': {'images': [{'filename': 'preview.png', 'type': 'temp'}]},
}
count, preview = get_outputs_summary(outputs)
assert count == 2
assert preview['filename'] == 'preview.png'
assert preview['mediaType'] == 'images'
def test_text_used_as_preview_when_no_media(self):
"""Text is the preview only when the job produced no media output."""
outputs = {
'text_node': {'text': ['hello world']},
}
count, preview = get_outputs_summary(outputs)
assert count == 1
assert preview['mediaType'] == 'text'
assert preview['content'] == 'hello world'
class TestHas3DExtension: class TestHas3DExtension:
"""Unit tests for has_3d_extension()""" """Unit tests for has_3d_extension()"""