fix(api): correct imports

ssube · Mar 5, 2023 · 10fbafa · 10fbafa
1 parent 2b319c4
commit 10fbafa
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 18 deletions.
diff --git a/api/onnx_web/__init__.py b/api/onnx_web/__init__.py
@@ -5,15 +5,15 @@
     upscale_resrgan,
     upscale_stable_diffusion,
 )
-from .diffusion.load import get_latents_from_seed, load_pipeline, optimize_pipeline
-from .diffusion.run import (
+from .diffusers.load import get_latents_from_seed, load_pipeline, optimize_pipeline
+from .diffusers.run import (
     run_blend_pipeline,
     run_img2img_pipeline,
     run_inpaint_pipeline,
     run_txt2img_pipeline,
     run_upscale_pipeline,
 )
-from .diffusion.stub_scheduler import StubScheduler
+from .diffusers.stub_scheduler import StubScheduler
 from .image import (
     expand_image,
     mask_filter_gaussian_multiply,

diff --git a/api/onnx_web/chain/blend_img2img.py b/api/onnx_web/chain/blend_img2img.py
@@ -6,7 +6,7 @@
 from diffusers import OnnxStableDiffusionImg2ImgPipeline
 from PIL import Image
 
-from ..diffusion.load import load_pipeline
+from ..diffusers.load import load_pipeline
 from ..params import ImageParams, StageParams
 from ..server import ServerContext
 from ..worker import ProgressCallback, WorkerContext

diff --git a/api/onnx_web/chain/blend_inpaint.py b/api/onnx_web/chain/blend_inpaint.py
@@ -6,7 +6,7 @@
 from diffusers import OnnxStableDiffusionInpaintPipeline
 from PIL import Image
 
-from ..diffusion.load import get_latents_from_seed, load_pipeline
+from ..diffusers.load import get_latents_from_seed, load_pipeline
 from ..image import expand_image, mask_filter_none, noise_source_histogram
 from ..output import save_image
 from ..params import Border, ImageParams, Size, SizeChart, StageParams

diff --git a/api/onnx_web/chain/source_txt2img.py b/api/onnx_web/chain/source_txt2img.py
@@ -6,7 +6,7 @@
 from diffusers import OnnxStableDiffusionPipeline
 from PIL import Image
 
-from ..diffusion.load import get_latents_from_seed, load_pipeline
+from ..diffusers.load import get_latents_from_seed, load_pipeline
 from ..params import ImageParams, Size, StageParams
 from ..server import ServerContext
 from ..worker import ProgressCallback, WorkerContext

diff --git a/api/onnx_web/chain/upscale_outpaint.py b/api/onnx_web/chain/upscale_outpaint.py
@@ -6,7 +6,7 @@
 from diffusers import OnnxStableDiffusionInpaintPipeline
 from PIL import Image, ImageDraw
 
-from ..diffusion.load import get_latents_from_seed, get_tile_latents, load_pipeline
+from ..diffusers.load import get_latents_from_seed, get_tile_latents, load_pipeline
 from ..image import expand_image, mask_filter_none, noise_source_histogram
 from ..output import save_image
 from ..params import Border, ImageParams, Size, SizeChart, StageParams

diff --git a/api/onnx_web/chain/upscale_stable_diffusion.py b/api/onnx_web/chain/upscale_stable_diffusion.py
@@ -6,8 +6,8 @@
 from diffusers import StableDiffusionUpscalePipeline
 from PIL import Image
 
-from ..diffusion.load import optimize_pipeline
-from ..diffusion.pipeline_onnx_stable_diffusion_upscale import (
+from ..diffusers.load import optimize_pipeline
+from ..diffusers.pipeline_onnx_stable_diffusion_upscale import (
     OnnxStableDiffusionUpscalePipeline,
 )
 from ..params import DeviceParams, ImageParams, StageParams, UpscaleParams

diff --git a/api/onnx_web/convert/__main__.py b/api/onnx_web/convert/__main__.py
@@ -11,9 +11,9 @@
 from yaml import safe_load
 
 from .correction_gfpgan import convert_correction_gfpgan
-from .diffusion.diffusers import convert_diffusion_diffusers
-from .diffusion.original import convert_diffusion_original
-from .diffusion.textual_inversion import convert_diffusion_textual_inversion
+from .diffusers.diffusers import convert_diffusion_diffusers
+from .diffusers.original import convert_diffusion_original
+from .diffusers.textual_inversion import convert_diffusion_textual_inversion
 from .upscale_resrgan import convert_upscale_resrgan
 from .utils import (
     ConversionContext,

diff --git a/api/onnx_web/convert/diffusion/diffusers.py b/api/onnx_web/convert/diffusion/diffusers.py
@@ -27,8 +27,8 @@
 from onnxruntime.transformers.float16 import convert_float_to_float16
 from torch.onnx import export
 
-from ...diffusion.load import optimize_pipeline
-from ...diffusion.pipeline_onnx_stable_diffusion_upscale import (
+from ...diffusers.load import optimize_pipeline
+from ...diffusers.pipeline_onnx_stable_diffusion_upscale import (
     OnnxStableDiffusionUpscalePipeline,
 )
 from ..utils import ConversionContext

diff --git a/api/onnx_web/diffusers/load.py b/api/onnx_web/diffusers/load.py
@@ -26,7 +26,7 @@
 try:
     from diffusers import DEISMultistepScheduler
 except ImportError:
-    from ..diffusion.stub_scheduler import StubScheduler as DEISMultistepScheduler
+    from ..diffusers.stub_scheduler import StubScheduler as DEISMultistepScheduler
 
 from ..params import DeviceParams, Size
 from ..server import ServerContext

diff --git a/api/onnx_web/server/api.py b/api/onnx_web/server/api.py
@@ -8,8 +8,8 @@
 from PIL import Image
 
 from ..chain import CHAIN_STAGES, ChainPipeline
-from ..diffusion.load import get_pipeline_schedulers
-from ..diffusion.run import (
+from ..diffusers.load import get_pipeline_schedulers
+from ..diffusers.run import (
     run_blend_pipeline,
     run_img2img_pipeline,
     run_inpaint_pipeline,

diff --git a/api/onnx_web/server/params.py b/api/onnx_web/server/params.py
@@ -4,7 +4,7 @@
 import numpy as np
 from flask import request
 
-from ..diffusion.load import pipeline_schedulers
+from ..diffusers.load import pipeline_schedulers
 from ..params import Border, DeviceParams, ImageParams, Size, UpscaleParams
 from ..utils import get_and_clamp_float, get_and_clamp_int, get_from_list, get_not_empty
 from .load import (