diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..90a702d --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*cache* diff --git a/Custom_ComfyUI-YoloWorld-EfficientSAM/__init__.py b/Custom_ComfyUI-YoloWorld-EfficientSAM/__init__.py deleted file mode 100644 index c48ea66..0000000 --- a/Custom_ComfyUI-YoloWorld-EfficientSAM/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -from . import YOLO_WORLD_EfficientSAM -from . import YOLO_WORLD_SEGS - -NODE_CLASS_MAPPINGS = {**YOLO_WORLD_EfficientSAM.NODE_CLASS_MAPPINGS, **YOLO_WORLD_SEGS.NODE_CLASS_MAPPINGS} -NODE_DISPLAY_NAME_MAPPINGS = {**YOLO_WORLD_EfficientSAM.NODE_DISPLAY_NAME_MAPPINGS, **YOLO_WORLD_SEGS.NODE_DISPLAY_NAME_MAPPINGS} diff --git a/Custom_ComfyUI-YoloWorld-EfficientSAM/.gitignore b/Custom_ComfyUI_YoloWorld_EfficientSAM/.gitignore similarity index 100% rename from Custom_ComfyUI-YoloWorld-EfficientSAM/.gitignore rename to Custom_ComfyUI_YoloWorld_EfficientSAM/.gitignore diff --git a/Custom_ComfyUI-YoloWorld-EfficientSAM/LICENSE b/Custom_ComfyUI_YoloWorld_EfficientSAM/LICENSE similarity index 100% rename from Custom_ComfyUI-YoloWorld-EfficientSAM/LICENSE rename to Custom_ComfyUI_YoloWorld_EfficientSAM/LICENSE diff --git a/Custom_ComfyUI-YoloWorld-EfficientSAM/README.md b/Custom_ComfyUI_YoloWorld_EfficientSAM/README.md similarity index 100% rename from Custom_ComfyUI-YoloWorld-EfficientSAM/README.md rename to Custom_ComfyUI_YoloWorld_EfficientSAM/README.md diff --git a/Custom_ComfyUI-YoloWorld-EfficientSAM/YOLO_WORLD_EfficientSAM.py b/Custom_ComfyUI_YoloWorld_EfficientSAM/YOLO_WORLD_EfficientSAM.py similarity index 99% rename from Custom_ComfyUI-YoloWorld-EfficientSAM/YOLO_WORLD_EfficientSAM.py rename to Custom_ComfyUI_YoloWorld_EfficientSAM/YOLO_WORLD_EfficientSAM.py index 1c5adf6..1f58ff3 100644 --- a/Custom_ComfyUI-YoloWorld-EfficientSAM/YOLO_WORLD_EfficientSAM.py +++ b/Custom_ComfyUI_YoloWorld_EfficientSAM/YOLO_WORLD_EfficientSAM.py @@ -129,7 +129,7 @@ class Yoloworld_ESAM_Zho: RETURN_TYPES = ("IMAGE", "MASK", "STRING", "STRING") RETURN_NAMES = ("IMAGE", "MASK", "BBOX", "CATEGORIES") FUNCTION = "yoloworld_esam_image" - CATEGORY = "🔎YOLOWORLD_ESAM" + CATEGORY = "🔎YOLOWORLD_ESAM_DUCI" def yoloworld_esam_image(self, image, yolo_world_model, esam_model, categories, confidence_threshold, iou_threshold, box_thickness, text_thickness, text_scale, with_segmentation, mask_combined, with_confidence, with_class_agnostic_nms, mask_extracted, mask_extracted_index): categories = process_categories(categories) diff --git a/Custom_ComfyUI-YoloWorld-EfficientSAM/YOLO_WORLD_SEGS.py b/Custom_ComfyUI_YoloWorld_EfficientSAM/YOLO_WORLD_SEGS.py similarity index 100% rename from Custom_ComfyUI-YoloWorld-EfficientSAM/YOLO_WORLD_SEGS.py rename to Custom_ComfyUI_YoloWorld_EfficientSAM/YOLO_WORLD_SEGS.py diff --git a/Custom_ComfyUI-YoloWorld-EfficientSAM/YOLO_World_EfficientSAM_WORKFLOWS/YoloWorld-EfficientSAM V1.0 IMG 【Zho】.json b/Custom_ComfyUI_YoloWorld_EfficientSAM/YOLO_World_EfficientSAM_WORKFLOWS/YoloWorld-EfficientSAM V1.0 IMG 【Zho】.json similarity index 100% rename from Custom_ComfyUI-YoloWorld-EfficientSAM/YOLO_World_EfficientSAM_WORKFLOWS/YoloWorld-EfficientSAM V1.0 IMG 【Zho】.json rename to Custom_ComfyUI_YoloWorld_EfficientSAM/YOLO_World_EfficientSAM_WORKFLOWS/YoloWorld-EfficientSAM V1.0 IMG 【Zho】.json diff --git a/Custom_ComfyUI-YoloWorld-EfficientSAM/YOLO_World_EfficientSAM_WORKFLOWS/YoloWorld-EfficientSAM V1.0 VIDEO 【Zho】.json b/Custom_ComfyUI_YoloWorld_EfficientSAM/YOLO_World_EfficientSAM_WORKFLOWS/YoloWorld-EfficientSAM V1.0 VIDEO 【Zho】.json similarity index 100% rename from Custom_ComfyUI-YoloWorld-EfficientSAM/YOLO_World_EfficientSAM_WORKFLOWS/YoloWorld-EfficientSAM V1.0 VIDEO 【Zho】.json rename to Custom_ComfyUI_YoloWorld_EfficientSAM/YOLO_World_EfficientSAM_WORKFLOWS/YoloWorld-EfficientSAM V1.0 VIDEO 【Zho】.json diff --git a/Custom_ComfyUI-YoloWorld-EfficientSAM/YOLO_World_EfficientSAM_WORKFLOWS/YoloWorld-EfficientSAM V2.0 IMG 【Zho】.json b/Custom_ComfyUI_YoloWorld_EfficientSAM/YOLO_World_EfficientSAM_WORKFLOWS/YoloWorld-EfficientSAM V2.0 IMG 【Zho】.json similarity index 100% rename from Custom_ComfyUI-YoloWorld-EfficientSAM/YOLO_World_EfficientSAM_WORKFLOWS/YoloWorld-EfficientSAM V2.0 IMG 【Zho】.json rename to Custom_ComfyUI_YoloWorld_EfficientSAM/YOLO_World_EfficientSAM_WORKFLOWS/YoloWorld-EfficientSAM V2.0 IMG 【Zho】.json diff --git a/Custom_ComfyUI-YoloWorld-EfficientSAM/YOLO_World_EfficientSAM_WORKFLOWS/YoloWorld-EfficientSAM V2.0 VIDEO 【Zho】.json b/Custom_ComfyUI_YoloWorld_EfficientSAM/YOLO_World_EfficientSAM_WORKFLOWS/YoloWorld-EfficientSAM V2.0 VIDEO 【Zho】.json similarity index 100% rename from Custom_ComfyUI-YoloWorld-EfficientSAM/YOLO_World_EfficientSAM_WORKFLOWS/YoloWorld-EfficientSAM V2.0 VIDEO 【Zho】.json rename to Custom_ComfyUI_YoloWorld_EfficientSAM/YOLO_World_EfficientSAM_WORKFLOWS/YoloWorld-EfficientSAM V2.0 VIDEO 【Zho】.json diff --git a/Custom_ComfyUI-YoloWorld-EfficientSAM/check_sam.ipynb b/Custom_ComfyUI_YoloWorld_EfficientSAM/check_sam.ipynb similarity index 100% rename from Custom_ComfyUI-YoloWorld-EfficientSAM/check_sam.ipynb rename to Custom_ComfyUI_YoloWorld_EfficientSAM/check_sam.ipynb diff --git a/Custom_ComfyUI-YoloWorld-EfficientSAM/requirements.txt b/Custom_ComfyUI_YoloWorld_EfficientSAM/requirements.txt similarity index 100% rename from Custom_ComfyUI-YoloWorld-EfficientSAM/requirements.txt rename to Custom_ComfyUI_YoloWorld_EfficientSAM/requirements.txt diff --git a/Custom_ComfyUI-YoloWorld-EfficientSAM/utils/__init__.py b/Custom_ComfyUI_YoloWorld_EfficientSAM/utils/__init__.py similarity index 100% rename from Custom_ComfyUI-YoloWorld-EfficientSAM/utils/__init__.py rename to Custom_ComfyUI_YoloWorld_EfficientSAM/utils/__init__.py diff --git a/Custom_ComfyUI-YoloWorld-EfficientSAM/utils/efficient_sam.py b/Custom_ComfyUI_YoloWorld_EfficientSAM/utils/efficient_sam.py similarity index 100% rename from Custom_ComfyUI-YoloWorld-EfficientSAM/utils/efficient_sam.py rename to Custom_ComfyUI_YoloWorld_EfficientSAM/utils/efficient_sam.py diff --git a/Custom_ComfyUI-YoloWorld-EfficientSAM/utils/video.py b/Custom_ComfyUI_YoloWorld_EfficientSAM/utils/video.py similarity index 100% rename from Custom_ComfyUI-YoloWorld-EfficientSAM/utils/video.py rename to Custom_ComfyUI_YoloWorld_EfficientSAM/utils/video.py diff --git a/Custom_comfyui-llm-assistant/__init__.py b/Custom_comfyui-llm-assistant/__init__.py deleted file mode 100644 index 551a957..0000000 --- a/Custom_comfyui-llm-assistant/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -from .AssistantNodes import NODE_CLASS_MAPPINGS, NODE_DISPLAY_NAME_MAPPINGS - -__all__ = ['NODE_CLASS_MAPPINGS', 'NODE_DISPLAY_NAME_MAPPINGS'] \ No newline at end of file diff --git a/Custom_comfyui-llm-assistant/requirements.txt b/Custom_comfyui-llm-assistant/requirements.txt deleted file mode 100644 index 65d2ede..0000000 --- a/Custom_comfyui-llm-assistant/requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -pyyaml -openai \ No newline at end of file diff --git a/Custom_comfyui-llm-assistant/.github/workflows/publish.yml b/Custom_comfyui_llm_assistant/.github/workflows/publish.yml similarity index 100% rename from Custom_comfyui-llm-assistant/.github/workflows/publish.yml rename to Custom_comfyui_llm_assistant/.github/workflows/publish.yml diff --git a/Custom_comfyui-llm-assistant/.gitignore b/Custom_comfyui_llm_assistant/.gitignore similarity index 100% rename from Custom_comfyui-llm-assistant/.gitignore rename to Custom_comfyui_llm_assistant/.gitignore diff --git a/Custom_comfyui-llm-assistant/AssistantNodes.py b/Custom_comfyui_llm_assistant/AssistantNodes.py similarity index 96% rename from Custom_comfyui-llm-assistant/AssistantNodes.py rename to Custom_comfyui_llm_assistant/AssistantNodes.py index 792abe2..e0b558b 100644 --- a/Custom_comfyui-llm-assistant/AssistantNodes.py +++ b/Custom_comfyui_llm_assistant/AssistantNodes.py @@ -2,9 +2,6 @@ from .utils import * class GenerateStableDiffsutionPromptLLM: - def __init__(self): - pass - @classmethod def INPUT_TYPES(cls): data = load_config() @@ -101,7 +98,7 @@ class GenerateStableDiffsutionPromptLLM: FUNCTION = "generateStableDiffsutionPrompt" - CATEGORY = "LLM" + CATEGORY = "cropcropcropcrop" def generateStableDiffsutionPrompt(self, object1, desc_obj1, object2, desc_obj2 ,template_system, template_user, stop, response_pattern, temperature, max_tokens, model_name): config = load_config() @@ -331,13 +328,13 @@ class ChatWithLLM: NODE_CLASS_MAPPINGS = { - "Generate Stable Diffsution Prompt With LLM": GenerateStableDiffsutionPromptLLM, - "Translate Text With LLM": TranslateTextLLM, - "Chat With LLM": ChatWithLLM, + "Generate Stable Diffsution Prompt With LLM duci": GenerateStableDiffsutionPromptLLM, + # "Translate Text With LLM": TranslateTextLLM, + # "Chat With LLM": ChatWithLLM, } NODE_DISPLAY_NAME_MAPPINGS = { - "Generate Stable Diffsution Prompt With LLM": "Custom Generate Stable Diffsution Prompt With LLM", - "Translate Text With LLM": "Translate Text With LLM", - "Chat With LLM": "Chat With LLM", + "Generate Stable Diffsution Prompt With LLM duci": "HUHU", + # "Translate Text With LLM": "Translate Text With LLM", + # "Chat With LLM": "Chat With LLM", } diff --git a/Custom_comfyui-llm-assistant/README.md b/Custom_comfyui_llm_assistant/README.md similarity index 100% rename from Custom_comfyui-llm-assistant/README.md rename to Custom_comfyui_llm_assistant/README.md diff --git a/Custom_comfyui-llm-assistant/config.yaml b/Custom_comfyui_llm_assistant/config.yaml similarity index 100% rename from Custom_comfyui-llm-assistant/config.yaml rename to Custom_comfyui_llm_assistant/config.yaml diff --git a/Custom_comfyui-llm-assistant/pyproject.toml b/Custom_comfyui_llm_assistant/pyproject.toml similarity index 100% rename from Custom_comfyui-llm-assistant/pyproject.toml rename to Custom_comfyui_llm_assistant/pyproject.toml diff --git a/Custom_comfyui_llm_assistant/requirements.txt b/Custom_comfyui_llm_assistant/requirements.txt new file mode 100644 index 0000000..8fdf4de --- /dev/null +++ b/Custom_comfyui_llm_assistant/requirements.txt @@ -0,0 +1,2 @@ +# pyyaml +# openai \ No newline at end of file diff --git a/Custom_comfyui-llm-assistant/utils.py b/Custom_comfyui_llm_assistant/utils.py similarity index 100% rename from Custom_comfyui-llm-assistant/utils.py rename to Custom_comfyui_llm_assistant/utils.py diff --git a/README.md b/README.md index 410ce56..e9bc31b 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ Here, I introduce a complete pipeline that takes two images as input, allowing y 2. Install the required packages: ```bash - pip install -r requirements.txt + pip install -r myreqs.txt ``` 3. Clone these amazing repositories and follow their instructions: diff --git a/__init__.py b/__init__.py new file mode 100644 index 0000000..bee3c70 --- /dev/null +++ b/__init__.py @@ -0,0 +1,14 @@ +# from .Custom_ComfyUI_YoloWorld_EfficientSAM import YOLO_WORLD_EfficientSAM +# from .Custom_ComfyUI_YoloWorld_EfficientSAM import YOLO_WORLD_SEGS +from .Custom_comfyui_llm_assistant import AssistantNodes +from .CROP_OBJECT import crop + +# NODE_CLASS_MAPPINGS = {**YOLO_WORLD_EfficientSAM.NODE_CLASS_MAPPINGS, **YOLO_WORLD_SEGS.NODE_CLASS_MAPPINGS, **AssistantNodes.NODE_CLASS_MAPPINGS, **crop.NODE_CLASS_MAPPINGS} +# NODE_DISPLAY_NAME_MAPPINGS = {**YOLO_WORLD_EfficientSAM.NODE_DISPLAY_NAME_MAPPINGS, **YOLO_WORLD_SEGS.NODE_DISPLAY_NAME_MAPPINGS, **AssistantNodes.NODE_DISPLAY_NAME_MAPPINGS, **crop.NODE_DISPLAY_NAME_MAPPINGS} + + +NODE_CLASS_MAPPINGS = {**AssistantNodes.NODE_CLASS_MAPPINGS, **crop.NODE_CLASS_MAPPINGS} +NODE_DISPLAY_NAME_MAPPINGS = {**AssistantNodes.NODE_DISPLAY_NAME_MAPPINGS, **crop.NODE_DISPLAY_NAME_MAPPINGS} + +print(NODE_CLASS_MAPPINGS) +print(NODE_DISPLAY_NAME_MAPPINGS) \ No newline at end of file diff --git a/myreqs.txt b/myreqs.txt deleted file mode 100644 index ccad3e2..0000000 --- a/myreqs.txt +++ /dev/null @@ -1,41 +0,0 @@ -aiohttp==3.10.4 -aria2p==0.12.0 -einops==0.8.0 -GitPython==3.1.43 -intel_extension_for_pytorch==2.4.0 -kornia==0.7.3 -matrix_client==0.4.0 -nltk==3.9.1 -numpy==2.1.0 -ollama==0.3.1 -openai==1.42.0 -opencv_python==4.8.0.76 -opencv_python_headless==4.10.0.84 -Pillow==10.4.0 -psutil==5.9.0 -pygit2==1.15.1 -PyGithub==2.3.0 -pytest==8.3.2 -PyYAML==6.0.2 -Requests==2.32.3 -rich==13.7.1 -safetensors==0.4.4 -scipy==1.14.1 -sentencepiece==0.2.0 -scikit-image=0.24.0 -spandrel==0.3.4 -spandrel_extra_arches==0.1.1 -supervision==0.22.0 -torch==2.4.0 -torch_directml==0.2.4.dev240815 -torchaudio==2.4.0 -torchsde==0.2.6 -torchvision==0.19.0 -tqdm==4.66.4 -transformers==4.44.0 -typer==0.12.4 -typing_extensions==4.12.2 -ultralytics==8.2.78 -websocket_client==1.8.0 -xformers==0.0.27.post2 - diff --git a/requirements.txt b/requirements.txt index 8473065..304bf0c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,41 +1,27 @@ -aiohttp -aria2p -einops -GitPython -intel_extension_for_pytorch -kornia -matrix_client -nltk -numpy -ollama -openai -opencv_python -opencv_python_headless -Pillow -psutil -pygit2 -PyGithub -pytest -PyYAML -Requests -rich -safetensors -scipy -sentencepiece -scikit-image -spandrel -spandrel_extra_arches -supervision -torch -torch_directml -torchaudio -torchsde -torchvision -tqdm -transformers -typer -typing_extensions -ultralytics -websocket_client -xformers - +einops==0.8.0 +spandrel==0.3.4 +kornia==0.7.3 +nltk==3.9.1 +ollama==0.3.1 +openai==1.42.0 +opencv_python==4.8.0.76 +opencv_python_headless==4.10.0.84 +Pillow==10.4.0 +psutil==5.9.0 +PyYAML==6.0.2 +Requests==2.31.0 +safetensors==0.4.4 +scipy==1.14.1 +sentencepiece==0.2.0 +scikit-image==0.24.0 +supervision==0.22.0 +torch==2.4.0 +torchaudio==2.4.0 +torchsde==0.2.6 +torchvision==0.19.0 +tqdm==4.66.4 +transformers==4.44.0 +ultralytics==8.2.78 +websocket_client==1.8.0 +xformers==0.0.27.post2 +inference-gpu[yolo-world]==0.16.2