Merge d11ad2852d into d057f2fae9

conflicting_old_reqs.txt

@@ -0,0 +1 @@
+opencv-contrib-python

launch.py

@@ -33,6 +33,7 @@ def prepare_environment():
     torch_command = os.environ.get('TORCH_COMMAND',
                                    f"pip install torch==2.1.0 torchvision==0.16.0 --extra-index-url {torch_index_url}")
     requirements_file = os.environ.get('REQS_FILE', "requirements_versions.txt")
+    conflicting_old_reqs_file = os.environ.get('CONF_REQS_FILE', "conflicting_old_reqs.txt")
 
     print(f"Python {sys.version}")
     print(f"Fooocus version: {fooocus_version.version}")
@@ -56,7 +57,12 @@ def prepare_environment():
                 run_pip(f"install -U -I --no-deps {xformers_package}", "xformers")
 
     if REINSTALL_ALL or not requirements_met(requirements_file):
-        run_pip(f"install -r \"{requirements_file}\"", "requirements")
+        run(
+            f'{python} -m pip uninstall -yr "{conflicting_old_reqs_file}"',
+            "Uninstalling old conflicting dependencies",
+            "Couldn't uninstall old conflicting dependencies"
+        )
+        run_pip(f'install -r "{requirements_file}"', "requirements")
 
     return
 
@@ -82,6 +88,7 @@ if args.gpu_device_id is not None:
     os.environ['CUDA_VISIBLE_DEVICES'] = str(args.gpu_device_id)
     print("Set device to:", args.gpu_device_id)
 
+from modules import config
 
 from modules import config
 

requirements_versions.txt

@@ -12,7 +12,7 @@ pytorch_lightning==1.9.4
 omegaconf==2.2.3
 gradio==3.41.2
 pygit2==1.12.2
-opencv-contrib-python==4.8.0.74
+opencv-contrib-python-headless==4.9.0.80
 httpx==0.24.1
 onnxruntime==1.16.3
 timm==0.9.2