Update app.py

app.py

@@ -1,5 +1,5 @@
 """
-Space Keeper v3 - Keeps HuggingFace Spaces alive during hackathon evaluation
+Space Keeper v4 - Keeps HuggingFace Spaces alive during hackathon evaluation
 """
 
 import os
@@ -84,7 +84,6 @@ def ping_space(space_id: str) -> dict:
             "error": f"Timed out after {REQUEST_TIMEOUT}s"
         }
     except Exception as e:
-        # Fallback to HF page
         try:
             response = requests.get(hf_page_url, timeout=REQUEST_TIMEOUT)
             return {
@@ -104,19 +103,6 @@ def ping_space(space_id: str) -> dict:
             }
 
 
-def get_org_space_count() -> int:
-    """Try to get total space count from org page (includes private)."""
-    try:
-        url = f"https://huggingface.co/api/organizations/{ORG_NAME}/overview"
-        response = requests.get(url, timeout=10)
-        if response.status_code == 200:
-            data = response.json()
-            return data.get("numSpaces", -1)
-    except Exception:
-        pass
-    return -1
-
-
 def scheduled_job():
     """Wrapper for the scheduled job."""
     print(f"[{datetime.now(timezone.utc).isoformat()}] Running scheduled ping job...")
@@ -132,10 +118,10 @@ def scheduled_job():
             "status": "error",
             "error": f"Failed to list Spaces: {str(e)}",
             "total_spaces": 0,
-            "spaces_found_by_api": 0,
             "successful": 0,
             "failed": 0,
             "duration_seconds": 0,
+            "private_spaces": [],
             "results": []
         }
         logs = load_logs()
@@ -143,6 +129,8 @@ def scheduled_job():
         save_logs(logs)
         return
     
+    # Separate private and public spaces
+    private_space_names = [s.id.split("/")[1] for s in spaces if getattr(s, 'private', False)]
     space_ids = [space.id for space in spaces]
     results = []
     
@@ -163,10 +151,10 @@ def scheduled_job():
         "status": "completed",
         "error": None,
         "total_spaces": len(results),
-        "spaces_found_by_api": len(space_ids),
         "successful": successful,
         "failed": failed,
         "duration_seconds": round(duration, 2),
+        "private_spaces": private_space_names,
         "results": results
     }
     
@@ -254,9 +242,12 @@ def format_logs_panel() -> str:
             output += f"❌ **{ts}** | {by} | Error: {run['error']}\n\n"
         else:
             emoji = "✅" if run["failed"] == 0 else "⚠️"
+            private_count = len(run.get("private_spaces", []))
+            private_info = f" | 🔒 {private_count} private" if private_count > 0 else ""
+            
             output += f"{emoji} **{ts}** | {by} | "
             output += f"**{run['total_spaces']}** spaces | "
-            output += f"{run['successful']} ok, {run['failed']} failed | "
+            output += f"{run['successful']} ok, {run['failed']} failed{private_info} | "
             output += f"{run['duration_seconds']}s\n"
             
             if run["failed"] > 0:
@@ -270,13 +261,32 @@ def format_logs_panel() -> str:
     return output
 
 
+def format_private_spaces_accordion(private_spaces: list) -> str:
+    """Format the private spaces list for the accordion."""
+    if not private_spaces:
+        return "*No private Spaces found in this run.*"
+    
+    output = f"**{len(private_spaces)} private Spaces** were pinged:\n\n"
+    
+    # Create columns for better readability
+    for i, name in enumerate(sorted(private_spaces)):
+        output += f"- `{name}`\n"
+    
+    return output
+
+
 # =============================================================================
 # MAIN RUN FUNCTION WITH LIVE PROGRESS
 # =============================================================================
 def manual_trigger_with_progress():
     """Manually trigger a ping run with live progress updates."""
     
-    yield "## 🔄 Starting...\n\nFetching Space list from HuggingFace API...", format_status_panel(), format_logs_panel()
+    yield (
+        "## 🔄 Starting...\n\nFetching Space list from HuggingFace API...", 
+        format_status_panel(), 
+        format_logs_panel(),
+        "*Run in progress...*"
+    )
     
     start_time = datetime.now(timezone.utc)
     
@@ -291,37 +301,37 @@ def manual_trigger_with_progress():
             "status": "error",
             "error": str(e),
             "total_spaces": 0,
-            "spaces_found_by_api": 0,
             "successful": 0,
             "failed": 0,
             "duration_seconds": 0,
+            "private_spaces": [],
             "results": []
         }
         logs = load_logs()
         logs.append(run_result)
         save_logs(logs)
-        yield error_msg, format_status_panel(), format_logs_panel()
+        yield error_msg, format_status_panel(), format_logs_panel(), "*Error during run*"
         return
     
+    # Separate private and public spaces
+    private_spaces = []
+    public_spaces = []
+    for s in spaces:
+        name = s.id.split("/")[1]
+        if getattr(s, 'private', False):
+            private_spaces.append(name)
+        else:
+            public_spaces.append(name)
+    
     space_ids = [space.id for space in spaces]
     total = len(space_ids)
     
