Update app.py

app.py

@@ -4,6 +4,7 @@ from concurrent.futures import ThreadPoolExecutor, as_completed
 import tempfile
 import os
 import hashlib
+import time
 from gradio import Progress
 
 # Function to get OID from a raw Hugging Face LFS file URL
@@ -193,19 +194,73 @@ def download_file(url, dest):
     except Exception as e:
         return False, str(e)
 
-def download_file_with_progress(url, dest, progress: Progress = None):
+def download_file_with_progress(url, dest, progress: Progress = None, progress_offset=0, progress_scale=1):
     try:
         r = requests.get(url, stream=True, timeout=30)
         r.raise_for_status()
         total = int(r.headers.get('content-length', 0))
         downloaded = 0
+        start_time = time.time()
+        last_update_time = start_time
+        
+        if progress and total:
+            progress(progress_offset, desc=f"Starting download: {os.path.basename(dest)} ({total//1024//1024}MB)")
+        
         with open(dest, 'wb') as f:
-            for chunk in r.iter_content(chunk_size=8192):
+            for chunk in r.iter_content(chunk_size=32768):  # Larger chunks for better performance
                 if chunk:
                     f.write(chunk)
                     downloaded += len(chunk)
-                    if progress and total:
-                        progress((downloaded / total), desc=f"Downloading {os.path.basename(dest)}: {downloaded//1024}KB/{total//1024}KB")
+                    current_time = time.time()
+                    
+                    # Update progress every 0.5 seconds to avoid too frequent updates
+                    if progress and total and (current_time - last_update_time) >= 0.5:
+                        # Calculate progress within the allocated range
+                        file_progress = downloaded / total
+                        overall_progress = progress_offset + (file_progress * progress_scale)
+                        
+                        # Calculate download speed
+                        elapsed_time = current_time - start_time
+                        if elapsed_time > 0:
+                            speed_bps = downloaded / elapsed_time
+                            speed_mbps = speed_bps / (1024 * 1024)
+                            
+                            # Format speed appropriately
+                            if speed_mbps >= 1:
+                                speed_str = f"{speed_mbps:.1f} MB/s"
+                            else:
+                                speed_kbps = speed_bps / 1024
+                                speed_str = f"{speed_kbps:.1f} KB/s"
+                        else:
+                            speed_str = "-- MB/s"
+                        
+                        # Calculate ETA
+                        if speed_bps > 0:
+                            remaining_bytes = total - downloaded
+                            eta_seconds = remaining_bytes / speed_bps
+                            if eta_seconds < 60:
+                                eta_str = f"{eta_seconds:.0f}s"
+                            else:
+                                eta_minutes = eta_seconds / 60
+                                eta_str = f"{eta_minutes:.1f}m"
+                        else:
+                            eta_str = "--"
+                        
+                        mb_downloaded = downloaded // 1024 // 1024
+                        mb_total = total // 1024 // 1024
+                        
+                        progress(overall_progress, 
+                                desc=f"📥 {os.path.basename(dest)}: {mb_downloaded}MB/{mb_total}MB ({file_progress*100:.1f}%) | 🚀 {speed_str} | ⏱️ ETA: {eta_str}")
+                        
+                        last_update_time = current_time
+        
+        if progress:
+            final_time = time.time()
+            total_time = final_time - start_time
+            avg_speed = (downloaded / total_time) / (1024 * 1024) if total_time > 0 else 0
+            progress(progress_offset + progress_scale, 
+                    desc=f"✅ Downloaded {os.path.basename(dest)} | {total//1024//1024}MB | Avg: {avg_speed:.1f} MB/s")
+        
         return True, ""
     except Exception as e:
         return False, str(e)
@@ -321,31 +376,43 @@ with gr.Blocks(theme="soft") as demo:
             if not m1 or not m2 or not fname:
                 return "Please provide both model IDs and the file name."
             
-            progress(0, desc="Starting download...")
+            progress(0, desc="Initializing...")
             
             url1 = f"https://huggingface.co/{m1}/resolve/main/{fname}?download=true"
             url2 = f"https://huggingface.co/{m2}/resolve/main/{fname}?download=true"
             
             with tempfile.TemporaryDirectory() as tmp:
-                f1 = os.path.join(tmp, "f1.safetensors")
-                f2 = os.path.join(tmp, "f2.safetensors")
+                f1 = os.path.join(tmp, f"model1_{fname}")
+                f2 = os.path.join(tmp, f"model2_{fname}")
+                
+                # Download first file (0% to 45%)
+                progress(0.05, desc=f"Starting download from {m1.split('/')[-1]}...")
+                ok1, err1 = download_file_with_progress(url1, f1, progress, progress_offset=0.05, progress_scale=0.4)
                 
-                progress(0.1, desc=f"Downloading from {m1}...")
-                ok1, err1 = download_file_with_progress(url1, f1, progress)
+                if not ok1:
+                    return f"Download error from {m1}: {err1}"
                 
-                progress(0.5, desc=f"Downloading from {m2}...")
-                ok2, err2 = download_file_with_progress(url2, f2, progress)
+                # Download second file (45% to 90%)
+                progress(0.5, desc=f"Starting download from {m2.split('/')[-1]}...")
+                ok2, err2 = download_file_with_progress(url2, f2, progress, progress_offset=0.5, progress_scale=0.4)
                 
-                if not ok1 or not ok2:
-                    return f"Download error: {err1 or ''} {err2 or ''}"
+                if not ok2:
+                    return f"Download error from {m2}: {err2}"
                 
-                progress(0.9, desc="Comparing files...")
+                # Compare files (90% to 100%)
+                progress(0.9, desc="Comparing files byte-by-byte...")
                 percent, err = file_similarity(f1, f2)
                 if err:
                     return f"Comparison error: {err}"
                 
-                progress(1.0, desc="Complete!")
-                return f"Similarity: {percent:.2f}% ({'identical' if percent==100 else 'different'})"
+                progress(1.0, desc="Comparison complete! ✓")
+                
+                # Format file sizes for display
+                size1 = os.path.getsize(f1)
+                size2 = os.path.getsize(f2)
+                size_mb = size1 // 1024 // 1024
+                
+                return f"Similarity: {percent:.2f}% ({'✅ IDENTICAL' if percent==100 else '❌ DIFFERENT'}) | File size: {size_mb}MB"
         adv_btn.click(
             fn=adv_compare,
             inputs=[adv_model1, adv_model2, adv_filename],