Fixed bug, ComfyUI prohibited processes for installing recommended libraries have been removed
This commit is contained in:
-24
@@ -1,28 +1,4 @@
|
||||
import os
|
||||
import pkg_resources
|
||||
import sys
|
||||
import subprocess
|
||||
import importlib
|
||||
|
||||
def check_requirements_installed(requirements_path):
|
||||
with open(requirements_path, 'r') as f:
|
||||
requirements = [pkg_resources.Requirement.parse(line.strip()) for line in f if line.strip()]
|
||||
|
||||
installed_packages = {pkg.key: pkg for pkg in pkg_resources.working_set}
|
||||
installed_packages_set = set(installed_packages.keys())
|
||||
missing_packages = []
|
||||
for requirement in requirements:
|
||||
if requirement.key not in installed_packages_set or not installed_packages[requirement.key] in requirement:
|
||||
missing_packages.append(str(requirement))
|
||||
|
||||
if missing_packages:
|
||||
print(f"Missing or outdated packages: {', '.join(missing_packages)}")
|
||||
print("Installing/Updating missing packages...")
|
||||
subprocess.check_call([sys.executable, '-s', '-m', 'pip', 'install', *missing_packages])
|
||||
|
||||
requirements_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), "requirements.txt")
|
||||
check_requirements_installed(requirements_path)
|
||||
|
||||
from .install_init import init
|
||||
|
||||
init()
|
||||
|
||||
@@ -520,21 +520,30 @@ class ResizeImageAndMasks:
|
||||
result_optional_context_mask = []
|
||||
batch_size = image.shape[0]
|
||||
for b in range(batch_size):
|
||||
if b >= len(image) or image[b] is None or image[b].numel() == 0:
|
||||
if image is not None:
|
||||
if b >= len(image) or image[b] is None or image[b].numel() == 0:
|
||||
one_image = None
|
||||
else:
|
||||
one_image = image[b].unsqueeze(0)
|
||||
else:
|
||||
one_image = None
|
||||
else:
|
||||
one_image = image[b].unsqueeze(0)
|
||||
|
||||
if b >= len(mask) or mask[b] is None or mask[b].numel() == 0:
|
||||
if mask is not None:
|
||||
if b >= len(mask) or mask[b] is None or mask[b].numel() == 0:
|
||||
one_mask = None
|
||||
else:
|
||||
one_mask = mask[b].unsqueeze(0)
|
||||
else:
|
||||
one_mask = None
|
||||
else:
|
||||
one_mask = mask[b].unsqueeze(0)
|
||||
|
||||
if b >= len(optional_context_mask) or optional_context_mask[b] is None or optional_context_mask[b].numel() == 0:
|
||||
one_optional_context_mask = None
|
||||
if optional_context_mask is not None:
|
||||
if b >= len(optional_context_mask) or optional_context_mask[b] is None or optional_context_mask[b].numel() == 0:
|
||||
one_optional_context_mask = None
|
||||
else:
|
||||
one_optional_context_mask = optional_context_mask[b].unsqueeze(0)
|
||||
else:
|
||||
one_optional_context_mask = optional_context_mask[b].unsqueeze(0)
|
||||
|
||||
one_optional_context_mask = None
|
||||
|
||||
new_image, new_mask, new_optional_context_mask = preresize_imm(downscale_algorithm, upscale_algorithm, preresize_mode, preresize_min_width, preresize_min_height, preresize_max_width, preresize_max_height, one_image, one_mask, one_optional_context_mask)
|
||||
result_image.append(new_image)
|
||||
result_mask.append(new_mask)
|
||||
|
||||
Reference in New Issue
Block a user