-    # Try to get actual org space count for comparison
-    org_total = get_org_space_count()
-    
-    # Show initial info
     info_msg = f"## 🔄 Running...\n\n"
-    info_msg += f"**API returned {total} Spaces**"
-    if org_total > 0 and org_total != total:
-        diff = org_total - total
-        info_msg += f" (org has {org_total} total — {diff} are likely private)\n\n"
-        info_msg += f"💡 *To ping private Spaces, add `HF_TOKEN` in Space settings*\n\n"
-    else:
-        info_msg += "\n\n"
+    info_msg += f"**Found {total} Spaces** ({len(public_spaces)} public, {len(private_spaces)} private)\n\n"
     info_msg += f"Pinging {PARALLEL_REQUESTS} Spaces in parallel...\n\n"
     info_msg += f"`[0/{total}]` ░░░░░░░░░░ 0%"
     
-    yield info_msg, format_status_panel(), format_logs_panel()
+    yield info_msg, format_status_panel(), format_logs_panel(), format_private_spaces_accordion(private_spaces)
     
     # Run pings
     results = []
@@ -342,7 +352,6 @@ def manual_trigger_with_progress():
             else:
                 failed += 1
             
-            # Progress bar
             pct = int((completed / total) * 100)
             filled = int(pct / 10)
             bar = "█" * filled + "░" * (10 - filled)
@@ -360,7 +369,7 @@ def manual_trigger_with_progress():
 """
             
             if completed % 5 == 0 or completed == total:
-                yield live_status, format_status_panel(), format_logs_panel()
+                yield live_status, format_status_panel(), format_logs_panel(), format_private_spaces_accordion(private_spaces)
     
     # Save results
     end_time = datetime.now(timezone.utc)
@@ -372,11 +381,10 @@ def manual_trigger_with_progress():
         "status": "completed",
         "error": None,
         "total_spaces": total,
-        "spaces_found_by_api": total,
-        "org_total_spaces": org_total if org_total > 0 else None,
         "successful": successful,
         "failed": failed,
         "duration_seconds": round(duration, 2),
+        "private_spaces": private_spaces,
         "results": results
     }
     
@@ -388,7 +396,7 @@ def manual_trigger_with_progress():
     if failed == 0:
         final = f"""## ✅ Completed Successfully!
 
-**Pinged {total} Spaces** in {duration:.1f} seconds
+**Pinged {total} Spaces** ({len(public_spaces)} public, {len(private_spaces)} private) in {duration:.1f}s
 
 All Spaces responded! 🎉
 """
@@ -400,7 +408,7 @@ All Spaces responded! 🎉
         
         final = f"""## ⚠️ Completed with {failed} issue(s)
 
-**Pinged {total} Spaces** in {duration:.1f} seconds
+**Pinged {total} Spaces** ({len(public_spaces)} public, {len(private_spaces)} private) in {duration:.1f}s
 
 ✅ {successful} successful  
 ❌ {failed} failed
@@ -412,15 +420,16 @@ All Spaces responded! 🎉
 *Failures usually mean the Space is paused, has an error, or uses a non-standard SDK.*
 """
     
-    # Add note about private spaces
-    if org_total > 0 and org_total > total:
-        final += f"\n\n---\n💡 **Note:** {org_total - total} private Spaces were not pinged. Add `HF_TOKEN` to access them."
-    
-    yield final, format_status_panel(), format_logs_panel()
+    yield final, format_status_panel(), format_logs_panel(), format_private_spaces_accordion(private_spaces)
 
 
 def refresh_all():
-    return format_status_panel(), format_logs_panel()
+    # Get private spaces from last run if available
+    logs = load_logs()
+    private_spaces = []
+    if logs:
+        private_spaces = logs[-1].get("private_spaces", [])
+    return format_status_panel(), format_logs_panel(), format_private_spaces_accordion(private_spaces)
 
 
 # =============================================================================
@@ -442,10 +451,20 @@ Keeps HuggingFace Spaces alive by pinging them to prevent sleeping during hackat
             live_output = gr.Markdown("## Ready\n\nClick **🚀 Run Now** to ping all Spaces.\n\nAuto-runs every 12 hours when this Space is awake.")
     
     gr.Markdown("---")
+    
+    with gr.Accordion("🔒 Private Spaces", open=False):
+        private_spaces_display = gr.Markdown("*Run a ping to see private Spaces list.*")
+    
     logs_panel = gr.Markdown(format_logs_panel())
     
-    run_btn.click(fn=manual_trigger_with_progress, outputs=[live_output, status_panel, logs_panel])
-    refresh_btn.click(fn=refresh_all, outputs=[status_panel, logs_panel])
+    run_btn.click(
+        fn=manual_trigger_with_progress, 
+        outputs=[live_output, status_panel, logs_panel, private_spaces_display]
+    )
+    refresh_btn.click(
+        fn=refresh_all, 
+        outputs=[status_panel, logs_panel, private_spaces_display]
+    )
 
 
 # =============================================================================