diff --git a/TODO.md b/TODO.md index dce3ad49e..d20d250ea 100644 --- a/TODO.md +++ b/TODO.md @@ -13,11 +13,6 @@ Main ToDo list can be found at [GitHub projects](https://github.com/users/vladma - Video Core: API - Video LTX: TeaCache and others, API, Conditioning preprocess Video: LTX API -### Blocked items - -- Upgrade: `albumentations` - - blocked by `insightface` - ### Under Consideration - [X-Omni](https://github.com/X-Omni-Team/X-Omni/blob/main/README.md) diff --git a/installer.py b/installer.py index c0d8c7bad..ef1d2da95 100644 --- a/installer.py +++ b/installer.py @@ -1256,12 +1256,16 @@ def install_gradio(): def install_pydantic(): - if args.new: - install('pydantic==2.11.7', ignore=True, quiet=True) - reload('pydantic', '2.11.7') - else: - install('pydantic==1.10.21', ignore=True, quiet=True) - reload('pydantic', '1.10.21') + install('pydantic==2.11.7', ignore=True, quiet=True) + reload('pydantic', '2.11.7') + + +def install_insightface(): + install('git+https://github.com/deepinsight/insightface@29b6cd65aa0e9ae3b6602de3c52e9d8949c8ee86#subdirectory=python-package', 'insightface') # insightface==0.7.3 with patches + # install('albumentations==1.4.3', ignore=True, quiet=True) + uninstall('albumentations') + install('albumentationsx') + install_pydantic() def install_optional(): @@ -1277,8 +1281,6 @@ def install_optional(): install('nvidia-ml-py', ignore=True, quiet=True) install('ultralytics==8.3.40', ignore=True, quiet=True) install('Cython', ignore=True, quiet=True) - install('git+https://github.com/deepinsight/insightface@554a05561cb71cfebb4e012dfea48807f845a0c2#subdirectory=python-package', 'insightface') # insightface==0.7.3 with patches - install('albumentations==1.4.3', ignore=True, quiet=True) install('av', ignore=True, quiet=True) install('gguf', ignore=True) try: diff --git a/modules/face/insightface.py b/modules/face/insightface.py index b69648904..99be2d32e 100644 --- a/modules/face/insightface.py +++ b/modules/face/insightface.py @@ -10,11 +10,9 @@ instightface_mp = None def get_app(mp_name, threshold=0.5, resolution=640): global insightface_app, instightface_mp # pylint: disable=global-statement - from installer import install, installed, install_pydantic + from installer import install, installed, install_insightface if not installed('insightface', reload=False, quiet=True): - install('git+https://github.com/deepinsight/insightface@554a05561cb71cfebb4e012dfea48807f845a0c2#subdirectory=python-package', 'insightface') # insightface==0.7.3 with patches - install('albumentations==1.4.3', ignore=False, reinstall=True) - install_pydantic() + install_insightface() if not installed('ip_adapter', reload=False, quiet=True): install('git+https://github.com/tencent-ailab/IP-Adapter.git', 'ip_adapter', ignore=False) diff --git a/scripts/infiniteyou_ext.py b/scripts/infiniteyou_ext.py index e38185aa4..677d56cca 100644 --- a/scripts/infiniteyou_ext.py +++ b/scripts/infiniteyou_ext.py @@ -13,11 +13,9 @@ orig_pipeline, orig_prompt_attention = None, None def verify_insightface(): - from installer import installed, install, install_pydantic + from installer import installed, install_insightface if not installed('insightface', reload=False, quiet=True): - install('git+https://github.com/deepinsight/insightface@554a05561cb71cfebb4e012dfea48807f845a0c2#subdirectory=python-package', 'insightface') # insightface==0.7.3 with patches - install('albumentations==1.4.3', ignore=False, reinstall=True) - install_pydantic() + install_insightface() def load_infiniteyou(model: str): diff --git a/scripts/pulid_ext.py b/scripts/pulid_ext.py index a92480824..df9a099e6 100644 --- a/scripts/pulid_ext.py +++ b/scripts/pulid_ext.py @@ -28,11 +28,9 @@ class Script(scripts_manager.Script): return True def dependencies(self): - from installer import install, installed, install_pydantic - if not installed('insightface==0.7.3', reload=False, quiet=True): - install('git+https://github.com/deepinsight/insightface@554a05561cb71cfebb4e012dfea48807f845a0c2#subdirectory=python-package', 'insightface') # insightface==0.7.3 with patches - install('albumentations==1.4.3', ignore=False, reinstall=True) - install_pydantic() + from installer import installed, install_insightface + if not installed('insightface', reload=False, quiet=True): + install_insightface() def register(self): # register xyz grid elements global registered # pylint: disable=global-statement