diff --git a/installer.py b/installer.py index 91496ac49..9ad03a862 100644 --- a/installer.py +++ b/installer.py @@ -1050,6 +1050,7 @@ def install_optional(): install('basicsr') install('gfpgan') install('clean-fid') + install('pillow-jxl-plugin==1.3.1', ignore=True) install('optimum-quanto=0.2.6', ignore=True) install('bitsandbytes==0.45.0', ignore=True) install('pynvml', ignore=True) diff --git a/modules/loader.py b/modules/loader.py index 8980fd037..63c52d18c 100644 --- a/modules/loader.py +++ b/modules/loader.py @@ -72,7 +72,10 @@ logging.getLogger("diffusers.loaders.single_file").setLevel(logging.ERROR) timer.startup.record("diffusers") -import pillow_jxl # pylint: disable=W0611,C0411 +try: + import pillow_jxl # pylint: disable=W0611,C0411 +except: + pass from PIL import Image # pylint: disable=W0611,C0411 timer.startup.record("pillow") diff --git a/requirements.txt b/requirements.txt index 268082699..c8ed07a40 100644 --- a/requirements.txt +++ b/requirements.txt @@ -55,7 +55,6 @@ tokenizers==0.21.0 transformers==4.47.1 urllib3==1.26.19 Pillow==10.4.0 -pillow-jxl-plugin==1.3.0 timm==0.9.16 pydantic==1.10.15 pyparsing==3.1.4