change caching method and logs subprocess infos

app.py

@@ -9,25 +9,38 @@ from huggingface_hub import snapshot_download
 
 # Download All Required Models using `snapshot_download`
 
-def download_and_extract(repo_id, target_dir):
+def download_and_extract(repo_id, target_dir, cache_dir=None):
     """
-    Downloads a model repo (cached) and copies its contents to a local target directory.
-    If the target_dir exists, it will be updated (not re-downloaded if cache is present).
+    Download from HF Hub to cache, then copy to target_dir if not already present.
     """
-    print(f"Downloading {repo_id} into cache...")
-    snapshot_path = snapshot_download(repo_id)
-    
-    print(f"Copying files to {target_dir}...")
-    os.makedirs(target_dir, exist_ok=True)
-    shutil.copytree(snapshot_path, target_dir, dirs_exist_ok=True)
-
-    print(f"Done: {repo_id} extracted to {target_dir}")
+    print(f"Downloading (with cache) {repo_id}...")
+
+    # Use snapshot_download with optional custom cache
+    snapshot_path = snapshot_download(
+        repo_id=repo_id,
+        cache_dir=cache_dir,  # You can pass a shared cache path here
+        local_dir=None,       # Ensure it's using the actual cache
+        local_dir_use_symlinks=False
+    )
+
+    # Copy from cache to target directory
+    if not os.path.exists(target_dir) or not os.listdir(target_dir):
+        os.makedirs(target_dir, exist_ok=True)
+        shutil.copytree(snapshot_path, target_dir, dirs_exist_ok=True)
+        print(f"Copied {repo_id} to {target_dir}")
+    else:
+        print(f"{target_dir} already populated. Skipping copy.")
+
     return target_dir
 
 
-wan_model_path = download_and_extract("Wan-AI/Wan2.1-I2V-14B-480P", "./weights/Wan2.1-I2V-14B-480P")
-wav2vec_path   = download_and_extract("TencentGameMate/chinese-wav2vec2-base", "./weights/chinese-wav2vec2-base")
-multitalk_path = download_and_extract("MeiGen-AI/MeiGen-MultiTalk", "./weights/MeiGen-MultiTalk")
+# Optional: share one cache location across all models
+custom_cache = "./hf_cache"
+
+wan_model_path = download_and_extract("Wan-AI/Wan2.1-I2V-14B-480P", "./weights/Wan2.1-I2V-14B-480P", cache_dir=custom_cache)
+wav2vec_path   = download_and_extract("TencentGameMate/chinese-wav2vec2-base", "./weights/chinese-wav2vec2-base", cache_dir=custom_cache)
+multitalk_path = download_and_extract("MeiGen-AI/MeiGen-MultiTalk", "./weights/MeiGen-MultiTalk", cache_dir=custom_cache)
+
 
 
 # Define paths
@@ -130,7 +143,27 @@ def infer(prompt, cond_image_path, cond_audio_path):
         "--save_file", "multi_long_mediumvram_exp"
     ]
 
-    subprocess.run(cmd, check=True)
+    # Optional: log file
+    log_file_path = "inference.log"
+
+    # Run and stream logs in real-time
+    with open(log_file_path, "w") as log_file:
+        process = subprocess.Popen(
+            cmd,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.STDOUT,
+            text=True,
+            bufsize=1  # Line-buffered
+        )
+
+        for line in process.stdout:
+            print(line, end="")     # Print to console in real-time
+            log_file.write(line)    # Save to log file
+
+        process.wait()
+
+    if process.returncode != 0:
+        raise RuntimeError("Inference failed. Check inference.log for details.")
 
     return "multi_long_mediumvra_exp.mp4"