diff --git a/fooocus_extras/face_crop.py b/fooocus_extras/face_crop.py index 702a2e7..e9d9092 100644 --- a/fooocus_extras/face_crop.py +++ b/fooocus_extras/face_crop.py @@ -1,7 +1,6 @@ import cv2 import numpy as np import modules.config -import facexlib.utils.face_restoration_helper as face_restoration_helper faceRestoreHelper = None @@ -26,7 +25,8 @@ def crop_image(img_rgb): global faceRestoreHelper if faceRestoreHelper is None: - faceRestoreHelper = face_restoration_helper.FaceRestoreHelper( + from facexlib.utils.face_restoration_helper import FaceRestoreHelper + faceRestoreHelper = FaceRestoreHelper( upscale_factor=1, model_rootpath=modules.config.path_controlnet, device='cpu' # use cpu is safer since we are out of fcbh management diff --git a/fooocus_version.py b/fooocus_version.py index e4555f1..7442b9b 100644 --- a/fooocus_version.py +++ b/fooocus_version.py @@ -1 +1 @@ -version = '2.1.795' +version = '2.1.796' diff --git a/modules/async_worker.py b/modules/async_worker.py index 102e461..ef5f655 100644 --- a/modules/async_worker.py +++ b/modules/async_worker.py @@ -28,6 +28,7 @@ def worker(): import modules.constants as constants import modules.advanced_parameters as advanced_parameters import fooocus_extras.ip_adapter as ip_adapter + import fooocus_extras.face_crop from modules.sdxl_styles import apply_style, apply_wildcards, fooocus_expansion from modules.private_logger import log @@ -544,8 +545,6 @@ def worker(): return for task in cn_tasks[flags.cn_ip_face]: cn_img, cn_stop, cn_weight = task - - import fooocus_extras.face_crop cn_img = fooocus_extras.face_crop.crop_image(HWC3(cn_img)) # https://github.com/tencent-ailab/IP-Adapter/blob/d580c50a291566bbf9fc7ac0f760506607297e6d/README.md?plain=1#L75