v2.1

Dockerfile

@@ -1,26 +1,40 @@
 # Base image with Python
 FROM python:3.10
 
-# Install git
-RUN apt-get update && apt-get install -y git
+# Install git and curl (for internet connectivity test)
+RUN apt-get update && apt-get install -y git curl
 
 WORKDIR /home/user/app
 
 # Copy all files to the container
 COPY . .
 
-# Clone custom node repositories with error handling and debug output
+# Test internet connectivity
+RUN echo "Testing internet connectivity..." && \
+    curl -Is http://www.github.com | head -n 1 || \
+    (echo "Internet connectivity test failed. Check network settings." && exit 1)
+
+# Clone custom node repositories with retries and debug output
 RUN echo "Cloning ComfyUI-YoloWorld-EfficientSAM..." && \
-    git clone https://github.com/Fannovel16/ComfyUI-YoloWorld-EfficientSAM.git custom_nodes/ComfyUI-YoloWorld-EfficientSAM || \
-    echo "Failed to clone ComfyUI-YoloWorld-EfficientSAM"
+    for i in 1 2 3; do \
+        git clone https://github.com/Fannovel16/ComfyUI-YoloWorld-EfficientSAM.git custom_nodes/ComfyUI-YoloWorld-EfficientSAM && break || \
+        (echo "Attempt $i failed. Retrying..." && sleep 5); \
+    done || \
+    (echo "Failed to clone ComfyUI-YoloWorld-EfficientSAM after 3 attempts" && exit 1)
 
 RUN echo "Cloning comfyui-inpaint-nodes..." && \
-    git clone https://github.com/Acly/comfyui-inpaint-nodes.git custom_nodes/comfyui-inpaint-nodes || \
-    echo "Failed to clone comfyui-inpaint-nodes"
+    for i in 1 2 3; do \
+        git clone https://github.com/Acly/comfyui-inpaint-nodes.git custom_nodes/comfyui-inpaint-nodes && break || \
+        (echo "Attempt $i failed. Retrying..." && sleep 5); \
+    done || \
+    (echo "Failed to clone comfyui-inpaint-nodes after 3 attempts" && exit 1)
 
 RUN echo "Cloning rgthree-comfy..." && \
-    git clone https://github.com/rgthree/rgthree-comfy.git custom_nodes/rgthree-comfy || \
-    echo "Failed to clone rgthree-comfy"
+    for i in 1 2 3; do \
+        git clone https://github.com/rgthree/rgthree-comfy.git custom_nodes/rgthree-comfy && break || \
+        (echo "Attempt $i failed. Retrying..." && sleep 5); \
+    done || \
+    (echo "Failed to clone rgthree-comfy after 3 attempts" && exit 1)
 
 # List contents of custom_nodes/ for debugging
 RUN echo "Contents of custom_nodes/:" && \

app.py

@@ -6,20 +6,26 @@ from typing import Sequence, Mapping, Any, Union
 import gradio as gr
 from huggingface_hub import hf_hub_download
 import spaces
-import sys 
 from comfy import model_management
 from nodes import NODE_CLASS_MAPPINGS
 
-import sys
+# Debug: Verify comfy/ directory
+print("Contents of comfy/ directory:", os.listdir('comfy') if os.path.exists('comfy') else "comfy directory not found")
+try:
+    from comfy import nodes
+    print("Successfully imported comfy.nodes")
+except Exception as e:
+    print(f"Failed to import comfy.nodes: {str(e)}")
+
 # Ensure /home/user/app/ is searched before /home/user/app/comfy/
 sys.path.insert(0, '/home/user/app')
 print("Modified sys.path:", sys.path)
 
 print("Starting Space...")
 
-os.makedirs('models/ultralytics/bbox',exist_ok=True)
-os.makedirs('models/inpaint',exist_ok=True)
-os.makedirs('models/sams',exist_ok=True)
+os.makedirs('models/ultralytics/bbox', exist_ok=True)
+os.makedirs('models/inpaint', exist_ok=True)
+os.makedirs('models/sams', exist_ok=True)
 
 def download_model(repo_id, filename, local_dir):
     local_path = os.path.join(local_dir, filename)
@@ -28,43 +34,18 @@ def download_model(repo_id, filename, local_dir):
     else:
         print(f"Model {filename} already exists. Skipping download.")
 
-
 download_model("Acly/MAT", "MAT_Places512_G_fp16.safetensors", "models/inpaint")
-
 download_model("stabilityai/sd-vae-ft-mse-original", "vae-ft-mse-840000-ema-pruned.safetensors", "models/vae")
-
 download_model("Ultralytics/YOLOv8", "yolov8m.pt", "models/ultralytics/bbox")
-
 download_model("xingren23/comfyflow-models", "sams/sam_vit_b_01ec64.pth", "models/sams")
 
+# Comment out JIT file downloads since we're cloning the repository
+# download_model("camenduru/YoloWorld-EfficientSAM", "efficient_sam_s_cpu.jit", "custom_nodes/ComfyUI-YoloWorld-EfficientSAM")
+# download_model("camenduru/YoloWorld-EfficientSAM", "efficient_sam_s_gpu.jit", "custom_nodes/ComfyUI-YoloWorld-EfficientSAM")
 
