apextoaster
/
onnx-web
1
0
Fork 0
Code Actions

fix params, save metadata

This commit is contained in:
Sean Sube 2024-01-03 20:22:38 -06:00
parent 444d809eff
commit d87861cb29
Signed by: ssube
GPG Key ID: 3EED7B957D362AF1
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/onnx_web/output.py
View File

@ -129,6 +129,7 @@ def save_image(
save_metadata( save_metadata(
server, server,
output, output,
metadata,
) )
logger.debug("saved output image to: %s", path) logger.debug("saved output image to: %s", path)

27
api/onnx_web/server/api.py
View File

@ -129,15 +129,15 @@ def image_reply(
"tiles": tiles.tojson(), "tiles": tiles.tojson(),
} }
if len(metadata) != len(outputs):
logger.error("metadata and outputs must be the same length")
return error_reply("metadata and outputs must be the same length")
if outputs is not None: if outputs is not None:
data["outputs"] = outputs data["outputs"] = outputs
if metadata is not None: if metadata is not None:
data["metadata"] = metadata if len(metadata) != len(outputs):
logger.error("metadata and outputs must be the same length")
return error_reply("metadata and outputs must be the same length")
data["metadata"] = metadata
return jsonify(data) return jsonify(data)
@ -256,9 +256,7 @@ def img2img(server: ServerContext, pool: DevicePoolExecutor):
) )
output_count += 1 output_count += 1
job_name = make_job_name( job_name = make_job_name("img2img", params, size, extras=[strength])
server, "img2img", params, size, extras=[strength], count=output_count
)
pool.submit( pool.submit(
job_name, job_name,
JobType.IMG2IMG, JobType.IMG2IMG,
@ -285,7 +283,7 @@ def txt2img(server: ServerContext, pool: DevicePoolExecutor):
replace_wildcards(params, get_wildcard_data()) replace_wildcards(params, get_wildcard_data())
job_name = make_job_name(server, "txt2img", params, size, count=params.batch) job_name = make_job_name("txt2img", params, size)
pool.submit( pool.submit(
job_name, job_name,
@ -348,7 +346,6 @@ def inpaint(server: ServerContext, pool: DevicePoolExecutor):
replace_wildcards(params, get_wildcard_data()) replace_wildcards(params, get_wildcard_data())
job_name = make_job_name( job_name = make_job_name(
server,
"inpaint", "inpaint",
params, params,
size, size,
@ -403,7 +400,7 @@ def upscale(server: ServerContext, pool: DevicePoolExecutor):
replace_wildcards(params, get_wildcard_data()) replace_wildcards(params, get_wildcard_data())
job_name = make_job_name(server, "upscale", params, size) job_name = make_job_name("upscale", params, size)
pool.submit( pool.submit(
job_name, job_name,
JobType.UPSCALE, JobType.UPSCALE,
@ -515,7 +512,7 @@ def chain(server: ServerContext, pool: DevicePoolExecutor):
logger.info("running chain pipeline with %s stages", len(pipeline.stages)) logger.info("running chain pipeline with %s stages", len(pipeline.stages))
job_name = make_job_name(server, "chain", base_params, base_size) job_name = make_job_name("chain", base_params, base_size)
# build and run chain pipeline # build and run chain pipeline
pool.submit( pool.submit(
@ -553,7 +550,7 @@ def blend(server: ServerContext, pool: DevicePoolExecutor):
device, params, size = pipeline_from_request(server) device, params, size = pipeline_from_request(server)
upscale = build_upscale() upscale = build_upscale()
job_name = make_job_name(server, "blend", params, size) job_name = make_job_name("blend", params, size)
pool.submit( pool.submit(
job_name, job_name,
JobType.BLEND, JobType.BLEND,
@ -576,7 +573,7 @@ def blend(server: ServerContext, pool: DevicePoolExecutor):
def txt2txt(server: ServerContext, pool: DevicePoolExecutor): def txt2txt(server: ServerContext, pool: DevicePoolExecutor):
device, params, size = pipeline_from_request(server) device, params, size = pipeline_from_request(server)
job_name = make_job_name(server, "txt2txt", params, size) job_name = make_job_name("txt2txt", params, size)
logger.info("upscale job queued for: %s", job_name) logger.info("upscale job queued for: %s", job_name)
pool.submit( pool.submit(