Update app.py

app.py

@@ -10,9 +10,6 @@ import gradio as gr
 import spaces  # for ZeroGPU usage
 from typing import Sequence, Mapping, Any, Union
 
-# ----------------------------------------------------------------
-# NEW IMPORTS + INSTALLATION LOGIC FOR CatVTON & DETECTRON2
-# ----------------------------------------------------------------
 import subprocess
 
 def install_catvton_dependencies():
@@ -21,19 +18,24 @@ def install_catvton_dependencies():
 
     # ----------------------------------------------------------------
     # 0) Clone the CatVTON repository if not already present
+    #    (Currently commented out to avoid syntax error)
     # ----------------------------------------------------------------
- #   catvton_repo_path = "ComfyUI/custom_nodes/Comfyui-CatVTON"
-  #  if not os.path.exists(os.path.join(catvton_repo_path, "requirements.txt")):
-  #      print("[CatVTON Setup] Cloning CatVTON repo...")
-  #      pathlib.Path("ComfyUI/custom_nodes").mkdir(parents=True, exist_ok=True)
-   #     subprocess.check_call([
-    #        "git", "clone",
-     #       "--depth", "1",
-      #      "https://github.com/zhengchong/CatVTON.git",
-       #     catvton_repo_path
-     #   ])
-    else:
-        print("[CatVTON Setup] CatVTON repo already exists. Skipping clone.")
+    # catvton_repo_path = "ComfyUI/custom_nodes/Comfyui-CatVTON"
+    # if not os.path.exists(os.path.join(catvton_repo_path, "requirements.txt")):
+    #     print("[CatVTON Setup] Cloning CatVTON repo...")
+    #     pathlib.Path("ComfyUI/custom_nodes").mkdir(parents=True, exist_ok=True)
+    #     subprocess.check_call([
+    #         "git", "clone",
+    #         "--depth", "1",
+    #         "https://github.com/zhengchong/CatVTON.git",
+    #         catvton_repo_path
+    #     ])
+    # else:
+    #     print("[CatVTON Setup] CatVTON repo already exists. Skipping clone.")
+
+    # ----------------------------------------------------------------
+    # (Assuming you already have CatVTON code locally, or you are manually
+    # including it in your repo. If not, you'll want to uncomment the above block.)
 
     # ----------------------------------------------------------------
     # 1) Install detectron2 from GitHub
@@ -47,10 +49,12 @@ def install_catvton_dependencies():
     # ----------------------------------------------------------------
     # 2) Strip detectron2 lines from CatVTON requirements
     # ----------------------------------------------------------------
-    print("[CatVTON Setup] Removing detectron2 lines from CatVTON’s requirements...")
+    # Make sure catvton_repo_path is defined (if you commented out the clone).
+    catvton_repo_path = "ComfyUI/custom_nodes/Comfyui-CatVTON"
     catvton_req_path = os.path.join(catvton_repo_path, "requirements.txt")
     catvton_req_modified = os.path.join(catvton_repo_path, "requirements_modified.txt")
 
+    print("[CatVTON Setup] Removing detectron2 lines from CatVTON’s requirements...")
     with open(catvton_req_path, "r") as fin, open(catvton_req_modified, "w") as fout:
         for line in fin:
             if "detectron2" not in line.lower():
@@ -76,22 +80,16 @@ def install_catvton_dependencies():
     print("[CatVTON Setup] All CatVTON dependencies installed!\n")
 
 
-# ----------------------------------------------------------------
-# Call the above function once on startup.
-# Hugging Face Spaces will run this when building the container.
-# ----------------------------------------------------------------
+# Call the install function on startup
 install_catvton_dependencies()
 
-# 1) Load your token from environment (make sure you set HF_TOKEN in Space settings)
 token = os.environ["HF_TOKEN"]
-
-# 2) We'll use huggingface_hub to download each gated model
 from huggingface_hub import hf_hub_download
 
 import shutil
 import pathlib
 
-# Create the directories we need (mirroring your ComfyUI structure)
+# Create the directories we need
 pathlib.Path("ComfyUI/models/vae").mkdir(parents=True, exist_ok=True)
 pathlib.Path("ComfyUI/models/clip").mkdir(parents=True, exist_ok=True)
 pathlib.Path("ComfyUI/models/clip_vision").mkdir(parents=True, exist_ok=True)
@@ -99,28 +97,25 @@ pathlib.Path("ComfyUI/models/unet").mkdir(parents=True, exist_ok=True)
 pathlib.Path("ComfyUI/models/loras").mkdir(parents=True, exist_ok=True)
 pathlib.Path("ComfyUI/models/style_models").mkdir(parents=True, exist_ok=True)
 
-# Download each gated model into the correct local folder
+# Download each gated model
 hf_hub_download(
     repo_id="black-forest-labs/FLUX.1-dev",
     filename="ae.safetensors",
     local_dir="ComfyUI/models/vae",
     use_auth_token=token
 )
-
 hf_hub_download(
     repo_id="comfyanonymous/flux_text_encoders",
     filename="t5xxl_fp16.safetensors",
     local_dir="ComfyUI/models/clip",
     use_auth_token=token
 )