-# ------ JIT's Files -------- ( Added already manually )
-
-download_model("camenduru/YoloWorld-EfficientSAM", "efficient_sam_s_cpu.jit", "custom_nodes/ComfyUI-YoloWorld-EfficientSAM")
-
-download_model("camenduru/YoloWorld-EfficientSAM", "efficient_sam_s_gpu.jit", "custom_nodes/ComfyUI-YoloWorld-EfficientSAM")
-
-
-print("Downloaded Models") 
+print("Downloaded Models")
 
 def get_value_at_index(obj: Union[Sequence, Mapping], index: int) -> Any:
-    """Returns the value at the given index of a sequence or mapping.
-
-    If the object is a sequence (like list or string), returns the value at the given index.
-    If the object is a mapping (like a dictionary), returns the value at the index-th key.
-
-    Some return a dictionary, in these cases, we look for the "results" key
-
-    Args:
-        obj (Union[Sequence, Mapping]): The object to retrieve the value from.
-        index (int): The index of the value to retrieve.
-
-    Returns:
-        Any: The value at the given index.
-
-    Raises:
-        IndexError: If the index is out of bounds for the object and the object is not a mapping.
-    """
     if obj is None:
         raise ValueError("Object is None, cannot retrieve index.")
     try:
@@ -72,37 +53,19 @@ def get_value_at_index(obj: Union[Sequence, Mapping], index: int) -> Any:
     except (KeyError, IndexError, TypeError):
         return obj.get("result", [])[index] if isinstance(obj, dict) and "result" in obj else None
 
-
 def find_path(name: str, path: str = None) -> str:
-    """
-    Recursively looks at parent folders starting from the given path until it finds the given name.
-    Returns the path as a Path object if found, or None otherwise.
-    """
-    # If no path is given, use the current working directory
     if path is None:
         path = os.getcwd()
-
-    # Check if the current directory contains the name
     if name in os.listdir(path):
         path_name = os.path.join(path, name)
         print(f"{name} found: {path_name}")
         return path_name
-
-    # Get the parent directory
     parent_directory = os.path.dirname(path)
-
-    # If the parent directory is the same as the current directory, we've reached the root and stop the search
     if parent_directory == path:
         return None
-
-    # Recursively call the function with the parent directory
     return find_path(name, parent_directory)
 
-
 def add_comfyui_directory_to_sys_path() -> None:
-    """
-    Add 'ComfyUI' to the sys.path
-    """
     comfyui_path = find_path("ComfyUI")
     if comfyui_path and os.path.isdir(comfyui_path):
         sys.path.append(comfyui_path)
@@ -110,7 +73,6 @@ def add_comfyui_directory_to_sys_path() -> None:
     else:
         print("⚠️ Warning: 'ComfyUI' directory not found. Ensure it is installed properly.")
 
-
 def add_extra_model_paths() -> None:
     load_extra_path_config = None
     try:
@@ -127,17 +89,12 @@ def add_extra_model_paths() -> None:
     else:
         print("Skipping extra model paths: config file or loader function not found.")
 
-
-# add_comfyui_directory_to_sys_path()
 add_extra_model_paths()
-
 print("Model paths added")
 
 import app_utils
 print("app_utils package imported:", app_utils)
-# print("app_utils.__path__:", app_utils.__path__)
 
-# Update debug prints
 print("App_utils directory contents:", os.listdir('app_utils') if os.path.exists('app_utils') else "app_utils not found")
 print("Parent app_utils directory contents:", os.listdir('../app_utils') if os.path.exists('../app_utils') else "parent app_utils not found")
 print("------------------")
@@ -154,7 +111,6 @@ try:
 except ImportError as e:
     print("Failed to import app_utils:", e)
 
-# Later in the file, update the debug prints again
 print("App_utils directory contents:", os.listdir('app_utils') if os.path.exists('app_utils') else "app_utils not found")
 print("Parent app_utils directory contents:", os.listdir('../app_utils') if os.path.exists('../app_utils') else "parent app_utils not found")
 
@@ -171,11 +127,6 @@ except ImportError as e:
     print("Failed to import utils:", e)
 
 def import_custom_nodes() -> None:
-    """Find all custom nodes in the custom_nodes folder and add those node objects to NODE_CLASS_MAPPINGS
-
-    This function sets up a new asyncio event loop, initializes the PromptServer,
-    creates a PromptQueue, and initializes the custom nodes.
-    """
     import asyncio
     import execution
     from nodes import init_extra_nodes
@@ -183,6 +134,25 @@ def import_custom_nodes() -> None:
     import importlib.util
     import traceback
 
+    # Creating a new event loop and setting it as the default loop
+    loop = asyncio.new_event_loop()
+    asyncio.set_event_loop(loop)
+
+    NODE_CLASS_MAPPINGS.clear()  # Clear previous mappings
+    print("Reloading built-in nodes...")
+
+    # Creating an instance of PromptServer with the loop
+    server_instance = server.PromptServer(loop)
+    execution.PromptQueue(server_instance)
+
+    # Load built-in nodes first
+    try:
+        init_extra_nodes()
+        print("Built-in Nodes Loaded:", NODE_CLASS_MAPPINGS.keys())
+    except Exception as e:
+        print(f"Error loading built-in nodes: {str(e)}")
+        traceback.print_exc()
+
     # Debug: List contents of custom_nodes/
     print("Custom nodes directory contents:", os.listdir('custom_nodes'))
     for node_dir in os.listdir('custom_nodes'):
