ipadapter & Florence-2-base one time init

app.py

@@ -6,7 +6,7 @@ import torch
 import gradio as gr
 import spaces
 from comfy import model_management
-
+import subprocess
 
 from huggingface_hub import hf_hub_download
 from huggingface_hub import snapshot_download
@@ -46,16 +46,23 @@ print("CLIP-ViT-H-14-laion2B-s32B-b79K.safetensors")
 hf_hub_download(repo_id="h94/IP-Adapter", filename="models/image_encoder/model.safetensors", local_dir="models/clip_vision/")
 # rename
 try:
-    source_path = "models/clip_vision/model.safetensors"
-    destination_path = "models/clip_vision/CLIP-ViT-H-14-laion2B-s32B-b79K.safetensors"
-    os.rename(source_path, destination_path)
-    print(f"'{source_path}' renamed/moved to '{destination_path}' successfully.")
+    source_file = "models/clip_vision/models/image_encoder/model.safetensors"
+    destination_file = "models/clip_vision/CLIP-ViT-H-14-laion2B-s32B-b79K.safetensors"
+
+    result = subprocess.run(["mv", source_file, destination_file], check=True, capture_output=True, text=True)
+
+    # check=True raises a CalledProcessError if the command fails (returns a non-zero exit code)
+    # capture_output=True captures stdout and stderr.  text=True decodes to string
+    print(f"Command executed successfully. Return code: {result.returncode}")
+    print(f"Standard output: {result.stdout}")
+    print(f"Standard error: {result.stderr}")
+
+except subprocess.CalledProcessError as e:
+    print(f"Command failed with error code: {e.returncode}")
+    print(f"Standard output: {e.stdout}")
+    print(f"Standard error: {e.stderr}")
 except FileNotFoundError:
-    print(f"Error: Source '{source_path}' not found.")
-except OSError as e:
-    print(f"An OS error occurred: {e}")
-except Exception as e:
-    print(f"An unexpected error occurred: {e}")
+    print("Error: The 'mv' command was not found in your system's PATH.")
 
 print("CLIP-ViT-H-14-laion2B-s32B-b79K.safetensors done")
 
@@ -71,6 +78,25 @@ hf_hub_download(repo_id="h94/IP-Adapter", filename="models/ip-adapter-plus_sd15.
 hf_hub_download(repo_id="h94/IP-Adapter", filename="models/ip-adapter-plus-face_sd15.safetensors", local_dir="models/ipadapter/")
 hf_hub_download(repo_id="h94/IP-Adapter", filename="models/ip-adapter-full-face_sd15.safetensors", local_dir="models/ipadapter/")
 hf_hub_download(repo_id="h94/IP-Adapter", filename="models/ip-adapter_sd15_vit-G.safetensors", local_dir="models/ipadapter/")
+# rename
+try:
+    source_file = "models/ipadapter/models/*"
+    destination_file = "models/ipadapter/"
+
+    result = subprocess.run(["mv", source_file, destination_file], check=True, capture_output=True, text=True)
+
+    # check=True raises a CalledProcessError if the command fails (returns a non-zero exit code)
+    # capture_output=True captures stdout and stderr.  text=True decodes to string
+    print(f"Command executed successfully. Return code: {result.returncode}")
+    print(f"Standard output: {result.stdout}")
+    print(f"Standard error: {result.stderr}")
+
+except subprocess.CalledProcessError as e:
+    print(f"Command failed with error code: {e.returncode}")
+    print(f"Standard output: {e.stdout}")
+    print(f"Standard error: {e.stderr}")
+except FileNotFoundError:
+    print("Error: The 'mv' command was not found in your system's PATH.")
 print("ipadapter done")
 
 
@@ -222,6 +248,9 @@ print("load done: control_v11p_sd15_openpose.pth")
 
 loadimage = NODE_CLASS_MAPPINGS["LoadImage"]()
 
+florence2modelloader = NODE_CLASS_MAPPINGS["Florence2ModelLoader"]()
+florence2run = NODE_CLASS_MAPPINGS["Florence2Run"]()
+florence2modelloader_204 = None
 
 
 
@@ -317,15 +346,14 @@ print("model_management.load_models_gpu(model_loaders) done")
 
 @spaces.GPU(duration=60)
 def generate_image(model_image, hairstyle_template_image):
-    florence2modelloader = NODE_CLASS_MAPPINGS["Florence2ModelLoader"]()
-    florence2modelloader_204 = florence2modelloader.loadmodel(
-        model="Florence-2-base",
-        precision="fp16",
-        attention="sdpa",
-        convert_to_safetensors=False,
-    )
-    print("load done: Florence-2-base")
-    florence2run = NODE_CLASS_MAPPINGS["Florence2Run"]()
+    if florence2modelloader_204 == None:
+        florence2modelloader_204 = florence2modelloader.loadmodel(
+            model="Florence-2-base",
+            precision="fp16",
+            attention="sdpa",
+            convert_to_safetensors=False,
+        )
+        print("load done: Florence-2-base")
 
     with torch.inference_mode():
         cliptextencode_52 = cliptextencode.encode(