fix bug of Lama

py/iopaint/model/instruct_pix2pix.py

@@ -3,9 +3,9 @@ import cv2
 import torch
 from loguru import logger
 
-from iopaint.const import INSTRUCT_PIX2PIX_NAME
+from ..const import INSTRUCT_PIX2PIX_NAME
 from .base import DiffusionInpaintModel
-from iopaint.schema import InpaintRequest
+from ..schema import InpaintRequest
 from .utils import get_torch_dtype, enable_low_mem, is_local_files_only
 
 

py/iopaint/model/kandinsky.py

@@ -3,9 +3,9 @@ import cv2
 import numpy as np
 import torch
 
-from iopaint.const import KANDINSKY22_NAME
+from ..const import KANDINSKY22_NAME
 from .base import DiffusionInpaintModel
-from iopaint.schema import InpaintRequest
+from ..schema import InpaintRequest
 from .utils import get_torch_dtype, enable_low_mem, is_local_files_only
 
 

py/iopaint/model/lama.py

@@ -4,13 +4,13 @@ import cv2
 import numpy as np
 import torch
 
-from iopaint.helper import (
+from ..helper import (
     norm_img,
     get_cache_path_by_url,
     load_jit_model,
     download_model,
 )
-from iopaint.schema import InpaintRequest
+from ..schema import InpaintRequest
 from .base import InpaintModel
 
 LAMA_MODEL_URL = os.environ.get(

py/iopaint/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 ..schema import InpaintRequest, LDMSampler
 
 torch.manual_seed(42)
 import torch.nn as nn
-from iopaint.helper import (
+from ..helper import (
     download_model,
     norm_img,
     get_cache_path_by_url,

py/iopaint/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 ..helper import get_cache_path_by_url, load_jit_model, download_model
 from .base import InpaintModel
-from iopaint.schema import InpaintRequest
+from ..schema import InpaintRequest
 
 
 MANGA_INPAINTOR_MODEL_URL = os.environ.get(

py/iopaint/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 ..helper import (
     load_model,
     get_cache_path_by_url,
     norm_img,
     download_model,
 )
-from iopaint.schema import InpaintRequest
+from ..schema import InpaintRequest
 from .base import InpaintModel
 from .utils import (
     setup_filter,

py/iopaint/model/mi_gan.py

@@ -3,7 +3,7 @@ import os
 import cv2
 import torch
 
-from iopaint.helper import (
+from ..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 ..schema import InpaintRequest
 
 MIGAN_MODEL_URL = os.environ.get(
     "MIGAN_MODEL_URL",

py/iopaint/model/opencv2.py

@@ -1,6 +1,6 @@
 import cv2
 from .base import InpaintModel
-from iopaint.schema import InpaintRequest
+from ..schema import InpaintRequest
 
 flag_map = {"INPAINT_NS": cv2.INPAINT_NS, "INPAINT_TELEA": cv2.INPAINT_TELEA}
 

py/iopaint/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 ..helper import decode_base64_to_image
 from .base import DiffusionInpaintModel
-from iopaint.schema import InpaintRequest
+from ..schema import InpaintRequest
 from .utils import get_torch_dtype, enable_low_mem, is_local_files_only
 
 

py/iopaint/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 ...schema import InpaintRequest
 from .powerpaint_tokenizer import add_task_to_prompt
 from ...const import POWERPAINT_NAME
 

py/iopaint/model/power_paint/powerpaint_tokenizer.py

@@ -5,7 +5,7 @@ import random
 from typing import Any, List, Optional, Union
 from transformers import CLIPTokenizer
 
-from iopaint.schema import PowerPaintTask
+from ...schema import PowerPaintTask
 
 
 def add_task_to_prompt(prompt, negative_prompt, task: PowerPaintTask):

py/iopaint/model/sd.py

@@ -12,7 +12,7 @@ from .utils import (
     enable_low_mem,
     is_local_files_only,
 )
-from iopaint.schema import InpaintRequest, ModelType
+from ..schema import InpaintRequest, ModelType
 
 
 class SD(DiffusionInpaintModel):

py/iopaint/model/sdxl.py

@@ -6,7 +6,7 @@ import torch
 from diffusers import AutoencoderKL
 from loguru import logger
 
-from iopaint.schema import InpaintRequest, ModelType
+from ..schema import InpaintRequest, ModelType
 
 from .base import DiffusionInpaintModel
 from .helper.cpu_text_encoder import CPUTextEncoderWrapper

py/iopaint/model/utils.py

@@ -25,7 +25,7 @@ from diffusers import (
 )
 from loguru import logger
 
-from iopaint.schema import SDSampler
+from ..schema import SDSampler
 from torch import conv2d, conv_transpose2d
 
 

py/iopaint/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 ..helper import get_cache_path_by_url, load_jit_model, download_model
+from ..schema import InpaintRequest
 import numpy as np
 
 from .base import InpaintModel

py/iopaint/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 ..helper import load_model
+from ..plugins.base_plugin import BasePlugin
+from ..schema import RunPluginRequest
 
 
 class REBNCONV(nn.Module):

py/iopaint/plugins/base_plugin.py

@@ -1,7 +1,7 @@
 from loguru import logger
 import numpy as np
 
-from iopaint.schema import RunPluginRequest
+from ..schema import RunPluginRequest
 
 
 class BasePlugin:

py/iopaint/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 ..helper import download_model
+from ..plugins.base_plugin import BasePlugin
+from ..schema import RunPluginRequest
 
 
 class GFPGANPlugin(BasePlugin):

py/iopaint/plugins/interactive_seg.py

@@ -5,11 +5,11 @@ 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.schema import RunPluginRequest
+from ..helper import download_model
+from ..plugins.base_plugin import BasePlugin
+from ..plugins.segment_anything import SamPredictor, sam_model_registry
+from ..plugins.segment_anything.predictor_hq import SamHQPredictor
+from ..schema import RunPluginRequest
 
 # 从小到大
 SEGMENT_ANYTHING_MODELS = {

py/iopaint/plugins/realesrgan.py

@@ -3,9 +3,9 @@ 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.schema import RunPluginRequest, RealESRGANModel
+from ..helper import download_model
+from ..plugins.base_plugin import BasePlugin
+from ..schema import RunPluginRequest, RealESRGANModel
 
 
 class RealESRGANUpscaler(BasePlugin):

py/iopaint/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 ..plugins.base_plugin import BasePlugin
+from ..schema import RunPluginRequest, RemoveBGModel
 
 
 class RemoveBG(BasePlugin):

py/iopaint/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 ..helper import download_model
+from ..plugins.base_plugin import BasePlugin
+from ..schema import RunPluginRequest
 
 
 class RestoreFormerPlugin(BasePlugin):

py/iopaint/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 ...plugins.segment_anything.modeling.tiny_vit_sam import TinyViT
 
 from .modeling import (
     ImageEncoderViT,

py/iopaint/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 ..helper import adjust_mask
+from ..tests.utils import current_dir, save_dir
 
 mask_p = current_dir / "overture-creations-5sI6fQgYIuo_mask.png"
 

py/iopaint/tests/test_anytext.py

@@ -1,6 +1,6 @@
 import os
 
-from iopaint.tests.utils import check_device, get_config, assert_equal
+from ..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 ..model_manager import ModelManager
+from ..schema import HDStrategy
 
 current_dir = Path(__file__).parent.absolute().resolve()
 save_dir = current_dir / "result"

py/iopaint/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 ..const import SD_CONTROLNET_CHOICES
+from ..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 ..model_manager import ModelManager
+from ..schema import HDStrategy, SDSampler
 
 
 model_name = "runwayml/stable-diffusion-inpainting"

py/iopaint/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 ..model_manager import ModelManager
+from ..schema import HDStrategy
+from ..tests.utils import get_config, check_device, assert_equal, current_dir
 
 model_name = "timbrooks/instruct-pix2pix"
 

py/iopaint/tests/test_load_img.py

@@ -1,5 +1,5 @@
-from iopaint.helper import load_img
-from iopaint.tests.utils import current_dir
+from ..helper import load_img
+from ..tests.utils import current_dir
 
 png_img_p = current_dir / "image.png"
 jpg_img_p = current_dir / "bunny.jpeg"

py/iopaint/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 ..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, FREEUConfig
+from ..model_manager import ModelManager
+from ..schema import HDStrategy, SDSampler, FREEUConfig
 
 
 @pytest.mark.parametrize("device", ["cuda", "mps"])

py/iopaint/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 ..model_manager import ModelManager
+from ..schema import SDSampler, HDStrategy
+from ..tests.utils import check_device, get_config, assert_equal, current_dir
 
 
 @pytest.mark.parametrize("device", ["cuda", "mps"])

py/iopaint/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 ..model_manager import ModelManager
+from ..schema import HDStrategy, LDMSampler
+from ..tests.utils import assert_equal, get_config, current_dir, check_device
 
 
 @pytest.mark.parametrize("device", ["cuda", "mps", "cpu"])

py/iopaint/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 ..plugins import InteractiveSeg
+    from ..model_manager import ModelManager
 
     interactive_seg_model = InteractiveSeg("vit_l", "cpu")
 

py/iopaint/tests/test_model_switch.py

@@ -1,12 +1,12 @@
 import os
 
-from iopaint.schema import InpaintRequest
+from ..schema import InpaintRequest
 
 os.environ["PYTORCH_ENABLE_MPS_FALLBACK"] = "1"
 
 import torch
 
-from iopaint.model_manager import ModelManager
+from ..model_manager import ModelManager
 
 
 def test_model_switch():

py/iopaint/tests/test_outpainting.py

@@ -1,6 +1,6 @@
 import os
 
-from iopaint.tests.utils import current_dir, check_device
+from ..tests.utils import current_dir, check_device
 
 os.environ["PYTORCH_ENABLE_MPS_FALLBACK"] = "1"
 from pathlib import Path
@@ -8,9 +8,9 @@ from pathlib import Path
 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 ..model_manager import ModelManager
+from ..schema import HDStrategy, SDSampler
+from ..tests.test_model import get_config, assert_equal
 
 
 @pytest.mark.parametrize("name", ["runwayml/stable-diffusion-inpainting"])

py/iopaint/tests/test_paint_by_example.py

@@ -2,9 +2,9 @@ import cv2
 import pytest
 from PIL import Image
 
-from iopaint.model_manager import ModelManager
-from iopaint.schema import HDStrategy
-from iopaint.tests.utils import (
+from ..model_manager import ModelManager
+from ..schema import HDStrategy
+from ..tests.utils import (
     current_dir,
     get_config,
     get_data,

py/iopaint/tests/test_plugins.py

@@ -3,17 +3,17 @@ import os
 import time
 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 ..helper import encode_pil_to_base64, gen_frontend_mask
+from ..plugins.anime_seg import AnimeSeg
+from ..schema import RunPluginRequest, RemoveBGModel, InteractiveSegModel
+from ..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 ..plugins import (
     RemoveBG,
     RealESRGANUpscaler,
     GFPGANPlugin,

py/iopaint/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 ..helper import pil_to_bytes, load_img
 
 current_dir = Path(__file__).parent.absolute().resolve()
 

py/iopaint/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 ..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, FREEUConfig
+from ..model_manager import ModelManager
+from ..schema import HDStrategy, SDSampler, FREEUConfig
 
 current_dir = Path(__file__).parent.absolute().resolve()
 save_dir = current_dir / "result"

py/iopaint/tests/test_sdxl.py

@@ -1,15 +1,15 @@
 import os
 
-from iopaint.tests.utils import check_device, current_dir
+from ..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, FREEUConfig
-from iopaint.tests.test_model import get_config, assert_equal
+from ..model_manager import ModelManager
+from ..schema import HDStrategy, SDSampler, FREEUConfig
+from ..tests.test_model import get_config, assert_equal
 
 
 @pytest.mark.parametrize("device", ["cuda", "mps"])

py/iopaint/tests/utils.py

@@ -3,8 +3,8 @@ import cv2
 import pytest
 import torch
 
-from iopaint.helper import encode_pil_to_base64
-from iopaint.schema import LDMSampler, HDStrategy, InpaintRequest, SDSampler
+from ..helper import encode_pil_to_base64
+from ..schema import LDMSampler, HDStrategy, InpaintRequest, SDSampler
 from PIL import Image
 
 current_dir = Path(__file__).parent.absolute().resolve()