Alexander Garzon
e8fdd92f21
Manual testing in ComfyUI surfaced two defects in the gpt-image-2.5 work.
background=transparent was silently useless: the API returned a correct RGBA
PNG, but pil_to_tensor ran convert("RGB") on every response and composited the
alpha onto black. Both nodes now output (IMAGE, MASK), with the alpha carried on
the mask as 1 - alpha to match the LoadImage convention, so Join Image with
Alpha consumes it directly. The three response decode helpers collapsed into
response_item_to_pil, since the old path already decoded each item to a PIL
image and then discarded the alpha -- routing through a single decode was
smaller than adding a second one.
CUSTOM_DIM_MIN was 1024 while validate_custom_dimensions() accepts a short edge
down to 480 (1440x480 at the 3:1 aspect limit). The widget was a second, stricter
gate that disagreed with the validator, so legal sizes like 1536x864 snapped up
to 1024 and were unreachable from the UI. The floor is now derived from what the
validator accepts.
The existing tests missed both: they assert on request kwargs and never checked
that alpha survives the response, and they called run_generate() directly,
bypassing the widget bounds entirely.
Verified against the live API (transparent output recomposes to a fully
transparent corner pixel) and by manual testing in ComfyUI.
77 lines
3.3 KiB
Python
77 lines
3.3 KiB
Python
import pytest
|
|
from imagent import params
|
|
|
|
|
|
def test_constants():
|
|
assert params.SIZE_PRESETS[0] == "auto"
|
|
assert "custom" in params.SIZE_PRESETS
|
|
assert params.SIZE_PRESETS[-1] == "custom"
|
|
for base in ("1024x1024", "1024x1536", "1536x1024"):
|
|
assert base in params.SIZE_PRESETS
|
|
for hires in ("2048x2048", "3840x2160", "2160x3840"):
|
|
assert hires in params.SIZE_PRESETS
|
|
assert (params.CUSTOM_DIM_MIN, params.CUSTOM_DIM_MAX, params.CUSTOM_DIM_STEP) == (480, 3840, 16)
|
|
# The widget floor must not reject a size the validator accepts (the 3:1 edge case).
|
|
assert params.validate_custom_dimensions(1440, params.CUSTOM_DIM_MIN) == "1440x480"
|
|
assert params.QUALITIES == ["auto", "low", "medium", "high", "xhigh", "max"]
|
|
assert params.BACKGROUNDS == ["auto", "opaque", "transparent"]
|
|
assert params.FORMATS == ["png", "jpeg", "webp"]
|
|
assert params.MODERATIONS == ["auto", "low"]
|
|
|
|
|
|
def test_capabilities_for_known_and_unknown():
|
|
assert params.capabilities_for("gpt-image-2") == {
|
|
"transparent_background": False, "extended_quality": False}
|
|
assert params.capabilities_for("mystery") == {
|
|
"transparent_background": False, "extended_quality": False}
|
|
|
|
|
|
@pytest.mark.parametrize("model", ["gpt-image-2.5-flare", "gpt-image-2.5-sunburst"])
|
|
def test_gpt_image_25_capabilities(model):
|
|
assert params.capabilities_for(model) == {
|
|
"transparent_background": True, "extended_quality": True}
|
|
|
|
|
|
def test_resolve_quality_gates_extended_tiers():
|
|
assert params.resolve_quality("max", "gpt-image-2.5-sunburst") == "max"
|
|
assert params.resolve_quality("xhigh", "gpt-image-2.5-flare") == "xhigh"
|
|
assert params.resolve_quality("xhigh", "gpt-image-2") == "high"
|
|
assert params.resolve_quality("max", "mystery") == "high"
|
|
assert params.resolve_quality("high", "gpt-image-2") == "high"
|
|
assert params.resolve_quality("auto", "gpt-image-2") == "auto"
|
|
|
|
|
|
def test_resolve_background_drops_transparent_for_gpt_image_2():
|
|
assert params.resolve_background("transparent", "gpt-image-2") == "auto"
|
|
assert params.resolve_background("opaque", "gpt-image-2") == "opaque"
|
|
assert params.resolve_background("auto", "gpt-image-2") == "auto"
|
|
|
|
|
|
def test_validate_custom_dimensions_ok():
|
|
assert params.validate_custom_dimensions(1536, 864) == "1536x864"
|
|
assert params.validate_custom_dimensions(2048, 1152) == "2048x1152"
|
|
|
|
|
|
@pytest.mark.parametrize("w,h", [
|
|
(1000, 1000), # not multiples of 16
|
|
(100, 100), # not multiples of 16 (and too small)
|
|
(-16, -16), # negative
|
|
(1024, 0), # zero
|
|
(1024, 512), # total 524,288 < 655,360 minimum
|
|
(3840, 2176), # total 8,355,840 > 8,294,400 maximum
|
|
(3840, 1024), # aspect 3.75:1 > 3:1
|
|
(4096, 2160), # max edge 4096 > 3840
|
|
])
|
|
def test_validate_custom_dimensions_rejects(w, h):
|
|
with pytest.raises(ValueError):
|
|
params.validate_custom_dimensions(w, h)
|
|
|
|
|
|
def test_resolve_size_passes_presets_through_and_validates_custom():
|
|
assert params.resolve_size("auto", 1024, 1024) == "auto"
|
|
assert params.resolve_size("1024x1024", 1024, 1024) == "1024x1024"
|
|
assert params.resolve_size("3840x2160", 1024, 1024) == "3840x2160"
|
|
assert params.resolve_size("custom", 1536, 864) == "1536x864"
|
|
with pytest.raises(ValueError):
|
|
params.resolve_size("custom", 1000, 1000)
|