Update merged_app2.py

merged_app2.py

@@ -116,7 +116,7 @@ model_path3 = './checkpoints/sam2_hiera_large.pt'
 model_path4 = './checkpoints/config.json'
 model_path5 = './checkpoints/preprocessor_config.json'
 model_path6 = './configs/sam2_hiera_l.yaml'
-#model_path7 = './mvadapter_i2mv_sdxl.safetensors'
+model_path7 = './mvadapter_i2mv_sdxl.safetensors'
 
 # Base URL for the repository
 BASE_URL = 'https://huggingface.co/Ashoka74/Placement/resolve/main/'
@@ -129,7 +129,7 @@ model_urls = {
     model_path4: 'config.json',
     model_path5: 'preprocessor_config.json',
     model_path6: 'sam2_hiera_l.yaml',
-#    model_path7: 'mvadapter_i2mv_sdxl.safetensors'
+    model_path7: 'mvadapter_i2mv_sdxl.safetensors'
 }
 
 # Ensure directories exist
@@ -153,13 +153,13 @@ ensure_directories()
 download_models()
 
 
-# hf_hub_download(repo_id="black-forest-labs/FLUX.1-Redux-dev", filename="flux1-redux-dev.safetensors", local_dir="models/style_models")
-# hf_hub_download(repo_id="black-forest-labs/FLUX.1-Depth-dev", filename="flux1-depth-dev.safetensors", local_dir="models/diffusion_models")
-# hf_hub_download(repo_id="Comfy-Org/sigclip_vision_384", filename="sigclip_vision_patch14_384.safetensors", local_dir="models/clip_vision")
-# hf_hub_download(repo_id="Kijai/DepthAnythingV2-safetensors", filename="depth_anything_v2_vitl_fp32.safetensors", local_dir="models/depthanything")
-# hf_hub_download(repo_id="black-forest-labs/FLUX.1-dev", filename="ae.safetensors", local_dir="models/vae/FLUX1")
-# hf_hub_download(repo_id="comfyanonymous/flux_text_encoders", filename="clip_l.safetensors", local_dir="models/text_encoders")
-# t5_path = hf_hub_download(repo_id="comfyanonymous/flux_text_encoders", filename="t5xxl_fp16.safetensors", local_dir="models/text_encoders/t5")
+hf_hub_download(repo_id="black-forest-labs/FLUX.1-Redux-dev", filename="flux1-redux-dev.safetensors", local_dir="models/style_models")
+hf_hub_download(repo_id="black-forest-labs/FLUX.1-Depth-dev", filename="flux1-depth-dev.safetensors", local_dir="models/diffusion_models")
+hf_hub_download(repo_id="Comfy-Org/sigclip_vision_384", filename="sigclip_vision_patch14_384.safetensors", local_dir="models/clip_vision")
+hf_hub_download(repo_id="Kijai/DepthAnythingV2-safetensors", filename="depth_anything_v2_vitl_fp32.safetensors", local_dir="models/depthanything")
+hf_hub_download(repo_id="black-forest-labs/FLUX.1-dev", filename="ae.safetensors", local_dir="models/vae/FLUX1")
+hf_hub_download(repo_id="comfyanonymous/flux_text_encoders", filename="clip_l.safetensors", local_dir="models/text_encoders")
+t5_path = hf_hub_download(repo_id="comfyanonymous/flux_text_encoders", filename="t5xxl_fp16.safetensors", local_dir="models/text_encoders/t5")
 
 
 sd15_name = 'stablediffusionapi/realistic-vision-v51'
@@ -1375,8 +1375,8 @@ def add_extra_model_paths() -> None:
         print("Could not find the extra_model_paths config file.")
 
 # Initialize paths
-# add_comfyui_directory_to_sys_path()
-# add_extra_model_paths()
+add_comfyui_directory_to_sys_path()
+add_extra_model_paths()
 
 def import_custom_nodes() -> None:
     import asyncio
@@ -1389,90 +1389,90 @@ def import_custom_nodes() -> None:
     execution.PromptQueue(server_instance)
     init_extra_nodes()
 
