apextoaster
/
onnx-web
1
0
Fork 0
Code Actions

fix(api): various controlnet fixes

This commit is contained in:
Sean Sube 2023-12-19 19:19:48 -06:00
parent a716f6db1f
commit ba9982af51
Signed by: ssube
GPG Key ID: 3EED7B957D362AF1
4 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/onnx_web/convert/__main__.py
View File

@ -546,6 +546,14 @@ def main(args=None) -> int:
server.opset = args.opset server.opset = args.opset
server.token = args.token server.token = args.token
# debug options
if server.debug:
import debugpy
debugpy.listen(5678)
logger.warning("waiting for debugger")
debugpy.wait_for_client()
register_plugins(server) register_plugins(server)
logger.info( logger.info(

2
api/onnx_web/convert/diffusion/diffusion.py
View File

@ -507,7 +507,7 @@ def convert_diffusion_diffusers(
run_gc() run_gc()
if conversion.control and not single_vae and not conversion.share_unet: if conversion.control and not single_vae and not conversion.share_unet:
cnet_source = torch_source or source cnet_source = torch_source or cache_path
logger.info("loading and converting CNet from %s", cnet_source) logger.info("loading and converting CNet from %s", cnet_source)
cnet_path = convert_diffusion_diffusers_cnet( cnet_path = convert_diffusion_diffusers_cnet(
conversion, conversion,

3
api/onnx_web/diffusers/load.py
View File

@ -235,7 +235,8 @@ def load_pipeline(
pipeline_class.__name__, pipeline_class.__name__,
) )
pipe = pipeline_class( pipe = pipeline_class(
components["vae"], components["vae_encoder"],
components["vae_decoder"],
components["text_encoder"], components["text_encoder"],
components["tokenizer"], components["tokenizer"],
components["unet"], components["unet"],

4
api/onnx_web/image/source_filter.py
View File

@ -160,7 +160,7 @@ def source_filter_hed(server: ServerContext, source: Image.Image) -> Image.Image
logger.debug("running HED detection on source image") logger.debug("running HED detection on source image")
hed = HEDdetector.from_pretrained( hed = HEDdetector.from_pretrained(
"lllyasviel/ControlNet", "lllyasviel/Annotators",
cache_dir=server.cache_path, cache_dir=server.cache_path,
) )
image = hed(source) image = hed(source)
@ -172,7 +172,7 @@ def source_filter_scribble(server: ServerContext, source: Image.Image) -> Image.
logger.debug("running scribble detection on source image") logger.debug("running scribble detection on source image")
hed = HEDdetector.from_pretrained( hed = HEDdetector.from_pretrained(
"lllyasviel/ControlNet", "lllyasviel/Annotators",
cache_dir=server.cache_path, cache_dir=server.cache_path,
) )
image = hed(source, scribble=True) image = hed(source, scribble=True)