@@ -208,28 +178,16 @@ def import_custom_nodes() -> None:
                     print(f"Failed to import {node_dir}: {str(e)}")
                     traceback.print_exc()
 
-    # Creating a new event loop and setting it as the default loop
-    loop = asyncio.new_event_loop()
-    asyncio.set_event_loop(loop)
-
-    NODE_CLASS_MAPPINGS.clear()  # Clear previous mappings
+    # Load custom nodes (re-run init_extra_nodes to include custom nodes)
     print("Reloading custom nodes...")
-
-    # Creating an instance of PromptServer with the loop
-    server_instance = server.PromptServer(loop)
-    execution.PromptQueue(server_instance)
-
-    # Initializing custom nodes
     try:
         init_extra_nodes()
     except Exception as e:
         print(f"Error in init_extra_nodes(): {str(e)}")
         traceback.print_exc()
 
-    print("Custom Nodes Loaded:", NODE_CLASS_MAPPINGS.keys())
-
+    print("All Nodes Loaded:", NODE_CLASS_MAPPINGS.keys())
 
-import sys
 print("Current working directory:", os.getcwd())
 print("Current directory contents:", os.listdir('.'))
 print("Parent directory contents:", os.listdir('..') if os.path.exists('..') else "No parent directory")
@@ -238,9 +196,8 @@ print("Utils directory contents:", os.listdir('utils') if os.path.exists('utils'
 print("Parent utils directory contents:", os.listdir('../utils') if os.path.exists('../utils') else "parent utils not found")
 import_custom_nodes()
 
-
 @spaces.GPU(duration=120)
-def object_remover(object_name, image) :
+def object_remover(object_name, image):
     import_custom_nodes()
     with torch.inference_mode():
         loadimage_1 = loadimage.load_image(image=image)
@@ -271,7 +228,6 @@ def object_remover(object_name, image) :
             mask=get_value_at_index(yoloworld_esam_zho_2, 1),
         )
 
-
         loadimage = NODE_CLASS_MAPPINGS["LoadImage"]()
 
         inpaint_inpaintwithmodel = NODE_CLASS_MAPPINGS["INPAINT_InpaintWithModel"]()
@@ -282,7 +238,6 @@ def object_remover(object_name, image) :
             mask=get_value_at_index(growmask_8, 0),
         )
 
-
         vaeencode = NODE_CLASS_MAPPINGS["VAEEncode"]()
         vaeencode_18 = vaeencode.encode(
             pixels=get_value_at_index(inpaint_inpaintwithmodel_12, 0),
@@ -322,7 +277,6 @@ def object_remover(object_name, image) :
                 raise ValueError("Image generation failed. Check model inputs.")
     return "Error: Image generation failed."
 
-
 # Check for all required custom nodes
 required_nodes = [
     "Yoloworld_ModelLoader_Zho",
@@ -373,9 +327,8 @@ vaedecode = NODE_CLASS_MAPPINGS["VAEDecode"]()
 image_comparer_rgthree = NODE_CLASS_MAPPINGS["Image Comparer (rgthree)"]()
 saveimage = NODE_CLASS_MAPPINGS["SaveImage"]()
 
-
-#Add all the models that load a safetensors file
-model_loaders = [yoloworld_modelloader_zho_3,esam_modelloader_zho_4,inpaint_loadinpaintmodel_13,vaeloader_20]
+# Add all the models that load a safetensors file
+model_loaders = [yoloworld_modelloader_zho_3, esam_modelloader_zho_4, inpaint_loadinpaintmodel_13, vaeloader_20]
 
 # Check which models are valid and how to best load them
 valid_models = [
@@ -384,24 +337,19 @@ valid_models = [
     if not isinstance(loader[0], dict) and not isinstance(getattr(loader[0], 'patcher', None), dict)
 ]
 
-#Finally loads the models
+# Finally load the models
 device = "cuda" if torch.cuda.is_available() else "cpu"
 model_management.load_models_gpu(valid_models) if device == "cuda" else model_management.load_models_cpu(valid_models)
 
-
 with gr.Blocks() as app:
     gr.Markdown("# Object Remover")
-
     with gr.Column():
-        image = gr.Image(label="Image",type="filepath")
+        image = gr.Image(label="Image", type="filepath")
         object_name = gr.Textbox(label="Obj_name")
     generate = gr.Button("Generate")
     with gr.Column():
         output = gr.Image(label="output")
-    generate.click(fn=object_remover,inputs=[image,object_name],outputs=[output])
-
+    generate.click(fn=object_remover, inputs=[image, object_name], outputs=[output])
 
 print("Launching app...")
-app.launch(share=True, debug=True)
-
-
+app.launch(share=True, debug=True)