-# Import all necessary nodes
-# from nodes import (
-#     StyleModelLoader,
-#     VAEEncode,
-#     NODE_CLASS_MAPPINGS,
-#     LoadImage,
-#     CLIPVisionLoader,
-#     SaveImage,
-#     VAELoader,
-#     CLIPVisionEncode,
-#     DualCLIPLoader,
-#     EmptyLatentImage,
-#     VAEDecode,
-#     UNETLoader,
-#     CLIPTextEncode,
-# )
-
-# Initialize all constant nodes and models in global context
-# import_custom_nodes()
-
-# Global variables for preloaded models and constants
-#with torch.inference_mode():
-    # Initialize constants
-# intconstant = NODE_CLASS_MAPPINGS["INTConstant"]()
-# CONST_1024 = intconstant.get_value(value=1024)
-
-# # Load CLIP
-# dualcliploader = DualCLIPLoader()
-# CLIP_MODEL = dualcliploader.load_clip(
-#     clip_name1="t5/t5xxl_fp16.safetensors",
-#     clip_name2="clip_l.safetensors",
-#     type="flux",
-# )
-
-# # Load VAE
-# vaeloader = VAELoader()
-# VAE_MODEL = vaeloader.load_vae(vae_name="FLUX1/ae.safetensors")
-
-# # Load UNET
-# unetloader = UNETLoader()
-# UNET_MODEL = unetloader.load_unet(
-#     unet_name="flux1-depth-dev.safetensors", weight_dtype="default"
-# )
-
-# # Load CLIP Vision
-# clipvisionloader = CLIPVisionLoader()
-# CLIP_VISION_MODEL = clipvisionloader.load_clip(
-#     clip_name="sigclip_vision_patch14_384.safetensors"
-# )
-
-# # Load Style Model
-# stylemodelloader = StyleModelLoader()
-# STYLE_MODEL = stylemodelloader.load_style_model(
-#     style_model_name="flux1-redux-dev.safetensors"
-# )
-
-# # Initialize samplers
-# ksamplerselect = NODE_CLASS_MAPPINGS["KSamplerSelect"]()
-# SAMPLER = ksamplerselect.get_sampler(sampler_name="euler")
-
-# # Initialize depth model
-# cr_clip_input_switch = NODE_CLASS_MAPPINGS["CR Clip Input Switch"]()
-# downloadandloaddepthanythingv2model = NODE_CLASS_MAPPINGS["DownloadAndLoadDepthAnythingV2Model"]()
-# DEPTH_MODEL = downloadandloaddepthanythingv2model.loadmodel(
-#     model="depth_anything_v2_vitl_fp32.safetensors"
-# )
-# cliptextencode = CLIPTextEncode()
-# loadimage = LoadImage()
-# vaeencode = VAEEncode()
-# fluxguidance = NODE_CLASS_MAPPINGS["FluxGuidance"]()
-# instructpixtopixconditioning = NODE_CLASS_MAPPINGS["InstructPixToPixConditioning"]()
-# clipvisionencode = CLIPVisionEncode()
-# stylemodelapplyadvanced = NODE_CLASS_MAPPINGS["StyleModelApplyAdvanced"]()
-# emptylatentimage = EmptyLatentImage()
-# basicguider = NODE_CLASS_MAPPINGS["BasicGuider"]()
-# basicscheduler = NODE_CLASS_MAPPINGS["BasicScheduler"]()        
-# randomnoise = NODE_CLASS_MAPPINGS["RandomNoise"]()
-# samplercustomadvanced = NODE_CLASS_MAPPINGS["SamplerCustomAdvanced"]()
-# vaedecode = VAEDecode()
-# cr_text = NODE_CLASS_MAPPINGS["CR Text"]()
-# saveimage = SaveImage()
-# getimagesizeandcount = NODE_CLASS_MAPPINGS["GetImageSizeAndCount"]()
-# depthanything_v2 = NODE_CLASS_MAPPINGS["DepthAnything_V2"]()
-# imageresize = NODE_CLASS_MAPPINGS["ImageResize+"]()
+#Import all necessary nodes
+from nodes import (
+    StyleModelLoader,
+    VAEEncode,
+    NODE_CLASS_MAPPINGS,
+    LoadImage,
+    CLIPVisionLoader,
+    SaveImage,
+    VAELoader,
+    CLIPVisionEncode,
+    DualCLIPLoader,
+    EmptyLatentImage,
+    VAEDecode,
+    UNETLoader,
+    CLIPTextEncode,
+)
+
+#Initialize all constant nodes and models in global context
+import_custom_nodes()
+
+#Global variables for preloaded models and constants
+with torch.inference_mode():
+    Initialize constants
+intconstant = NODE_CLASS_MAPPINGS["INTConstant"]()
+CONST_1024 = intconstant.get_value(value=1024)
+
+# Load CLIP
+dualcliploader = DualCLIPLoader()
+CLIP_MODEL = dualcliploader.load_clip(
+    clip_name1="t5/t5xxl_fp16.safetensors",
+    clip_name2="clip_l.safetensors",
+    type="flux",
+)
+
+# Load VAE
+vaeloader = VAELoader()
+VAE_MODEL = vaeloader.load_vae(vae_name="FLUX1/ae.safetensors")
+
+# Load UNET
+unetloader = UNETLoader()
+UNET_MODEL = unetloader.load_unet(
+    unet_name="flux1-depth-dev.safetensors", weight_dtype="default"
+)
+
+# Load CLIP Vision
+clipvisionloader = CLIPVisionLoader()
+CLIP_VISION_MODEL = clipvisionloader.load_clip(
+    clip_name="sigclip_vision_patch14_384.safetensors"
+)
+
+# Load Style Model
+stylemodelloader = StyleModelLoader()
+STYLE_MODEL = stylemodelloader.load_style_model(
+    style_model_name="flux1-redux-dev.safetensors"
+)
+
+# Initialize samplers
+ksamplerselect = NODE_CLASS_MAPPINGS["KSamplerSelect"]()
+SAMPLER = ksamplerselect.get_sampler(sampler_name="euler")
+
+# Initialize depth model
+cr_clip_input_switch = NODE_CLASS_MAPPINGS["CR Clip Input Switch"]()
+downloadandloaddepthanythingv2model = NODE_CLASS_MAPPINGS["DownloadAndLoadDepthAnythingV2Model"]()
+DEPTH_MODEL = downloadandloaddepthanythingv2model.loadmodel(
+    model="depth_anything_v2_vitl_fp32.safetensors"
+)
+cliptextencode = CLIPTextEncode()
+loadimage = LoadImage()
+vaeencode = VAEEncode()
+fluxguidance = NODE_CLASS_MAPPINGS["FluxGuidance"]()
+instructpixtopixconditioning = NODE_CLASS_MAPPINGS["InstructPixToPixConditioning"]()
+clipvisionencode = CLIPVisionEncode()
+stylemodelapplyadvanced = NODE_CLASS_MAPPINGS["StyleModelApplyAdvanced"]()
+emptylatentimage = EmptyLatentImage()
+basicguider = NODE_CLASS_MAPPINGS["BasicGuider"]()
+basicscheduler = NODE_CLASS_MAPPINGS["BasicScheduler"]()        
+randomnoise = NODE_CLASS_MAPPINGS["RandomNoise"]()
+samplercustomadvanced = NODE_CLASS_MAPPINGS["SamplerCustomAdvanced"]()
+vaedecode = VAEDecode()
+cr_text = NODE_CLASS_MAPPINGS["CR Text"]()
+saveimage = SaveImage()
+getimagesizeandcount = NODE_CLASS_MAPPINGS["GetImageSizeAndCount"]()
+depthanything_v2 = NODE_CLASS_MAPPINGS["DepthAnything_V2"]()
+imageresize = NODE_CLASS_MAPPINGS["ImageResize+"]()
 
 
 @spaces.GPU