apply lint, fix shadowed names
This commit is contained in:
parent
20c7fb8b33
commit
4d93c13431
|
@ -1,5 +1,4 @@
|
||||||
from logging import getLogger
|
from logging import getLogger
|
||||||
from typing import Optional
|
|
||||||
|
|
||||||
import numpy as np
|
import numpy as np
|
||||||
import torch
|
import torch
|
||||||
|
@ -25,7 +24,9 @@ def blend_img2img(
|
||||||
**kwargs,
|
**kwargs,
|
||||||
) -> Image.Image:
|
) -> Image.Image:
|
||||||
params = params.with_args(**kwargs)
|
params = params.with_args(**kwargs)
|
||||||
logger.info("blending image using img2img, %s steps: %s", params.steps, params.prompt)
|
logger.info(
|
||||||
|
"blending image using img2img, %s steps: %s", params.steps, params.prompt
|
||||||
|
)
|
||||||
|
|
||||||
pipe = load_pipeline(
|
pipe = load_pipeline(
|
||||||
server,
|
server,
|
||||||
|
|
|
@ -56,14 +56,14 @@ def blend_inpaint(
|
||||||
save_image(server, "last-mask.png", mask)
|
save_image(server, "last-mask.png", mask)
|
||||||
save_image(server, "last-noise.png", noise)
|
save_image(server, "last-noise.png", noise)
|
||||||
|
|
||||||
def outpaint(image: Image.Image, dims: Tuple[int, int, int]):
|
def outpaint(tile_source: Image.Image, dims: Tuple[int, int, int]):
|
||||||
left, top, tile = dims
|
left, top, tile = dims
|
||||||
size = Size(*image.size)
|
size = Size(*tile_source.size)
|
||||||
mask = mask.crop((left, top, left + tile, top + tile))
|
tile_mask = mask.crop((left, top, left + tile, top + tile))
|
||||||
|
|
||||||
if is_debug():
|
if is_debug():
|
||||||
save_image(server, "tile-source.png", image)
|
save_image(server, "tile-source.png", tile_source)
|
||||||
save_image(server, "tile-mask.png", mask)
|
save_image(server, "tile-mask.png", tile_mask)
|
||||||
|
|
||||||
latents = get_latents_from_seed(params.seed, size)
|
latents = get_latents_from_seed(params.seed, size)
|
||||||
pipe = load_pipeline(
|
pipe = load_pipeline(
|
||||||
|
@ -83,9 +83,9 @@ def blend_inpaint(
|
||||||
generator=rng,
|
generator=rng,
|
||||||
guidance_scale=params.cfg,
|
guidance_scale=params.cfg,
|
||||||
height=size.height,
|
height=size.height,
|
||||||
image=image,
|
image=tile_source,
|
||||||
latents=latents,
|
latents=latents,
|
||||||
mask=mask,
|
mask=tile_mask,
|
||||||
negative_prompt=params.negative_prompt,
|
negative_prompt=params.negative_prompt,
|
||||||
num_inference_steps=params.steps,
|
num_inference_steps=params.steps,
|
||||||
width=size.width,
|
width=size.width,
|
||||||
|
@ -98,7 +98,7 @@ def blend_inpaint(
|
||||||
generator=rng,
|
generator=rng,
|
||||||
guidance_scale=params.cfg,
|
guidance_scale=params.cfg,
|
||||||
height=size.height,
|
height=size.height,
|
||||||
image=image,
|
image=tile_source,
|
||||||
latents=latents,
|
latents=latents,
|
||||||
mask=mask,
|
mask=mask,
|
||||||
negative_prompt=params.negative_prompt,
|
negative_prompt=params.negative_prompt,
|
||||||
|
@ -109,9 +109,7 @@ def blend_inpaint(
|
||||||
|
|
||||||
return result.images[0]
|
return result.images[0]
|
||||||
|
|
||||||
output = process_tile_order(
|
output = process_tile_order(stage.tile_order, source, SizeChart.auto, 1, [outpaint])
|
||||||
stage.tile_order, source, SizeChart.auto, 1, [outpaint]
|
|
||||||
)
|
|
||||||
|
|
||||||
logger.info("final output image size", output.size)
|
logger.info("final output image size", output.size)
|
||||||
return output
|
return output
|
||||||
|
|
|
@ -26,7 +26,9 @@ def source_txt2img(
|
||||||
) -> Image.Image:
|
) -> Image.Image:
|
||||||
params = params.with_args(**kwargs)
|
params = params.with_args(**kwargs)
|
||||||
size = size.with_args(**kwargs)
|
size = size.with_args(**kwargs)
|
||||||
logger.info("generating image using txt2img, %s steps: %s", params.steps, params.prompt)
|
logger.info(
|
||||||
|
"generating image using txt2img, %s steps: %s", params.steps, params.prompt
|
||||||
|
)
|
||||||
|
|
||||||
if source is not None:
|
if source is not None:
|
||||||
logger.warn(
|
logger.warn(
|
||||||
|
|
|
@ -62,14 +62,14 @@ def upscale_outpaint(
|
||||||
save_image(server, "last-mask.png", mask)
|
save_image(server, "last-mask.png", mask)
|
||||||
save_image(server, "last-noise.png", noise)
|
save_image(server, "last-noise.png", noise)
|
||||||
|
|
||||||
def outpaint(image: Image.Image, dims: Tuple[int, int, int]):
|
def outpaint(tile_source: Image.Image, dims: Tuple[int, int, int]):
|
||||||
left, top, tile = dims
|
left, top, tile = dims
|
||||||
size = Size(*image.size)
|
size = Size(*tile_source.size)
|
||||||
mask = mask.crop((left, top, left + tile, top + tile))
|
tile_mask = mask.crop((left, top, left + tile, top + tile))
|
||||||
|
|
||||||
if is_debug():
|
if is_debug():
|
||||||
save_image(server, "tile-source.png", image)
|
save_image(server, "tile-source.png", tile_source)
|
||||||
save_image(server, "tile-mask.png", mask)
|
save_image(server, "tile-mask.png", tile_mask)
|
||||||
|
|
||||||
latents = get_tile_latents(full_latents, dims)
|
latents = get_tile_latents(full_latents, dims)
|
||||||
pipe = load_pipeline(
|
pipe = load_pipeline(
|
||||||
|
@ -84,8 +84,8 @@ def upscale_outpaint(
|
||||||
logger.debug("using LPW pipeline for inpaint")
|
logger.debug("using LPW pipeline for inpaint")
|
||||||
rng = torch.manual_seed(params.seed)
|
rng = torch.manual_seed(params.seed)
|
||||||
result = pipe.inpaint(
|
result = pipe.inpaint(
|
||||||
image,
|
tile_source,
|
||||||
mask,
|
tile_mask,
|
||||||
prompt,
|
prompt,
|
||||||
generator=rng,
|
generator=rng,
|
||||||
guidance_scale=params.cfg,
|
guidance_scale=params.cfg,
|
||||||
|
@ -100,12 +100,12 @@ def upscale_outpaint(
|
||||||
rng = np.random.RandomState(params.seed)
|
rng = np.random.RandomState(params.seed)
|
||||||
result = pipe(
|
result = pipe(
|
||||||
prompt,
|
prompt,
|
||||||
image,
|
tile_source,
|
||||||
generator=rng,
|
generator=rng,
|
||||||
guidance_scale=params.cfg,
|
guidance_scale=params.cfg,
|
||||||
height=size.height,
|
height=size.height,
|
||||||
latents=latents,
|
latents=latents,
|
||||||
mask=mask,
|
mask=tile_mask,
|
||||||
negative_prompt=params.negative_prompt,
|
negative_prompt=params.negative_prompt,
|
||||||
num_inference_steps=params.steps,
|
num_inference_steps=params.steps,
|
||||||
width=size.width,
|
width=size.width,
|
||||||
|
|
|
@ -74,7 +74,9 @@ def upscale_stable_diffusion(
|
||||||
) -> Image.Image:
|
) -> Image.Image:
|
||||||
params = params.with_args(**kwargs)
|
params = params.with_args(**kwargs)
|
||||||
upscale = upscale.with_args(**kwargs)
|
upscale = upscale.with_args(**kwargs)
|
||||||
logger.info("upscaling with Stable Diffusion, %s steps: %s", params.steps, params.prompt)
|
logger.info(
|
||||||
|
"upscaling with Stable Diffusion, %s steps: %s", params.steps, params.prompt
|
||||||
|
)
|
||||||
|
|
||||||
pipeline = load_stable_diffusion(server, upscale, job.get_device())
|
pipeline = load_stable_diffusion(server, upscale, job.get_device())
|
||||||
generator = torch.manual_seed(params.seed)
|
generator = torch.manual_seed(params.seed)
|
||||||
|
|
Loading…
Reference in New Issue