Spaces:

tfrere
/

leaderboard-parser-agent

Build error

App Files Files Community

tfrere HF Staff commited on Mar 21

Commit

7e0c218

1 Parent(s): 3bfd040

update on server ui

Browse files

Files changed (2) hide show

src/scheduler.py +7 -2
src/server.py +64 -3

src/scheduler.py CHANGED Viewed

@@ -71,8 +71,13 @@ def scheduler_thread():
                     args_to_use["ignore_cooldown"] = True
                     logger.info("Using --ignore-cooldown option in scheduled processing")
-                success, message = process_leaderboards_function(args_to_use)
-                logger.info(f"Processing job completed with status: {success}, message: {message}")
             # Wait at least 80% of the interval before checking again
             # This prevents multiple executions and provides a buffer

                     args_to_use["ignore_cooldown"] = True
                     logger.info("Using --ignore-cooldown option in scheduled processing")
+                # Run in a separate thread to avoid blocking the main thread
+                logger.info("Starting processing job in a separate thread")
+                processing_thread = threading.Thread(
+                    target=lambda: process_leaderboards_function(args_to_use)
+                )
+                processing_thread.daemon = True
+                processing_thread.start()
             # Wait at least 80% of the interval before checking again
             # This prevents multiple executions and provides a buffer

src/server.py CHANGED Viewed

@@ -48,6 +48,12 @@ async def root():
     next_run = format_datetime(last_run_time + datetime.timedelta(hours=int(os.environ.get("LEADERBOARD_REPROCESS_INTERVAL_HOURS", 24)))) if last_run_time else "Not yet scheduled"
     last_run = format_datetime(last_run_time) if last_run_time else "Never"
     html_content = f"""
     <!DOCTYPE html>
     <html>
@@ -65,7 +71,7 @@ async def root():
                 }}
                 .status-box {{
                     padding: 30px;
-                    text-align: left;
                     background-color: white;
                     border-radius: 12px;
                     box-shadow: 0 4px 8px rgba(0, 0, 0, 0.05);
@@ -89,15 +95,70 @@ async def root():
                 .status-running {{ color: #1a73e8; font-weight: bold; }}
                 .status-idle {{ color: #188038; font-weight: bold; }}
                 .status-failed {{ color: #d93025; font-weight: bold; }}
             </style>
         </head>
         <body>
             <div class="status-box">
-                <h1>Leaderboards parser agent</h1>
                 <p><span class="status-label">Status</span> <span class="status-{processing_status}">{processing_status}</span></p>
                 <p><span class="status-label">Last run</span> {last_run}</p>
-                {f'<p style="color: #d93025; margin-top: 20px;"><span class="status-label">Error:</span> {processing_error}</p>' if processing_error else ''}
             </div>
         </body>
     </html>
     """

     next_run = format_datetime(last_run_time + datetime.timedelta(hours=int(os.environ.get("LEADERBOARD_REPROCESS_INTERVAL_HOURS", 24)))) if last_run_time else "Not yet scheduled"
     last_run = format_datetime(last_run_time) if last_run_time else "Never"
+    # Calculate timestamp for next run to use in JavaScript
+    next_run_timestamp = ""
+    if last_run_time:
+        next_run_time = last_run_time + datetime.timedelta(hours=int(os.environ.get("LEADERBOARD_REPROCESS_INTERVAL_HOURS", 24)))
+        next_run_timestamp = next_run_time.timestamp() * 1000  # Convert to milliseconds for JavaScript
     html_content = f"""
     <!DOCTYPE html>
     <html>
                 }}
                 .status-box {{
                     padding: 30px;
+                    text-align: center;
                     background-color: white;
                     border-radius: 12px;
                     box-shadow: 0 4px 8px rgba(0, 0, 0, 0.05);
                 .status-running {{ color: #1a73e8; font-weight: bold; }}
                 .status-idle {{ color: #188038; font-weight: bold; }}
                 .status-failed {{ color: #d93025; font-weight: bold; }}
+                .countdown {{
+                    margin-top: 10px;
+                    padding: 8px;
+                    background-color: #f5f5f5;
+                    border-radius: 6px;
+                    display: inline-block;
+                    min-width: 250px;
+                }}
             </style>
         </head>
         <body>
             <div class="status-box">
+                <h1>Leaderboard Parser</h1>
                 <p><span class="status-label">Status</span> <span class="status-{processing_status}">{processing_status}</span></p>
                 <p><span class="status-label">Last run</span> {last_run}</p>
+                {f'<p style="color: #d93025; margin-top: 20px;"><span class="status-label">Error</span> {processing_error}</p>' if processing_error else ''}
+                <div class="countdown" id="countdown">
+                    Calculating time remaining...
+                </div>
             </div>
+            <script>
+                // Set the date we're counting down to (from server)
+                const nextRunTimestamp = {next_run_timestamp};
+                // Function to format time remaining in a human-readable way
+                function formatTimeRemaining(distance) {{
+                    const hours = Math.floor(distance / (1000 * 60 * 60));
+                    const minutes = Math.floor((distance % (1000 * 60 * 60)) / (1000 * 60));
+                    const seconds = Math.floor((distance % (1000 * 60)) / 1000);
+                    return `Next run in <b>${{hours}}h ${{minutes}}m ${{seconds}}s</b>`;
+                }}
+                // Update the countdown every 1 second
+                function updateCountdown() {{
+                    // Get current timestamp
+                    const now = new Date().getTime();
+                    // If no next run is scheduled
+                    if (!nextRunTimestamp) {{
+                        document.getElementById("countdown").innerHTML = "No next run scheduled";
+                        return;
+                    }}
+                    // Find the time remaining
+                    const distance = nextRunTimestamp - now;
+                    // If the countdown is over
+                    if (distance < 0) {{
+                        document.getElementById("countdown").innerHTML = "Scheduled run in progress or overdue";
+                    }} else {{
+                        // Display the result
+                        document.getElementById("countdown").innerHTML = formatTimeRemaining(distance);
+                    }}
+                }}
+                // Initial call to display right away
+                updateCountdown();
+                // Set up interval to update every second
+                setInterval(updateCountdown, 1000);
+            </script>
         </body>
     </html>
     """