From cc12cb0fcf3a7814e7f3d176389febc0ced449bf Mon Sep 17 00:00:00 2001 From: Sean Sube Date: Sat, 4 Feb 2023 21:23:34 -0600 Subject: [PATCH] clean up lingering provider refs --- api/onnx_web/chain/upscale_outpaint.py | 15 ++++++++------- api/onnx_web/diffusion/run.py | 1 + api/onnx_web/output.py | 1 - api/onnx_web/serve.py | 8 ++++---- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/api/onnx_web/chain/upscale_outpaint.py b/api/onnx_web/chain/upscale_outpaint.py index 8e1f29c2..dae724e2 100644 --- a/api/onnx_web/chain/upscale_outpaint.py +++ b/api/onnx_web/chain/upscale_outpaint.py @@ -43,7 +43,8 @@ logger = getLogger(__name__) def upscale_outpaint( - ctx: ServerContext, + job: JobContext, + server: ServerContext, stage: StageParams, params: ImageParams, source_image: Image.Image, @@ -76,9 +77,9 @@ def upscale_outpaint( full_latents = get_latents_from_seed(params.seed, full_size) if is_debug(): - save_image(ctx, 'last-source.png', source_image) - save_image(ctx, 'last-mask.png', mask_image) - save_image(ctx, 'last-noise.png', noise_image) + save_image(server, 'last-source.png', source_image) + save_image(server, 'last-mask.png', mask_image) + save_image(server, 'last-noise.png', noise_image) def outpaint(image: Image.Image, dims: Tuple[int, int, int]): left, top, tile = dims @@ -86,11 +87,11 @@ def upscale_outpaint( mask = mask_image.crop((left, top, left + tile, top + tile)) if is_debug(): - save_image(ctx, 'tile-source.png', image) - save_image(ctx, 'tile-mask.png', mask) + save_image(server, 'tile-source.png', image) + save_image(server, 'tile-mask.png', mask) pipe = load_pipeline(OnnxStableDiffusionInpaintPipeline, - params.model, params.provider, params.scheduler) + params.model, params.scheduler, job.get_device()) latents = get_tile_latents(full_latents, dims) rng = np.random.RandomState(params.seed) diff --git a/api/onnx_web/diffusion/run.py b/api/onnx_web/diffusion/run.py index ac7ad6fc..efe27803 100644 --- a/api/onnx_web/diffusion/run.py +++ b/api/onnx_web/diffusion/run.py @@ -140,6 +140,7 @@ def run_inpaint_pipeline( stage = StageParams() image = upscale_outpaint( + job, server, stage, params, diff --git a/api/onnx_web/output.py b/api/onnx_web/output.py index 3016aa2d..c71391e1 100644 --- a/api/onnx_web/output.py +++ b/api/onnx_web/output.py @@ -74,7 +74,6 @@ def make_output_name( hash_value(sha, mode) hash_value(sha, params.model) - hash_value(sha, params.provider) hash_value(sha, params.scheduler.__name__) hash_value(sha, params.prompt) hash_value(sha, params.negative_prompt) diff --git a/api/onnx_web/serve.py b/api/onnx_web/serve.py index 779c7741..2e527e3b 100644 --- a/api/onnx_web/serve.py +++ b/api/onnx_web/serve.py @@ -481,7 +481,7 @@ def img2img(): @app.route('/api/txt2img', methods=['POST']) def txt2img(): device, params, size = pipeline_from_request() - upscale = upscale_from_request(params.provider) + upscale = upscale_from_request() output = make_output_name( context, @@ -512,7 +512,7 @@ def inpaint(): device, params, size = pipeline_from_request() expand = border_from_request() - upscale = upscale_from_request(params.provider) + upscale = upscale_from_request() fill_color = get_not_empty(request.args, 'fillColor', 'white') mask_filter = get_from_map(request.args, 'filter', mask_filters, 'none') @@ -573,7 +573,7 @@ def upscale(): source_image = Image.open(BytesIO(source_file.read())).convert('RGB') device, params, size = pipeline_from_request() - upscale = upscale_from_request(params.provider) + upscale = upscale_from_request() output = make_output_name( context, @@ -629,7 +629,7 @@ def chain(): kwargs['border'] = border if 'upscale' in kwargs: - upscale = UpscaleParams(kwargs.get('upscale'), params.provider) + upscale = UpscaleParams(kwargs.get('upscale')) kwargs['upscale'] = upscale stage_source_name = 'source:%s' % (stage.name)