apextoaster
/
onnx-web
1
0
Fork 0
Code Actions

various stack fixes

This commit is contained in:
Sean Sube 2023-11-19 21:05:21 -06:00
parent 8a3174aaff
commit c1f1bf2b36
Signed by: ssube
GPG Key ID: 3EED7B957D362AF1
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/onnx_web/chain/pipeline.py
View File

@ -181,7 +181,7 @@ class ChainPipeline:
server,
stage_params,
per_stage_params,
StageResult(images=[source_tile]),
StageResult(images=source_tile),
tile_mask=tile_mask,
callback=callback,
dims=dims,
@ -192,7 +192,7 @@ class ChainPipeline:
for j, image in enumerate(tile_result.as_image()):
save_image(server, f"last-tile-{j}.png", image)
return tile_result.as_image()
return tile_result
except Exception:
worker.retries = worker.retries - 1
logger.exception(

7
api/onnx_web/chain/tile.py
View File

@ -27,7 +27,7 @@ class TileCallback(Protocol):
def __call__(
self, image: Image.Image, dims: Tuple[int, int, int]
) -> List[Image.Image]:
) -> StageResult:
"""
Run this stage against a single tile.
"""
@ -287,7 +287,7 @@ def process_tile_stack(
bottom_margin,
)
tile_stack = add_margin(
stack,
stack.as_image(),
left,
top,
right,
@ -322,7 +322,7 @@ def process_tile_stack(
for image_filter in filters:
tile_stack = image_filter(tile_stack, tile_mask, (left, top, tile))
tiles.append((left, top, tile_stack))
tiles.append((left, top, tile_stack.as_image()))
lefts, tops, stacks = list(zip(*tiles))
coords = list(zip(lefts, tops))
@ -331,6 +331,7 @@ def process_tile_stack(
result = []
for stack in stacks:
stack_tiles = zip(coords, stack)
stack_tiles = [(left, top, tile) for (left, top), tile in stack_tiles]
result.append(blend_tiles(stack_tiles, scale, width, height, tile, overlap))
return result