Update app.py

app.py

@@ -202,20 +202,21 @@ def download_file_with_progress(url, dest, progress: Progress = None, progress_o
         downloaded = 0
         start_time = time.time()
         last_update_time = start_time
+        update_interval = 1.0  # Update every 1 second for HF Spaces compatibility
         
         if progress and total:
-            progress(progress_offset, desc=f"Starting download: {os.path.basename(dest)} ({total//1024//1024}MB)")
+            mb_total = total // 1024 // 1024
+            progress(progress_offset, desc=f"🎯 Starting: {os.path.basename(dest)} ({mb_total}MB)")
         
         with open(dest, 'wb') as f:
-            for chunk in r.iter_content(chunk_size=32768):  # Larger chunks for better performance
+            for chunk in r.iter_content(chunk_size=65536):  # 64KB chunks for better performance on HF Spaces
                 if chunk:
                     f.write(chunk)
                     downloaded += len(chunk)
                     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
+                    # Update progress less frequently for HF Spaces
+                    if progress and total and (current_time - last_update_time) >= update_interval:
                         file_progress = downloaded / total
                         overall_progress = progress_offset + (file_progress * progress_scale)
                         
@@ -225,14 +226,13 @@ def download_file_with_progress(url, dest, progress: Progress = None, progress_o
                             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"
+                                speed_str = f"{speed_mbps:.1f}MB/s"
                             else:
                                 speed_kbps = speed_bps / 1024
-                                speed_str = f"{speed_kbps:.1f} KB/s"
+                                speed_str = f"{speed_kbps:.0f}KB/s"
                         else:
-                            speed_str = "-- MB/s"
+                            speed_str = "calculating..."
                         
                         # Calculate ETA
                         if speed_bps > 0:
@@ -242,15 +242,16 @@ def download_file_with_progress(url, dest, progress: Progress = None, progress_o
                                 eta_str = f"{eta_seconds:.0f}s"
                             else:
                                 eta_minutes = eta_seconds / 60
-                                eta_str = f"{eta_minutes:.1f}m"
+                                eta_str = f"{eta_minutes:.1f}min"
                         else:
-                            eta_str = "--"
+                            eta_str = "calculating..."
                         
                         mb_downloaded = downloaded // 1024 // 1024
                         mb_total = total // 1024 // 1024
                         
+                        # Simplified progress message for HF Spaces
                         progress(overall_progress, 
-                                desc=f"📥 {os.path.basename(dest)}: {mb_downloaded}MB/{mb_total}MB ({file_progress*100:.1f}%) | 🚀 {speed_str} | ⏱️ ETA: {eta_str}")
+                                desc=f"⬇️ {mb_downloaded}/{mb_total}MB ({file_progress*100:.0f}%) • {speed_str} • ETA: {eta_str}")
                         
                         last_update_time = current_time
         
@@ -258,11 +259,14 @@ def download_file_with_progress(url, dest, progress: Progress = None, progress_o
             final_time = time.time()
             total_time = final_time - start_time
             avg_speed = (downloaded / total_time) / (1024 * 1024) if total_time > 0 else 0
+            mb_total = total // 1024 // 1024
             progress(progress_offset + progress_scale, 
-                    desc=f"✅ Downloaded {os.path.basename(dest)} | {total//1024//1024}MB | Avg: {avg_speed:.1f} MB/s")
+                    desc=f"✅ Complete: {mb_total}MB downloaded (avg {avg_speed:.1f}MB/s)")
         
         return True, ""
     except Exception as e:
+        if progress:
+            progress(progress_offset + progress_scale, desc=f"❌ Download failed: {str(e)[:50]}...")
         return False, str(e)
 
 def file_similarity(file1, file2, chunk_size=1024*1024):
@@ -376,7 +380,7 @@ 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="Initializing...")
+            progress(0.0, desc="🚀 Initializing comparison...")
             
             url1 = f"https://huggingface.co/{m1}/resolve/main/{fname}?download=true"
             url2 = f"https://huggingface.co/{m2}/resolve/main/{fname}?download=true"
@@ -385,34 +389,48 @@ with gr.Blocks(theme="soft") as demo:
                 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)
+                # Download first file (5% to 47.5%)
+                progress(0.05, desc=f"📡 Connecting to {m1.split('/')[-1]}...")
+                ok1, err1 = download_file_with_progress(url1, f1, progress, progress_offset=0.05, progress_scale=0.425)
                 
                 if not ok1:
-                    return f"Download error from {m1}: {err1}"
+                    return f"❌ Download failed from {m1}: {err1}"
                 
-                # 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)
+                # Download second file (50% to 92.5%)
+                progress(0.5, desc=f"📡 Connecting to {m2.split('/')[-1]}...")
+                ok2, err2 = download_file_with_progress(url2, f2, progress, progress_offset=0.5, progress_scale=0.425)
                 
                 if not ok2:
-                    return f"Download error from {m2}: {err2}"
+                    return f"❌ Download failed from {m2}: {err2}"
                 
-                # Compare files (90% to 100%)
-                progress(0.9, desc="Comparing files byte-by-byte...")
+                # Compare files (95% to 100%)
+                progress(0.95, desc="🔍 Analyzing files byte-by-byte...")
                 percent, err = file_similarity(f1, f2)
                 if err:
-                    return f"Comparison error: {err}"
+                    return f"❌ Comparison error: {err}"
                 
-                progress(1.0, desc="Comparison complete! ✓")
+                progress(1.0, desc="✅ Analysis complete!")
                 
-                # Format file sizes for display
+                # Get file info
                 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"
+                # Enhanced result formatting
+                if percent == 100:
+                    result_icon = "🟢"
+                    result_text = "IDENTICAL"
+                elif percent >= 99:
+                    result_icon = "🟡"
+                    result_text = "NEARLY IDENTICAL"
+                elif percent >= 90:
+                    result_icon = "🟠"
+                    result_text = "SIMILAR"
+                else:
+                    result_icon = "🔴"
+                    result_text = "DIFFERENT"
+                
+                return f"{result_icon} **{result_text}** ({percent:.3f}% similarity)\n📁 File size: {size_mb}MB\n🔗 Models: {m1.split('/')[-1]} vs {m2.split('/')[-1]}"
         adv_btn.click(
             fn=adv_compare,
             inputs=[adv_model1, adv_model2, adv_filename],