From 444d809eff18507fd4a568a0d31827bbd866c591 Mon Sep 17 00:00:00 2001 From: Sean Sube Date: Wed, 3 Jan 2024 19:18:56 -0600 Subject: [PATCH] fix progress, unwrap metadata --- api/onnx_web/output.py | 2 +- api/onnx_web/server/api.py | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/api/onnx_web/output.py b/api/onnx_web/output.py index 7faf301e..024b29f3 100644 --- a/api/onnx_web/output.py +++ b/api/onnx_web/output.py @@ -69,7 +69,7 @@ def save_result( base_name: str, ) -> List[str]: results = [] - for i, image, metadata in enumerate(zip(result.as_image(), result.metadata)): + for i, (image, metadata) in enumerate(zip(result.as_image(), result.metadata)): results.append( save_image( server, diff --git a/api/onnx_web/server/api.py b/api/onnx_web/server/api.py index 2e431ff8..670e675d 100644 --- a/api/onnx_web/server/api.py +++ b/api/onnx_web/server/api.py @@ -112,13 +112,13 @@ def image_reply( metadata: List[ImageMetadata] = None, ): if stages is None: - stages = Progress() + stages = Progress(0, 0) if steps is None: - steps = Progress() + steps = Progress(0, 0) if tiles is None: - tiles = Progress() + tiles = Progress(0, 0) data = { "name": name, @@ -688,7 +688,9 @@ def register_api_routes(app: Flask, server: ServerContext, pool: DevicePoolExecu return [ app.route("/api")(wrap_route(introspect, server, app=app)), # job routes - app.route("/api/job", methods=["POST"])(wrap_route(job_create, server, pool=pool)), + app.route("/api/job", methods=["POST"])( + wrap_route(job_create, server, pool=pool) + ), app.route("/api/job/cancel", methods=["PUT"])( wrap_route(job_cancel, server, pool=pool) ),