-
 hf_hub_download(
     repo_id="comfyanonymous/flux_text_encoders",
     filename="clip_l.safetensors",
     local_dir="ComfyUI/models/clip",
     use_auth_token=token
 )
-
 hf_hub_download(
     repo_id="black-forest-labs/FLUX.1-Fill-dev",
     filename="flux1-fill-dev.safetensors",
@@ -134,7 +129,6 @@ download_path = hf_hub_download(
     local_dir="ComfyUI/models/loras",
     use_auth_token=token
 )
-# Rename after download
 os.rename(download_path, os.path.join("ComfyUI/models/loras", "catvton-flux-lora.safetensors"))
 
 download_path = hf_hub_download(
@@ -143,7 +137,6 @@ download_path = hf_hub_download(
     local_dir="ComfyUI/models/loras",
     use_auth_token=token
 )
-# Rename after download
 os.rename(download_path, os.path.join("ComfyUI/models/loras", "alimama-flux-turbo-alpha.safetensors"))
 
 hf_hub_download(
@@ -152,7 +145,6 @@ hf_hub_download(
     local_dir="ComfyUI/models/clip_vision",
     use_auth_token=token
 )
-
 hf_hub_download(
     repo_id="black-forest-labs/FLUX.1-Redux-dev",
     filename="flux1-redux-dev.safetensors",
@@ -163,9 +155,7 @@ hf_hub_download(
 #############################
 # ComfyUI support functions
 #############################
-
 def get_value_at_index(obj: Union[Sequence, Mapping], index: int) -> Any:
-    """Returns the value at the given index of a sequence or mapping."""
     try:
         return obj[index]
     except KeyError:
@@ -174,7 +164,6 @@ def get_value_at_index(obj: Union[Sequence, Mapping], index: int) -> Any:
 def find_path(name: str, path: str = None) -> str:
     if path is None:
         path = os.getcwd()
-
     if name in os.listdir(path):
         path_name = os.path.join(path, name)
         print(f"{name} found: {path_name}")
@@ -183,7 +172,6 @@ def find_path(name: str, path: str = None) -> str:
     parent_directory = os.path.dirname(path)
     if parent_directory == path:
         return None
-
     return find_path(name, parent_directory)
 
 def add_comfyui_directory_to_sys_path() -> None:
@@ -220,21 +208,13 @@ def import_custom_nodes() -> None:
     execution.PromptQueue(server_instance)
     init_extra_nodes()
 
-##########################
-# Import node mappings
-##########################
 from nodes import NODE_CLASS_MAPPINGS
 
 #############################################
 # MAIN PIPELINE with ZeroGPU Decorator
 #############################################
-@spaces.GPU(duration=90)  # 90s of GPU usage; adjust as needed
+@spaces.GPU(duration=90)
 def generate_images(user_image_path):
-    """
-    This function runs your node-based pipeline,
-    using user_image_path for loadimage_264 and
-    returning the final saveimage_295 path.
-    """
     import_custom_nodes()
     with torch.inference_mode():
         loadimage = NODE_CLASS_MAPPINGS["LoadImage"]()
@@ -251,7 +231,6 @@ def generate_images(user_image_path):
         )
 
         loadimage_264 = loadimage.load_image(image=user_image_path)
-
         randomnoise = NODE_CLASS_MAPPINGS["RandomNoise"]()
         randomnoise_273 = randomnoise.get_noise(noise_seed=random.randint(1, 2**64))
 
@@ -320,7 +299,6 @@ def generate_images(user_image_path):
         )
 
         loadimage_289 = loadimage.load_image(image="assets_broc_ref.jpg")
-
         clipvisionencode = NODE_CLASS_MAPPINGS["CLIPVisionEncode"]()
         clipvisionencode_282 = clipvisionencode.encode(
             crop="center",
@@ -347,7 +325,8 @@ def generate_images(user_image_path):
 
         fluxguidance = NODE_CLASS_MAPPINGS["FluxGuidance"]()
         fluxguidance_288 = fluxguidance.append(
-            guidance=30, conditioning=get_value_at_index(stylemodelapply_280, 0)
+            guidance=30,
+            conditioning=get_value_at_index(stylemodelapply_280, 0)
         )
 
         conditioningzeroout = NODE_CLASS_MAPPINGS["ConditioningZeroOut"]()
@@ -423,7 +402,8 @@ def generate_images(user_image_path):
 
         unetloader = NODE_CLASS_MAPPINGS["UNETLoader"]()
         unetloader_291 = unetloader.load_unet(
-            unet_name="flux1-fill-dev.safetensors", weight_dtype="default"
+            unet_name="flux1-fill-dev.safetensors",
+            weight_dtype="default"
         )
 
         loraloadermodelonly = NODE_CLASS_MAPPINGS["LoraLoaderModelOnly"]()
@@ -462,10 +442,8 @@ def generate_images(user_image_path):
                 images=get_value_at_index(vaedecode_294, 0),
             )
 
-        # final_output_path is the only one we return
-        final_output_path = f"output/{saveimage_295['ui']['images'][0]['filename']}"
-        return final_output_path
-
+        # final output
+        return f"output/{saveimage_295['ui']['images'][0]['filename']}"
 
 ###################################
 # A simple Gradio interface