diff --git a/CLIPTextEncodeWildcards.py b/CLIPTextEncodeWildcards.py index 5b27315..2444f47 100644 --- a/CLIPTextEncodeWildcards.py +++ b/CLIPTextEncodeWildcards.py @@ -1,11 +1,12 @@ import os, glob, sys import random import re -from .wildcards import * +from .wildcards import wildcards #import wildcards print("wildcards_ComfyUI") #print(os.getcwd()) +print(f"CLIPTextEncodeWildcards __name__ {__name__}") class CLIPTextEncodeWildcards: @classmethod diff --git a/Colors.py b/Colors.py index bae5459..09829f1 100644 --- a/Colors.py +++ b/Colors.py @@ -1,3 +1,7 @@ + + +print(f"Colors __name__ {__name__}") + class Colors: BLACK = '\033[30m' #Colors.BLACK RED = '\033[31m' #Colors.BLACK @@ -24,7 +28,7 @@ def cprint(text,color=None): else: print(text) -#from .Colors import cprint, Colors as Colors +#from Colors import cprint, Colors as Colors import os py_name=os.path.basename(__file__) cprint(py_name, Colors.BLUE) diff --git a/SaveImageSimple.py b/SaveImageSimple.py index f04ccff..ccd5428 100644 --- a/SaveImageSimple.py +++ b/SaveImageSimple.py @@ -5,7 +5,7 @@ import json import time -from .Colors import cprint, Colors as Colors +from .Colors import cprint, Colors import os, sys py_name=os.path.basename(__file__) cprint(py_name, Colors.BLUE) diff --git a/SimpleSampler.py b/SimpleSampler.py index 2ddef60..30a5684 100644 --- a/SimpleSampler.py +++ b/SimpleSampler.py @@ -21,6 +21,8 @@ from PIL import Image from PIL.PngImagePlugin import PngInfo import numpy as np +print(f"SimpleSampler __name__ {__name__}") +print(f"SimpleSampler __file__ {os.path.splitext(os.path.basename(__file__))[0]}") from .Colors import cprint, Colors as Colors import os @@ -31,7 +33,7 @@ cprint(py_name, Colors.BLUE) # wildcards support check wildcardsOn=False try: - from .wildcards import * + from wildcards import * wildcardsOn=True #wildcards.card_path=os.path.dirname(__file__)+"\\..\\wildcards\\**\\*.txt" cprint(f"{py_name} : import wildcards succ", Colors.GREEN ) diff --git a/__init__.py b/__init__.py index 8ec5657..7e5034d 100644 --- a/__init__.py +++ b/__init__.py @@ -1,5 +1,11 @@ -from .Colors import cprint, Colors as Colors import os +#from ComfyUI_script import mypath + +print(f"init __name__ {__name__}") +print(f"init __file__ {os.path.splitext(os.path.basename(__file__))[0]}") + +from .Colors import cprint, Colors as Colors + py_name=os.path.basename(__file__) cprint(py_name, Colors.BLUE) @@ -53,6 +59,8 @@ if not md.startswith("custom_nodes."): except Exception as e: cprint(f"Load fail : {name}",Colors.YELLOW) cprint(f"Exception : {e}",Colors.YELLOW) + err_msg = traceback.format_exc() + cprint(err_msg,Colors.YELLOW) add("CheckpointLoaderRandom") add("CheckpointLoaderSimpleText") diff --git a/mypath.py b/mypath.py index ff3a281..af6bb10 100644 --- a/mypath.py +++ b/mypath.py @@ -1,5 +1,10 @@ -from .Colors import cprint, Colors as Colors import os, sys + +if __name__ == os.path.splitext(os.path.basename(__file__))[0] : + from Colors import cprint, Colors as Colors +else: + from .Colors import cprint, Colors as Colors + py_name=os.path.basename(__file__) cprint(py_name, Colors.BLUE) diff --git a/wildcards.py b/wildcards.py index 1b4637d..8d89c65 100644 --- a/wildcards.py +++ b/wildcards.py @@ -1,13 +1,16 @@ import glob, sys import random import re +import os + +print(f"init __name__ {__name__}") +print(f"init __file__ {os.path.splitext(os.path.basename(__file__))[0]}") + #import wildcards -if __name__ == '__main__' : - print("nain") +if __name__ == os.path.splitext(os.path.basename(__file__))[0] : from Colors import cprint, Colors as Colors else: from .Colors import cprint, Colors as Colors -import os py_name=os.path.basename(__file__) cprint(py_name, Colors.BLUE) #print(os.getcwd())