nodes/zombieyang-sd-ppp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

try solve duplicate import bug

Browse Source
This commit is contained in:
zombieyang
2025-02-14 08:32:40 +08:00
parent f1993eb2b1
commit cbd3d21994
2 changed files with 45 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
__init__.py
+40 -31
View File
@@ -40,6 +40,7 @@ def run_script(cmd, cwd='.'):
if __file__.find('custom_nodes') == -1:
print('sd-PPP import failed, it does not being placed in custom_nodes')
else:
try:
import socketio
@@ -50,37 +51,45 @@ else:
except:
run_script([sys.executable, "-m", "pip", "install", 'jsonpatch'])
from server import PromptServer
from .sdppp_python.sdppp import SDPPP
sdppp = SDPPP()
sdppp.attach_to_comfyui(PromptServer)
from comfy.cli_args import args
if (args.multi_user):
sdppp.extra_server_info['multi_user'] = True
from .sdppp_python.protocols.photoshop import ProtocolPhotoshop
ProtocolPhotoshop.set_sdppp_server(sdppp)
from .sdppp_python.comfy.nodes import define_comfyui_nodes
from .sdppp_python.comfy.nodes_legacy import define_comfyui_nodes_legacy
export_nodes_legacy = define_comfyui_nodes_legacy(sdppp)
export_nodes = define_comfyui_nodes(sdppp)
NODE_CLASS_MAPPINGS = {
'Get Image From Photoshop Layer': export_nodes_legacy['GetImageFromPhotoshopLayerNode'],
'Send Images To Photoshop': export_nodes_legacy['SendImageToPhotoshopLayerNode'],
'CLIP Text Encode PS Regional': export_nodes_legacy['CLIPTextEncodePSRegional'],
}
NODE_DISPLAY_NAME_MAPPINGS = {
'Get Image From Photoshop Layer': 'SDPPP Get Image From Photoshop',
'Send Images To Photoshop': 'SDPPP Send Images To Photoshop',
'CLIP Text Encode PS Regional': 'CLIP Text Encode PS Regional',
}
for (k, v) in export_nodes.items():
NODE_CLASS_MAPPINGS[k] = v
NODE_DISPLAY_NAME_MAPPINGS[k] = k
if SDPPP.is_attached():
print('sd-ppp is already attached')
NODE_CLASS_MAPPINGS = { }
NODE_DISPLAY_NAME_MAPPINGS = { }
WEB_DIRECTORY = 'javascript'
__all__ = ['NODE_CLASS_MAPPINGS', 'NODE_DISPLAY_NAME_MAPPINGS', 'WEB_DIRECTORY']
__all__ = ['NODE_CLASS_MAPPINGS', 'NODE_DISPLAY_NAME_MAPPINGS']
else:
from server import PromptServer
sdppp = SDPPP()
sdppp.attach_to_comfyui(PromptServer)
from comfy.cli_args import args
if (args.multi_user):
sdppp.extra_server_info['multi_user'] = True
from .sdppp_python.protocols.photoshop import ProtocolPhotoshop
ProtocolPhotoshop.set_sdppp_server(sdppp)
from .sdppp_python.comfy.nodes import define_comfyui_nodes
from .sdppp_python.comfy.nodes_legacy import define_comfyui_nodes_legacy
export_nodes_legacy = define_comfyui_nodes_legacy(sdppp)
export_nodes = define_comfyui_nodes(sdppp)
NODE_CLASS_MAPPINGS = {
'Get Image From Photoshop Layer': export_nodes_legacy['GetImageFromPhotoshopLayerNode'],
'Send Images To Photoshop': export_nodes_legacy['SendImageToPhotoshopLayerNode'],
'CLIP Text Encode PS Regional': export_nodes_legacy['CLIPTextEncodePSRegional'],
}
NODE_DISPLAY_NAME_MAPPINGS = {
'Get Image From Photoshop Layer': 'SDPPP Get Image From Photoshop',
'Send Images To Photoshop': 'SDPPP Send Images To Photoshop',
'CLIP Text Encode PS Regional': 'CLIP Text Encode PS Regional',
}
for (k, v) in export_nodes.items():
NODE_CLASS_MAPPINGS[k] = v
NODE_DISPLAY_NAME_MAPPINGS[k] = k
WEB_DIRECTORY = 'javascript'
__all__ = ['NODE_CLASS_MAPPINGS', 'NODE_DISPLAY_NAME_MAPPINGS', 'WEB_DIRECTORY']
sdppp_python/sdppp.py
+5
View File
@@ -4,11 +4,16 @@ from .instances import PPPInstance
from .apis import registerSocketEvents, registerComfyHTTPEndpoints, registerSDHTTPEndpoints
import re
import threading
from nodes import NODE_CLASS_MAPPINGS
# Define projectRoot as parent directory of current file
projectRoot = path.dirname(path.dirname(__file__))
class SDPPP:
@classmethod
def is_attached(cls):
return 'SDPPP Get Document' in NODE_CLASS_MAPPINGS
def __init__(self):
self.ppp_instances = dict()