fix(api): pass mask and sources to blending pipeline in correct order
This commit is contained in:
parent
5556478669
commit
934dabb39e
|
@ -18,8 +18,9 @@ def blend_mask(
|
||||||
server: ServerContext,
|
server: ServerContext,
|
||||||
_stage: StageParams,
|
_stage: StageParams,
|
||||||
_params: ImageParams,
|
_params: ImageParams,
|
||||||
|
source: Image.Image,
|
||||||
*,
|
*,
|
||||||
sources: Optional[List[Image.Image]] = None,
|
stage_source: Optional[Image.Image] = None,
|
||||||
stage_mask: Optional[Image.Image] = None,
|
stage_mask: Optional[Image.Image] = None,
|
||||||
_callback: Optional[ProgressCallback] = None,
|
_callback: Optional[ProgressCallback] = None,
|
||||||
**kwargs,
|
**kwargs,
|
||||||
|
@ -34,9 +35,4 @@ def blend_mask(
|
||||||
save_image(server, "last-mask.png", stage_mask)
|
save_image(server, "last-mask.png", stage_mask)
|
||||||
save_image(server, "last-mult-mask.png", mult_mask)
|
save_image(server, "last-mult-mask.png", mult_mask)
|
||||||
|
|
||||||
resized = [
|
return Image.composite(source, stage_source, mult_mask)
|
||||||
valid_image(s, min_dims=mult_mask.size, max_dims=mult_mask.size)
|
|
||||||
for s in sources
|
|
||||||
]
|
|
||||||
|
|
||||||
return Image.composite(resized[1], resized[0], mult_mask)
|
|
||||||
|
|
|
@ -353,7 +353,7 @@ def run_blend_pipeline(
|
||||||
# set up the chain pipeline and base stage
|
# set up the chain pipeline and base stage
|
||||||
chain = ChainPipeline()
|
chain = ChainPipeline()
|
||||||
stage = StageParams()
|
stage = StageParams()
|
||||||
stage.append((blend_mask, stage, None))
|
chain.stage(blend_mask, stage, stage_source=sources[1], stage_mask=mask)
|
||||||
|
|
||||||
# apply upscaling and correction
|
# apply upscaling and correction
|
||||||
stage_upscale_correction(
|
stage_upscale_correction(
|
||||||
|
|
Loading…
Reference in New Issue