Revert "Revert "Skip re-cloning ComfyUI on restart to speed up startup""

This reverts commit cf4e0444badb845fdb76b029e1bab9f7f39e571b.

comfy_integration/setup.py

@@ -16,28 +16,34 @@ def move_and_overwrite(src, dst):
 
 def initialize_comfyui():
     APP_DIR = sys.path[0]
+    # Check if ComfyUI already exists in the app directory to avoid re-cloning on every restart.
+    # The presence of the 'comfy' package (imported later) indicates a previous successful setup.
+    COMFYUI_PRESENT = os.path.isdir(os.path.join(APP_DIR, 'comfy'))
     COMFYUI_TEMP_DIR = "ComfyUI_temp"
 
-    print("--- Cloning ComfyUI Repository ---")
-    if not os.path.exists(COMFYUI_TEMP_DIR):
-        os.system(f"git clone https://github.com/comfy-Org/ComfyUI {COMFYUI_TEMP_DIR}")
-        print("✅ ComfyUI repository cloned.")
+    if COMFYUI_PRESENT:
+        print("✅ ComfyUI already initialized – skipping clone and merge.")
     else:
-        print("✅ ComfyUI repository already exists.")
-
-    print(f"--- Merging ComfyUI from '{COMFYUI_TEMP_DIR}' to '{APP_DIR}' ---")
-    for item in os.listdir(COMFYUI_TEMP_DIR):
-        src_path = os.path.join(COMFYUI_TEMP_DIR, item)
-        dst_path = os.path.join(APP_DIR, item)
-        if item == '.git':
-            continue
-        move_and_overwrite(src_path, dst_path)
-    
-    try:
-        shutil.rmtree(COMFYUI_TEMP_DIR)
-        print("✅ ComfyUI merged and temporary directory removed.")
-    except OSError as e:
-        print(f"⚠️ Could not remove temporary directory '{COMFYUI_TEMP_DIR}': {e}")
+        print("--- Cloning ComfyUI Repository ---")
+        if not os.path.exists(COMFYUI_TEMP_DIR):
+            os.system(f"git clone https://github.com/comfy-Org/ComfyUI {COMFYUI_TEMP_DIR}")
+            print("✅ ComfyUI repository cloned.")
+        else:
+            print("✅ ComfyUI repository already exists.")
+
+        print(f"--- Merging ComfyUI from '{COMFYUI_TEMP_DIR}' to '{APP_DIR}' ---")
+        for item in os.listdir(COMFYUI_TEMP_DIR):
+            src_path = os.path.join(COMFYUI_TEMP_DIR, item)
+            dst_path = os.path.join(APP_DIR, item)
+            if item == '.git':
+                continue
+            move_and_overwrite(src_path, dst_path)
+        
+        try:
+            shutil.rmtree(COMFYUI_TEMP_DIR)
+            print("✅ ComfyUI merged and temporary directory removed.")
+        except OSError as e:
+            print(f"⚠️ Could not remove temporary directory '{COMFYUI_TEMP_DIR}': {e}")
 
     print("--- Cloning third-party extensions for ComfyUI ---")
 
@@ -99,7 +105,6 @@ def initialize_comfyui():
     torch.cuda.current_device = lambda: 0
     torch.cuda.get_device_name = lambda device: "cpu"
 
-
     # Apply patch to the external ComfyUI model_management before import.
     external_model_mgmt_path = os.path.join(APP_DIR, "comfy", "model_management.py")
     if os.path.exists(external_model_mgmt_path):
@@ -177,7 +182,6 @@ def initialize_comfyui():
         return False
     model_mgmt.should_use_bf16 = _safe_should_use_bf16
 
- 
     print("--- Environment Ready ---")
     
     print("✅ ComfyUI initialized with default attention mechanism.")
@@ -189,3 +193,5 @@ def initialize_comfyui():
     os.makedirs(os.path.join(APP_DIR, OUTPUT_DIR), exist_ok=True)
     
     print("✅ All required model directories are present.")
+
+    print("✅ All required model directories are present.")