fix
This commit is contained in:
+5
-1
@@ -63,15 +63,19 @@ def initialization():
|
||||
try:
|
||||
import piexif
|
||||
except Exception:
|
||||
print("piexif not found, installing...")
|
||||
run_installation("piexif")
|
||||
try:
|
||||
import chardet
|
||||
except Exception:
|
||||
print("chardet not found, installing...")
|
||||
run_installation("chardet")
|
||||
try:
|
||||
from imgutils.tagging import get_wd14_tags
|
||||
except Exception:
|
||||
print("imgutils not found, installing...")
|
||||
for candidate in _imgutils_install_candidates():
|
||||
print(f"Trying to install {candidate}...")
|
||||
run_installation(candidate)
|
||||
try:
|
||||
from imgutils.tagging import get_wd14_tags # noqa: F401
|
||||
@@ -81,9 +85,9 @@ def initialization():
|
||||
try:
|
||||
from Crypto.PublicKey import RSA
|
||||
except Exception:
|
||||
print("pycryptodome not found, installing...")
|
||||
run_installation("pycryptodome")
|
||||
|
||||
|
||||
def run_installation(pkg_name: str):
|
||||
print(f"Installing {pkg_name}...")
|
||||
try:
|
||||
|
||||
@@ -20,7 +20,9 @@ _SKIP_INSTALL = os.environ.get("COMFYUI_LOGICUTILS_SKIP_INSTALL", "").strip().lo
|
||||
|
||||
if _IN_COMFYUI and not _SKIP_INSTALL:
|
||||
initialization()
|
||||
|
||||
else:
|
||||
print("Skipping ComfyUI-LogicUtils installation.")
|
||||
|
||||
from .logic_gates import CLASS_MAPPINGS as LogicMapping, CLASS_NAMES as LogicNames
|
||||
from .randomness import CLASS_MAPPINGS as RandomMapping, CLASS_NAMES as RandomNames
|
||||
from .conversion import CLASS_MAPPINGS as ConversionMapping, CLASS_NAMES as ConversionNames
|
||||
@@ -32,33 +34,33 @@ else:
|
||||
IONames = {}
|
||||
from .auxilary import CLASS_MAPPINGS as AuxilaryMapping, CLASS_NAMES as AuxilaryNames
|
||||
from .external import CLASS_MAPPINGS as ExternalMapping, CLASS_NAMES as ExternalNames
|
||||
|
||||
|
||||
|
||||
NODE_CLASS_MAPPINGS = {
|
||||
}
|
||||
NODE_CLASS_MAPPINGS.update(IOMapping)
|
||||
NODE_CLASS_MAPPINGS.update(LogicMapping)
|
||||
NODE_CLASS_MAPPINGS.update(RandomMapping)
|
||||
NODE_CLASS_MAPPINGS.update(ConversionMapping)
|
||||
NODE_CLASS_MAPPINGS.update(MathMapping)
|
||||
NODE_CLASS_MAPPINGS.update(ExternalMapping)
|
||||
NODE_CLASS_MAPPINGS.update(AuxilaryMapping)
|
||||
|
||||
|
||||
|
||||
NODE_DISPLAY_NAME_MAPPINGS = {
|
||||
|
||||
}
|
||||
NODE_DISPLAY_NAME_MAPPINGS.update(IONames)
|
||||
NODE_DISPLAY_NAME_MAPPINGS.update(LogicNames)
|
||||
NODE_DISPLAY_NAME_MAPPINGS.update(RandomNames)
|
||||
NODE_DISPLAY_NAME_MAPPINGS.update(ConversionNames)
|
||||
NODE_DISPLAY_NAME_MAPPINGS.update(MathNames)
|
||||
NODE_DISPLAY_NAME_MAPPINGS.update(ExternalNames)
|
||||
NODE_DISPLAY_NAME_MAPPINGS.update(AuxilaryNames)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
NODE_CLASS_MAPPINGS = {
|
||||
}
|
||||
NODE_CLASS_MAPPINGS.update(IOMapping)
|
||||
NODE_CLASS_MAPPINGS.update(LogicMapping)
|
||||
NODE_CLASS_MAPPINGS.update(RandomMapping)
|
||||
NODE_CLASS_MAPPINGS.update(ConversionMapping)
|
||||
NODE_CLASS_MAPPINGS.update(MathMapping)
|
||||
NODE_CLASS_MAPPINGS.update(ExternalMapping)
|
||||
NODE_CLASS_MAPPINGS.update(AuxilaryMapping)
|
||||
|
||||
|
||||
|
||||
NODE_DISPLAY_NAME_MAPPINGS = {
|
||||
|
||||
}
|
||||
NODE_DISPLAY_NAME_MAPPINGS.update(IONames)
|
||||
NODE_DISPLAY_NAME_MAPPINGS.update(LogicNames)
|
||||
NODE_DISPLAY_NAME_MAPPINGS.update(RandomNames)
|
||||
NODE_DISPLAY_NAME_MAPPINGS.update(ConversionNames)
|
||||
NODE_DISPLAY_NAME_MAPPINGS.update(MathNames)
|
||||
NODE_DISPLAY_NAME_MAPPINGS.update(ExternalNames)
|
||||
NODE_DISPLAY_NAME_MAPPINGS.update(AuxilaryNames)
|
||||
|
||||
|
||||
try:
|
||||
from .pystructure import CLASS_MAPPINGS as PyStructureMapping, CLASS_NAMES as PyStructureNames
|
||||
NODE_CLASS_MAPPINGS.update(PyStructureMapping)
|
||||
|
||||
Reference in New Issue
Block a user