From f1e5deba0fd2de522850f31268b10cb34335c7b7 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 20 Aug 2024 22:09:16 +0200 Subject: [PATCH] replaced iopaint with inpaint --- inpaint/model/anytext/ldm/models/diffusion/ddim.py | 2 +- inpaint/model/anytext/ldm/models/diffusion/ddpm.py | 12 ++++++------ inpaint/model/anytext/ldm/models/diffusion/plms.py | 4 ++-- inpaint/model/anytext/ldm/modules/attention.py | 2 +- .../ldm/modules/diffusionmodules/openaimodel.py | 6 +++--- .../ldm/modules/diffusionmodules/upscaling.py | 4 ++-- .../anytext/ldm/modules/diffusionmodules/util.py | 2 +- .../model/anytext/ldm/modules/encoders/modules.py | 2 +- inpaint/model/anytext/main.py | 2 +- inpaint/model/base.py | 4 ++-- inpaint/model/controlnet.py | 2 +- inpaint/model/fcf.py | 4 ++-- inpaint/model/helper/controlnet_preprocess.py | 2 +- inpaint/model/helper/g_diffuser_bot.py | 2 +- inpaint/model/instruct_pix2pix.py | 4 ++-- inpaint/model/kandinsky.py | 4 ++-- inpaint/model/lama.py | 4 ++-- inpaint/model/ldm.py | 4 ++-- inpaint/model/manga.py | 4 ++-- inpaint/model/mat.py | 4 ++-- inpaint/model/mi_gan.py | 4 ++-- inpaint/model/opencv2.py | 2 +- inpaint/model/paint_by_example.py | 4 ++-- inpaint/model/power_paint/power_paint.py | 2 +- inpaint/model/power_paint/power_paint_v2.py | 4 ++-- inpaint/model/power_paint/powerpaint_tokenizer.py | 2 +- inpaint/model/sd.py | 2 +- inpaint/model/zits.py | 4 ++-- inpaint/plugins/anime_seg.py | 6 +++--- inpaint/plugins/base_plugin.py | 2 +- .../plugins/gfpgan/archs/stylegan2_clean_arch.py | 2 +- inpaint/plugins/gfpgan_plugin.py | 6 +++--- inpaint/plugins/interactive_seg.py | 14 +++++++------- inpaint/plugins/realesrgan.py | 6 +++--- inpaint/plugins/remove_bg.py | 6 +++--- inpaint/plugins/restoreformer.py | 6 +++--- inpaint/plugins/segment_anything/build_sam.py | 2 +- inpaint/runtime.py | 2 +- inpaint/tests/test_adjust_mask.py | 4 ++-- inpaint/tests/test_anytext.py | 6 +++--- inpaint/tests/test_brushnet.py | 8 ++++---- inpaint/tests/test_controlnet.py | 8 ++++---- inpaint/tests/test_instruct_pix2pix.py | 6 +++--- inpaint/tests/test_load_img.py | 4 ++-- inpaint/tests/test_low_mem.py | 6 +++--- inpaint/tests/test_match_histograms.py | 6 +++--- inpaint/tests/test_model.py | 6 +++--- inpaint/tests/test_model_md5.py | 4 ++-- inpaint/tests/test_model_switch.py | 4 ++-- inpaint/tests/test_outpainting.py | 8 ++++---- inpaint/tests/test_paint_by_example.py | 8 ++++---- inpaint/tests/test_plugins.py | 10 +++++----- inpaint/tests/test_save_exif.py | 2 +- inpaint/tests/test_sd_model.py | 6 +++--- inpaint/tests/test_sdxl.py | 8 ++++---- inpaint/tests/utils.py | 2 +- 56 files changed, 128 insertions(+), 128 deletions(-) diff --git a/inpaint/model/anytext/ldm/models/diffusion/ddim.py b/inpaint/model/anytext/ldm/models/diffusion/ddim.py index f8bbaff..a635598 100644 --- a/inpaint/model/anytext/ldm/models/diffusion/ddim.py +++ b/inpaint/model/anytext/ldm/models/diffusion/ddim.py @@ -4,7 +4,7 @@ import torch import numpy as np from tqdm import tqdm -from iopaint.model.anytext.ldm.modules.diffusionmodules.util import make_ddim_sampling_parameters, make_ddim_timesteps, noise_like, extract_into_tensor +from inpaint.model.anytext.ldm.modules.diffusionmodules.util import make_ddim_sampling_parameters, make_ddim_timesteps, noise_like, extract_into_tensor class DDIMSampler(object): diff --git a/inpaint/model/anytext/ldm/models/diffusion/ddpm.py b/inpaint/model/anytext/ldm/models/diffusion/ddpm.py index 9f48918..4974ee0 100644 --- a/inpaint/model/anytext/ldm/models/diffusion/ddpm.py +++ b/inpaint/model/anytext/ldm/models/diffusion/ddpm.py @@ -14,7 +14,7 @@ from tqdm import tqdm from torchvision.utils import make_grid from omegaconf import ListConfig -from iopaint.model.anytext.ldm.util import ( +from inpaint.model.anytext.ldm.util import ( log_txt_as_img, exists, default, @@ -24,18 +24,18 @@ from iopaint.model.anytext.ldm.util import ( count_params, instantiate_from_config, ) -from iopaint.model.anytext.ldm.modules.ema import LitEma -from iopaint.model.anytext.ldm.modules.distributions.distributions import ( +from inpaint.model.anytext.ldm.modules.ema import LitEma +from inpaint.model.anytext.ldm.modules.distributions.distributions import ( normal_kl, DiagonalGaussianDistribution, ) -from iopaint.model.anytext.ldm.models.autoencoder import IdentityFirstStage, AutoencoderKL -from iopaint.model.anytext.ldm.modules.diffusionmodules.util import ( +from inpaint.model.anytext.ldm.models.autoencoder import IdentityFirstStage, AutoencoderKL +from inpaint.model.anytext.ldm.modules.diffusionmodules.util import ( make_beta_schedule, extract_into_tensor, noise_like, ) -from iopaint.model.anytext.ldm.models.diffusion.ddim import DDIMSampler +from inpaint.model.anytext.ldm.models.diffusion.ddim import DDIMSampler import cv2 diff --git a/inpaint/model/anytext/ldm/models/diffusion/plms.py b/inpaint/model/anytext/ldm/models/diffusion/plms.py index 5f35d55..cea5156 100644 --- a/inpaint/model/anytext/ldm/models/diffusion/plms.py +++ b/inpaint/model/anytext/ldm/models/diffusion/plms.py @@ -5,8 +5,8 @@ import numpy as np from tqdm import tqdm from functools import partial -from iopaint.model.anytext.ldm.modules.diffusionmodules.util import make_ddim_sampling_parameters, make_ddim_timesteps, noise_like -from iopaint.model.anytext.ldm.models.diffusion.sampling_util import norm_thresholding +from inpaint.model.anytext.ldm.modules.diffusionmodules.util import make_ddim_sampling_parameters, make_ddim_timesteps, noise_like +from inpaint.model.anytext.ldm.models.diffusion.sampling_util import norm_thresholding class PLMSSampler(object): diff --git a/inpaint/model/anytext/ldm/modules/attention.py b/inpaint/model/anytext/ldm/modules/attention.py index df92aa7..d17fc9c 100644 --- a/inpaint/model/anytext/ldm/modules/attention.py +++ b/inpaint/model/anytext/ldm/modules/attention.py @@ -6,7 +6,7 @@ from torch import nn, einsum from einops import rearrange, repeat from typing import Optional, Any -from iopaint.model.anytext.ldm.modules.diffusionmodules.util import checkpoint +from inpaint.model.anytext.ldm.modules.diffusionmodules.util import checkpoint # CrossAttn precision handling diff --git a/inpaint/model/anytext/ldm/modules/diffusionmodules/openaimodel.py b/inpaint/model/anytext/ldm/modules/diffusionmodules/openaimodel.py index fd3d6be..8ac50d9 100644 --- a/inpaint/model/anytext/ldm/modules/diffusionmodules/openaimodel.py +++ b/inpaint/model/anytext/ldm/modules/diffusionmodules/openaimodel.py @@ -6,7 +6,7 @@ import torch as th import torch.nn as nn import torch.nn.functional as F -from iopaint.model.anytext.ldm.modules.diffusionmodules.util import ( +from inpaint.model.anytext.ldm.modules.diffusionmodules.util import ( checkpoint, conv_nd, linear, @@ -15,8 +15,8 @@ from iopaint.model.anytext.ldm.modules.diffusionmodules.util import ( normalization, timestep_embedding, ) -from iopaint.model.anytext.ldm.modules.attention import SpatialTransformer -from iopaint.model.anytext.ldm.util import exists +from inpaint.model.anytext.ldm.modules.attention import SpatialTransformer +from inpaint.model.anytext.ldm.util import exists # dummy replace diff --git a/inpaint/model/anytext/ldm/modules/diffusionmodules/upscaling.py b/inpaint/model/anytext/ldm/modules/diffusionmodules/upscaling.py index 5f92630..be3ba49 100644 --- a/inpaint/model/anytext/ldm/modules/diffusionmodules/upscaling.py +++ b/inpaint/model/anytext/ldm/modules/diffusionmodules/upscaling.py @@ -3,8 +3,8 @@ import torch.nn as nn import numpy as np from functools import partial -from iopaint.model.anytext.ldm.modules.diffusionmodules.util import extract_into_tensor, make_beta_schedule -from iopaint.model.anytext.ldm.util import default +from inpaint.model.anytext.ldm.modules.diffusionmodules.util import extract_into_tensor, make_beta_schedule +from inpaint.model.anytext.ldm.util import default class AbstractLowScaleModel(nn.Module): diff --git a/inpaint/model/anytext/ldm/modules/diffusionmodules/util.py b/inpaint/model/anytext/ldm/modules/diffusionmodules/util.py index da29c72..b3be05e 100644 --- a/inpaint/model/anytext/ldm/modules/diffusionmodules/util.py +++ b/inpaint/model/anytext/ldm/modules/diffusionmodules/util.py @@ -15,7 +15,7 @@ import torch.nn as nn import numpy as np from einops import repeat -from iopaint.model.anytext.ldm.util import instantiate_from_config +from inpaint.model.anytext.ldm.util import instantiate_from_config def make_beta_schedule(schedule, n_timestep, linear_start=1e-4, linear_end=2e-2, cosine_s=8e-3): diff --git a/inpaint/model/anytext/ldm/modules/encoders/modules.py b/inpaint/model/anytext/ldm/modules/encoders/modules.py index ceac395..d989d61 100644 --- a/inpaint/model/anytext/ldm/modules/encoders/modules.py +++ b/inpaint/model/anytext/ldm/modules/encoders/modules.py @@ -11,7 +11,7 @@ from transformers import ( CLIPVisionModelWithProjection, ) -from iopaint.model.anytext.ldm.util import count_params +from inpaint.model.anytext.ldm.util import count_params def _expand_mask(mask, dtype, tgt_len=None): diff --git a/inpaint/model/anytext/main.py b/inpaint/model/anytext/main.py index f7b2d2e..5625773 100644 --- a/inpaint/model/anytext/main.py +++ b/inpaint/model/anytext/main.py @@ -8,7 +8,7 @@ seed = 66273235 # seed_everything(seed) pipe = AnyTextPipeline( - ckpt_path="/Users/cwq/code/github/IOPaint/iopaint/model/anytext/anytext_v1.1_fp16.ckpt", + ckpt_path="/Users/cwq/code/github/IOPaint/inpaint/model/anytext/anytext_v1.1_fp16.ckpt", font_path="/Users/cwq/code/github/AnyText/anytext/font/SourceHanSansSC-Medium.otf", use_fp16=False, device="mps", diff --git a/inpaint/model/base.py b/inpaint/model/base.py index 433ad68..d3e2bde 100644 --- a/inpaint/model/base.py +++ b/inpaint/model/base.py @@ -6,13 +6,13 @@ import torch import numpy as np from loguru import logger -from iopaint.helper import ( +from inpaint.helper import ( boxes_from_mask, resize_max_size, pad_img_to_modulo, switch_mps_device, ) -from iopaint.schema import InpaintRequest, HDStrategy, SDSampler +from inpaint.schema import InpaintRequest, HDStrategy, SDSampler from .helper.g_diffuser_bot import expand_image from .utils import get_scheduler diff --git a/inpaint/model/controlnet.py b/inpaint/model/controlnet.py index 7b4d243..3ca410a 100644 --- a/inpaint/model/controlnet.py +++ b/inpaint/model/controlnet.py @@ -3,7 +3,7 @@ import cv2 import torch from diffusers import ControlNetModel from loguru import logger -from iopaint.schema import InpaintRequest, ModelType +from inpaint.schema import InpaintRequest, ModelType from .base import DiffusionInpaintModel from .helper.controlnet_preprocess import ( diff --git a/inpaint/model/fcf.py b/inpaint/model/fcf.py index a6f2d42..cf4aaef 100644 --- a/inpaint/model/fcf.py +++ b/inpaint/model/fcf.py @@ -6,9 +6,9 @@ import torch import numpy as np import torch.fft as fft -from iopaint.schema import InpaintRequest +from inpaint.schema import InpaintRequest -from iopaint.helper import ( +from inpaint.helper import ( load_model, get_cache_path_by_url, norm_img, diff --git a/inpaint/model/helper/controlnet_preprocess.py b/inpaint/model/helper/controlnet_preprocess.py index 75c409f..f6c97e5 100644 --- a/inpaint/model/helper/controlnet_preprocess.py +++ b/inpaint/model/helper/controlnet_preprocess.py @@ -4,7 +4,7 @@ import cv2 from PIL import Image import numpy as np -from iopaint.helper import pad_img_to_modulo +from inpaint.helper import pad_img_to_modulo def make_canny_control_image(image: np.ndarray) -> Image: diff --git a/inpaint/model/helper/g_diffuser_bot.py b/inpaint/model/helper/g_diffuser_bot.py index 79b19aa..87eb69b 100644 --- a/inpaint/model/helper/g_diffuser_bot.py +++ b/inpaint/model/helper/g_diffuser_bot.py @@ -43,7 +43,7 @@ if __name__ == "__main__": from pathlib import Path current_dir = Path(__file__).parent.absolute().resolve() - image_path = "/Users/cwq/code/github/IOPaint/iopaint/tests/bunny.jpeg" + image_path = "/Users/cwq/code/github/IOPaint/inpaint/tests/bunny.jpeg" init_image = cv2.imread(str(image_path)) init_image, mask_image = expand_image( init_image, diff --git a/inpaint/model/instruct_pix2pix.py b/inpaint/model/instruct_pix2pix.py index fc8cd26..d11b979 100644 --- a/inpaint/model/instruct_pix2pix.py +++ b/inpaint/model/instruct_pix2pix.py @@ -3,9 +3,9 @@ import cv2 import torch from loguru import logger -from iopaint.const import INSTRUCT_PIX2PIX_NAME +from inpaint.const import INSTRUCT_PIX2PIX_NAME from .base import DiffusionInpaintModel -from iopaint.schema import InpaintRequest +from inpaint.schema import InpaintRequest from .utils import get_torch_dtype, enable_low_mem, is_local_files_only diff --git a/inpaint/model/kandinsky.py b/inpaint/model/kandinsky.py index 1a0bf1c..850f2b7 100644 --- a/inpaint/model/kandinsky.py +++ b/inpaint/model/kandinsky.py @@ -3,9 +3,9 @@ import cv2 import numpy as np import torch -from iopaint.const import KANDINSKY22_NAME +from inpaint.const import KANDINSKY22_NAME from .base import DiffusionInpaintModel -from iopaint.schema import InpaintRequest +from inpaint.schema import InpaintRequest from .utils import get_torch_dtype, enable_low_mem, is_local_files_only diff --git a/inpaint/model/lama.py b/inpaint/model/lama.py index 7aba242..0194c41 100644 --- a/inpaint/model/lama.py +++ b/inpaint/model/lama.py @@ -4,13 +4,13 @@ import cv2 import numpy as np import torch -from iopaint.helper import ( +from inpaint.helper import ( norm_img, get_cache_path_by_url, load_jit_model, download_model, ) -from iopaint.schema import InpaintRequest +from inpaint.schema import InpaintRequest from .base import InpaintModel LAMA_MODEL_URL = os.environ.get( diff --git a/inpaint/model/ldm.py b/inpaint/model/ldm.py index 19e51a3..b5b51e3 100644 --- a/inpaint/model/ldm.py +++ b/inpaint/model/ldm.py @@ -7,11 +7,11 @@ from loguru import logger from .base import InpaintModel from .ddim_sampler import DDIMSampler from .plms_sampler import PLMSSampler -from iopaint.schema import InpaintRequest, LDMSampler +from inpaint.schema import InpaintRequest, LDMSampler torch.manual_seed(42) import torch.nn as nn -from iopaint.helper import ( +from inpaint.helper import ( download_model, norm_img, get_cache_path_by_url, diff --git a/inpaint/model/manga.py b/inpaint/model/manga.py index 1f58251..736d8e3 100644 --- a/inpaint/model/manga.py +++ b/inpaint/model/manga.py @@ -7,9 +7,9 @@ import torch import time from loguru import logger -from iopaint.helper import get_cache_path_by_url, load_jit_model, download_model +from inpaint.helper import get_cache_path_by_url, load_jit_model, download_model from .base import InpaintModel -from iopaint.schema import InpaintRequest +from inpaint.schema import InpaintRequest MANGA_INPAINTOR_MODEL_URL = os.environ.get( diff --git a/inpaint/model/mat.py b/inpaint/model/mat.py index 0c5360f..0962f17 100644 --- a/inpaint/model/mat.py +++ b/inpaint/model/mat.py @@ -8,13 +8,13 @@ import torch.nn as nn import torch.nn.functional as F import torch.utils.checkpoint as checkpoint -from iopaint.helper import ( +from inpaint.helper import ( load_model, get_cache_path_by_url, norm_img, download_model, ) -from iopaint.schema import InpaintRequest +from inpaint.schema import InpaintRequest from .base import InpaintModel from .utils import ( setup_filter, diff --git a/inpaint/model/mi_gan.py b/inpaint/model/mi_gan.py index f1ce25f..991355b 100644 --- a/inpaint/model/mi_gan.py +++ b/inpaint/model/mi_gan.py @@ -3,7 +3,7 @@ import os import cv2 import torch -from iopaint.helper import ( +from inpaint.helper import ( load_jit_model, download_model, get_cache_path_by_url, @@ -12,7 +12,7 @@ from iopaint.helper import ( norm_img, ) from .base import InpaintModel -from iopaint.schema import InpaintRequest +from inpaint.schema import InpaintRequest MIGAN_MODEL_URL = os.environ.get( "MIGAN_MODEL_URL", diff --git a/inpaint/model/opencv2.py b/inpaint/model/opencv2.py index de47209..be4111c 100644 --- a/inpaint/model/opencv2.py +++ b/inpaint/model/opencv2.py @@ -1,6 +1,6 @@ import cv2 from .base import InpaintModel -from iopaint.schema import InpaintRequest +from inpaint.schema import InpaintRequest flag_map = {"INPAINT_NS": cv2.INPAINT_NS, "INPAINT_TELEA": cv2.INPAINT_TELEA} diff --git a/inpaint/model/paint_by_example.py b/inpaint/model/paint_by_example.py index bf1e5b7..a88a556 100644 --- a/inpaint/model/paint_by_example.py +++ b/inpaint/model/paint_by_example.py @@ -4,9 +4,9 @@ import cv2 import torch from loguru import logger -from iopaint.helper import decode_base64_to_image +from inpaint.helper import decode_base64_to_image from .base import DiffusionInpaintModel -from iopaint.schema import InpaintRequest +from inpaint.schema import InpaintRequest from .utils import get_torch_dtype, enable_low_mem, is_local_files_only diff --git a/inpaint/model/power_paint/power_paint.py b/inpaint/model/power_paint/power_paint.py index f17a5a3..197e37d 100644 --- a/inpaint/model/power_paint/power_paint.py +++ b/inpaint/model/power_paint/power_paint.py @@ -12,7 +12,7 @@ from ..utils import ( enable_low_mem, is_local_files_only, ) -from iopaint.schema import InpaintRequest +from inpaint.schema import InpaintRequest from .powerpaint_tokenizer import add_task_to_prompt from ...const import POWERPAINT_NAME diff --git a/inpaint/model/power_paint/power_paint_v2.py b/inpaint/model/power_paint/power_paint_v2.py index 1a27f65..a7e4b0e 100644 --- a/inpaint/model/power_paint/power_paint_v2.py +++ b/inpaint/model/power_paint/power_paint_v2.py @@ -3,7 +3,7 @@ from itertools import chain import PIL.Image import cv2 import torch -from iopaint.model.original_sd_configs import get_config_files +from inpaint.model.original_sd_configs import get_config_files from loguru import logger from transformers import CLIPTextModel, CLIPTokenizer import numpy as np @@ -17,7 +17,7 @@ from ..utils import ( handle_from_pretrained_exceptions, ) from .powerpaint_tokenizer import task_to_prompt -from iopaint.schema import InpaintRequest, ModelType +from inpaint.schema import InpaintRequest, ModelType from .v2.BrushNet_CA import BrushNetModel from .v2.unet_2d_condition import UNet2DConditionModel_forward from .v2.unet_2d_blocks import ( diff --git a/inpaint/model/power_paint/powerpaint_tokenizer.py b/inpaint/model/power_paint/powerpaint_tokenizer.py index 53a68c9..58ef250 100644 --- a/inpaint/model/power_paint/powerpaint_tokenizer.py +++ b/inpaint/model/power_paint/powerpaint_tokenizer.py @@ -3,7 +3,7 @@ import random from typing import Any, List, Union from transformers import CLIPTokenizer -from iopaint.schema import PowerPaintTask +from inpaint.schema import PowerPaintTask def add_task_to_prompt(prompt, negative_prompt, task: PowerPaintTask): diff --git a/inpaint/model/sd.py b/inpaint/model/sd.py index 2f6698c..73a3146 100644 --- a/inpaint/model/sd.py +++ b/inpaint/model/sd.py @@ -12,7 +12,7 @@ from .utils import ( enable_low_mem, is_local_files_only, ) -from iopaint.schema import InpaintRequest, ModelType +from inpaint.schema import InpaintRequest, ModelType class SD(DiffusionInpaintModel): diff --git a/inpaint/model/zits.py b/inpaint/model/zits.py index d58ac01..c69c843 100644 --- a/inpaint/model/zits.py +++ b/inpaint/model/zits.py @@ -5,8 +5,8 @@ import cv2 import torch import torch.nn.functional as F -from iopaint.helper import get_cache_path_by_url, load_jit_model, download_model -from iopaint.schema import InpaintRequest +from inpaint.helper import get_cache_path_by_url, load_jit_model, download_model +from inpaint.schema import InpaintRequest import numpy as np from .base import InpaintModel diff --git a/inpaint/plugins/anime_seg.py b/inpaint/plugins/anime_seg.py index 286564b..a94af79 100644 --- a/inpaint/plugins/anime_seg.py +++ b/inpaint/plugins/anime_seg.py @@ -5,9 +5,9 @@ import torch.nn.functional as F import numpy as np from PIL import Image -from iopaint.helper import load_model -from iopaint.plugins.base_plugin import BasePlugin -from iopaint.schema import RunPluginRequest +from inpaint.helper import load_model +from inpaint.plugins.base_plugin import BasePlugin +from inpaint.schema import RunPluginRequest class REBNCONV(nn.Module): diff --git a/inpaint/plugins/base_plugin.py b/inpaint/plugins/base_plugin.py index 1f8bddc..6d899e2 100644 --- a/inpaint/plugins/base_plugin.py +++ b/inpaint/plugins/base_plugin.py @@ -1,7 +1,7 @@ from loguru import logger import numpy as np -from iopaint.schema import RunPluginRequest +from inpaint.schema import RunPluginRequest class BasePlugin: diff --git a/inpaint/plugins/gfpgan/archs/stylegan2_clean_arch.py b/inpaint/plugins/gfpgan/archs/stylegan2_clean_arch.py index 553368a..b57f8da 100644 --- a/inpaint/plugins/gfpgan/archs/stylegan2_clean_arch.py +++ b/inpaint/plugins/gfpgan/archs/stylegan2_clean_arch.py @@ -4,7 +4,7 @@ import torch from torch import nn from torch.nn import functional as F -from iopaint.plugins.basicsr.arch_util import default_init_weights +from inpaint.plugins.basicsr.arch_util import default_init_weights class NormStyleCode(nn.Module): diff --git a/inpaint/plugins/gfpgan_plugin.py b/inpaint/plugins/gfpgan_plugin.py index 760f525..90db4d4 100644 --- a/inpaint/plugins/gfpgan_plugin.py +++ b/inpaint/plugins/gfpgan_plugin.py @@ -2,9 +2,9 @@ import cv2 import numpy as np from loguru import logger -from iopaint.helper import download_model -from iopaint.plugins.base_plugin import BasePlugin -from iopaint.schema import RunPluginRequest +from inpaint.helper import download_model +from inpaint.plugins.base_plugin import BasePlugin +from inpaint.schema import RunPluginRequest class GFPGANPlugin(BasePlugin): diff --git a/inpaint/plugins/interactive_seg.py b/inpaint/plugins/interactive_seg.py index 27859fa..f519584 100644 --- a/inpaint/plugins/interactive_seg.py +++ b/inpaint/plugins/interactive_seg.py @@ -5,13 +5,13 @@ import numpy as np import torch from loguru import logger -from iopaint.helper import download_model -from iopaint.plugins.base_plugin import BasePlugin -from iopaint.plugins.segment_anything import SamPredictor, sam_model_registry -from iopaint.plugins.segment_anything.predictor_hq import SamHQPredictor -from iopaint.plugins.segment_anything2.build_sam import build_sam2 -from iopaint.plugins.segment_anything2.sam2_image_predictor import SAM2ImagePredictor -from iopaint.schema import RunPluginRequest +from inpaint.helper import download_model +from inpaint.plugins.base_plugin import BasePlugin +from inpaint.plugins.segment_anything import SamPredictor, sam_model_registry +from inpaint.plugins.segment_anything.predictor_hq import SamHQPredictor +from inpaint.plugins.segment_anything2.build_sam import build_sam2 +from inpaint.plugins.segment_anything2.sam2_image_predictor import SAM2ImagePredictor +from inpaint.schema import RunPluginRequest # 从小到大 SEGMENT_ANYTHING_MODELS = { diff --git a/inpaint/plugins/realesrgan.py b/inpaint/plugins/realesrgan.py index 21e0a8f..272e486 100644 --- a/inpaint/plugins/realesrgan.py +++ b/inpaint/plugins/realesrgan.py @@ -7,9 +7,9 @@ from torch import nn import torch.nn.functional as F from loguru import logger -from iopaint.helper import download_model -from iopaint.plugins.base_plugin import BasePlugin -from iopaint.schema import RunPluginRequest, RealESRGANModel +from inpaint.helper import download_model +from inpaint.plugins.base_plugin import BasePlugin +from inpaint.schema import RunPluginRequest, RealESRGANModel class RealESRGANer: diff --git a/inpaint/plugins/remove_bg.py b/inpaint/plugins/remove_bg.py index 64bf785..ee790a5 100644 --- a/inpaint/plugins/remove_bg.py +++ b/inpaint/plugins/remove_bg.py @@ -4,8 +4,8 @@ import numpy as np from loguru import logger from torch.hub import get_dir -from iopaint.plugins.base_plugin import BasePlugin -from iopaint.schema import RunPluginRequest, RemoveBGModel +from inpaint.plugins.base_plugin import BasePlugin +from inpaint.schema import RunPluginRequest, RemoveBGModel class RemoveBG(BasePlugin): @@ -25,7 +25,7 @@ class RemoveBG(BasePlugin): def _init_session(self, model_name: str): if model_name == RemoveBGModel.briaai_rmbg_1_4: - from iopaint.plugins.briarmbg import ( + from inpaint.plugins.briarmbg import ( create_briarmbg_session, briarmbg_process, ) diff --git a/inpaint/plugins/restoreformer.py b/inpaint/plugins/restoreformer.py index 9bc3f07..4d9f0bc 100644 --- a/inpaint/plugins/restoreformer.py +++ b/inpaint/plugins/restoreformer.py @@ -2,9 +2,9 @@ import cv2 import numpy as np from loguru import logger -from iopaint.helper import download_model -from iopaint.plugins.base_plugin import BasePlugin -from iopaint.schema import RunPluginRequest +from inpaint.helper import download_model +from inpaint.plugins.base_plugin import BasePlugin +from inpaint.schema import RunPluginRequest class RestoreFormerPlugin(BasePlugin): diff --git a/inpaint/plugins/segment_anything/build_sam.py b/inpaint/plugins/segment_anything/build_sam.py index 9b905ef..339bc9f 100644 --- a/inpaint/plugins/segment_anything/build_sam.py +++ b/inpaint/plugins/segment_anything/build_sam.py @@ -8,7 +8,7 @@ import torch from functools import partial -from iopaint.plugins.segment_anything.modeling.tiny_vit_sam import TinyViT +from inpaint.plugins.segment_anything.modeling.tiny_vit_sam import TinyViT from .modeling import ( ImageEncoderViT, diff --git a/inpaint/runtime.py b/inpaint/runtime.py index e109528..4c9ce97 100644 --- a/inpaint/runtime.py +++ b/inpaint/runtime.py @@ -28,7 +28,7 @@ _CANDIDATES = [ "transformers", "opencv-python", "accelerate", - "iopaint", + "inpaint", "rembg", ] # Check once at runtime diff --git a/inpaint/tests/test_adjust_mask.py b/inpaint/tests/test_adjust_mask.py index 1f01713..2484448 100644 --- a/inpaint/tests/test_adjust_mask.py +++ b/inpaint/tests/test_adjust_mask.py @@ -1,6 +1,6 @@ import cv2 -from iopaint.helper import adjust_mask -from iopaint.tests.utils import current_dir, save_dir +from inpaint.helper import adjust_mask +from inpaint.tests.utils import current_dir, save_dir mask_p = current_dir / "overture-creations-5sI6fQgYIuo_mask.png" diff --git a/inpaint/tests/test_anytext.py b/inpaint/tests/test_anytext.py index 996176f..646e361 100644 --- a/inpaint/tests/test_anytext.py +++ b/inpaint/tests/test_anytext.py @@ -1,6 +1,6 @@ import os -from iopaint.tests.utils import check_device, get_config, assert_equal +from inpaint.tests.utils import check_device, get_config, assert_equal os.environ["PYTORCH_ENABLE_MPS_FALLBACK"] = "1" from pathlib import Path @@ -8,8 +8,8 @@ from pathlib import Path import pytest import torch -from iopaint.model_manager import ModelManager -from iopaint.schema import HDStrategy +from inpaint.model_manager import ModelManager +from inpaint.schema import HDStrategy current_dir = Path(__file__).parent.absolute().resolve() save_dir = current_dir / "result" diff --git a/inpaint/tests/test_brushnet.py b/inpaint/tests/test_brushnet.py index 73394c0..5320bc9 100644 --- a/inpaint/tests/test_brushnet.py +++ b/inpaint/tests/test_brushnet.py @@ -1,7 +1,7 @@ import os -from iopaint.const import SD_BRUSHNET_CHOICES -from iopaint.tests.utils import check_device, get_config, assert_equal +from inpaint.const import SD_BRUSHNET_CHOICES +from inpaint.tests.utils import check_device, get_config, assert_equal os.environ["PYTORCH_ENABLE_MPS_FALLBACK"] = "1" from pathlib import Path @@ -9,8 +9,8 @@ from pathlib import Path import pytest import torch -from iopaint.model_manager import ModelManager -from iopaint.schema import HDStrategy, SDSampler, PowerPaintTask +from inpaint.model_manager import ModelManager +from inpaint.schema import HDStrategy, SDSampler, PowerPaintTask current_dir = Path(__file__).parent.absolute().resolve() save_dir = current_dir / "result" diff --git a/inpaint/tests/test_controlnet.py b/inpaint/tests/test_controlnet.py index c271345..cca3c7f 100644 --- a/inpaint/tests/test_controlnet.py +++ b/inpaint/tests/test_controlnet.py @@ -1,7 +1,7 @@ import os -from iopaint.const import SD_CONTROLNET_CHOICES -from iopaint.tests.utils import current_dir, check_device, get_config, assert_equal +from inpaint.const import SD_CONTROLNET_CHOICES +from inpaint.tests.utils import current_dir, check_device, get_config, assert_equal os.environ["PYTORCH_ENABLE_MPS_FALLBACK"] = "1" from pathlib import Path @@ -9,8 +9,8 @@ from pathlib import Path import pytest import torch -from iopaint.model_manager import ModelManager -from iopaint.schema import HDStrategy, SDSampler +from inpaint.model_manager import ModelManager +from inpaint.schema import HDStrategy, SDSampler model_name = "runwayml/stable-diffusion-inpainting" diff --git a/inpaint/tests/test_instruct_pix2pix.py b/inpaint/tests/test_instruct_pix2pix.py index f1ab4e2..8c9ecc4 100644 --- a/inpaint/tests/test_instruct_pix2pix.py +++ b/inpaint/tests/test_instruct_pix2pix.py @@ -3,9 +3,9 @@ from pathlib import Path import pytest import torch -from iopaint.model_manager import ModelManager -from iopaint.schema import HDStrategy -from iopaint.tests.utils import get_config, check_device, assert_equal, current_dir +from inpaint.model_manager import ModelManager +from inpaint.schema import HDStrategy +from inpaint.tests.utils import get_config, check_device, assert_equal, current_dir model_name = "timbrooks/instruct-pix2pix" diff --git a/inpaint/tests/test_load_img.py b/inpaint/tests/test_load_img.py index f7071bf..f3ebb0b 100644 --- a/inpaint/tests/test_load_img.py +++ b/inpaint/tests/test_load_img.py @@ -1,5 +1,5 @@ -from iopaint.helper import load_img -from iopaint.tests.utils import current_dir +from inpaint.helper import load_img +from inpaint.tests.utils import current_dir png_img_p = current_dir / "image.png" jpg_img_p = current_dir / "bunny.jpeg" diff --git a/inpaint/tests/test_low_mem.py b/inpaint/tests/test_low_mem.py index e3c1b91..8a4f767 100644 --- a/inpaint/tests/test_low_mem.py +++ b/inpaint/tests/test_low_mem.py @@ -2,15 +2,15 @@ import os from loguru import logger -from iopaint.tests.utils import check_device, get_config, assert_equal, current_dir +from inpaint.tests.utils import check_device, get_config, assert_equal, current_dir os.environ["PYTORCH_ENABLE_MPS_FALLBACK"] = "1" import pytest import torch -from iopaint.model_manager import ModelManager -from iopaint.schema import HDStrategy, SDSampler +from inpaint.model_manager import ModelManager +from inpaint.schema import HDStrategy, SDSampler @pytest.mark.parametrize("device", ["cuda", "mps"]) diff --git a/inpaint/tests/test_match_histograms.py b/inpaint/tests/test_match_histograms.py index c20a283..000861c 100644 --- a/inpaint/tests/test_match_histograms.py +++ b/inpaint/tests/test_match_histograms.py @@ -1,9 +1,9 @@ import pytest import torch -from iopaint.model_manager import ModelManager -from iopaint.schema import SDSampler, HDStrategy -from iopaint.tests.utils import check_device, get_config, assert_equal, current_dir +from inpaint.model_manager import ModelManager +from inpaint.schema import SDSampler, HDStrategy +from inpaint.tests.utils import check_device, get_config, assert_equal, current_dir @pytest.mark.parametrize("device", ["cuda", "mps"]) diff --git a/inpaint/tests/test_model.py b/inpaint/tests/test_model.py index dd84b12..3805e23 100644 --- a/inpaint/tests/test_model.py +++ b/inpaint/tests/test_model.py @@ -1,9 +1,9 @@ import pytest import torch -from iopaint.model_manager import ModelManager -from iopaint.schema import HDStrategy, LDMSampler -from iopaint.tests.utils import assert_equal, get_config, current_dir, check_device +from inpaint.model_manager import ModelManager +from inpaint.schema import HDStrategy, LDMSampler +from inpaint.tests.utils import assert_equal, get_config, current_dir, check_device @pytest.mark.parametrize("device", ["cuda", "mps", "cpu"]) diff --git a/inpaint/tests/test_model_md5.py b/inpaint/tests/test_model_md5.py index 3a81d72..7850334 100644 --- a/inpaint/tests/test_model_md5.py +++ b/inpaint/tests/test_model_md5.py @@ -1,6 +1,6 @@ def test_load_model(): - from iopaint.plugins import InteractiveSeg - from iopaint.model_manager import ModelManager + from inpaint.plugins import InteractiveSeg + from inpaint.model_manager import ModelManager interactive_seg_model = InteractiveSeg("vit_l", "cpu") diff --git a/inpaint/tests/test_model_switch.py b/inpaint/tests/test_model_switch.py index 735e1bd..5cf1fd7 100644 --- a/inpaint/tests/test_model_switch.py +++ b/inpaint/tests/test_model_switch.py @@ -1,12 +1,12 @@ import os -from iopaint.schema import InpaintRequest +from inpaint.schema import InpaintRequest os.environ["PYTORCH_ENABLE_MPS_FALLBACK"] = "1" import torch -from iopaint.model_manager import ModelManager +from inpaint.model_manager import ModelManager def test_model_switch(): diff --git a/inpaint/tests/test_outpainting.py b/inpaint/tests/test_outpainting.py index ce48751..26eaf6a 100644 --- a/inpaint/tests/test_outpainting.py +++ b/inpaint/tests/test_outpainting.py @@ -1,15 +1,15 @@ import os -from iopaint.tests.utils import current_dir, check_device +from inpaint.tests.utils import current_dir, check_device os.environ["PYTORCH_ENABLE_MPS_FALLBACK"] = "1" import pytest import torch -from iopaint.model_manager import ModelManager -from iopaint.schema import SDSampler -from iopaint.tests.test_model import get_config, assert_equal +from inpaint.model_manager import ModelManager +from inpaint.schema import SDSampler +from inpaint.tests.test_model import get_config, assert_equal @pytest.mark.parametrize("name", ["runwayml/stable-diffusion-inpainting"]) diff --git a/inpaint/tests/test_paint_by_example.py b/inpaint/tests/test_paint_by_example.py index 9447138..96855bd 100644 --- a/inpaint/tests/test_paint_by_example.py +++ b/inpaint/tests/test_paint_by_example.py @@ -1,11 +1,11 @@ import cv2 import pytest from PIL import Image -from iopaint.helper import encode_pil_to_base64 +from inpaint.helper import encode_pil_to_base64 -from iopaint.model_manager import ModelManager -from iopaint.schema import HDStrategy -from iopaint.tests.utils import ( +from inpaint.model_manager import ModelManager +from inpaint.schema import HDStrategy +from inpaint.tests.utils import ( current_dir, get_config, get_data, diff --git a/inpaint/tests/test_plugins.py b/inpaint/tests/test_plugins.py index dd1eafd..862cd4d 100644 --- a/inpaint/tests/test_plugins.py +++ b/inpaint/tests/test_plugins.py @@ -1,17 +1,17 @@ import os from PIL import Image -from iopaint.helper import encode_pil_to_base64, gen_frontend_mask -from iopaint.plugins.anime_seg import AnimeSeg -from iopaint.schema import RunPluginRequest, RemoveBGModel, InteractiveSegModel -from iopaint.tests.utils import check_device, current_dir, save_dir +from inpaint.helper import encode_pil_to_base64, gen_frontend_mask +from inpaint.plugins.anime_seg import AnimeSeg +from inpaint.schema import RunPluginRequest, RemoveBGModel, InteractiveSegModel +from inpaint.tests.utils import check_device, current_dir, save_dir os.environ["PYTORCH_ENABLE_MPS_FALLBACK"] = "1" import cv2 import pytest -from iopaint.plugins import ( +from inpaint.plugins import ( RemoveBG, RealESRGANUpscaler, GFPGANPlugin, diff --git a/inpaint/tests/test_save_exif.py b/inpaint/tests/test_save_exif.py index 5c19810..35d62cb 100644 --- a/inpaint/tests/test_save_exif.py +++ b/inpaint/tests/test_save_exif.py @@ -5,7 +5,7 @@ from typing import List from PIL import Image -from iopaint.helper import pil_to_bytes, load_img +from inpaint.helper import pil_to_bytes, load_img current_dir = Path(__file__).parent.absolute().resolve() diff --git a/inpaint/tests/test_sd_model.py b/inpaint/tests/test_sd_model.py index 89eedb5..57d6d6b 100644 --- a/inpaint/tests/test_sd_model.py +++ b/inpaint/tests/test_sd_model.py @@ -2,7 +2,7 @@ import os from loguru import logger -from iopaint.tests.utils import check_device, get_config, assert_equal +from inpaint.tests.utils import check_device, get_config, assert_equal os.environ["PYTORCH_ENABLE_MPS_FALLBACK"] = "1" from pathlib import Path @@ -10,8 +10,8 @@ from pathlib import Path import pytest import torch -from iopaint.model_manager import ModelManager -from iopaint.schema import HDStrategy, SDSampler +from inpaint.model_manager import ModelManager +from inpaint.schema import HDStrategy, SDSampler current_dir = Path(__file__).parent.absolute().resolve() save_dir = current_dir / "result" diff --git a/inpaint/tests/test_sdxl.py b/inpaint/tests/test_sdxl.py index 8d5e5ab..560c302 100644 --- a/inpaint/tests/test_sdxl.py +++ b/inpaint/tests/test_sdxl.py @@ -1,15 +1,15 @@ import os -from iopaint.tests.utils import check_device, current_dir +from inpaint.tests.utils import check_device, current_dir os.environ["PYTORCH_ENABLE_MPS_FALLBACK"] = "1" import pytest import torch -from iopaint.model_manager import ModelManager -from iopaint.schema import HDStrategy, SDSampler -from iopaint.tests.test_model import get_config, assert_equal +from inpaint.model_manager import ModelManager +from inpaint.schema import HDStrategy, SDSampler +from inpaint.tests.test_model import get_config, assert_equal @pytest.mark.parametrize("device", ["cuda", "mps"]) diff --git a/inpaint/tests/utils.py b/inpaint/tests/utils.py index 92bc5ef..f21d0d0 100644 --- a/inpaint/tests/utils.py +++ b/inpaint/tests/utils.py @@ -3,7 +3,7 @@ import cv2 import pytest import torch -from iopaint.schema import LDMSampler, HDStrategy, InpaintRequest, SDSampler +from inpaint.schema import LDMSampler, HDStrategy, InpaintRequest, SDSampler import numpy as np current_dir = Path(__file__).parent.absolute().resolve()