Update app.py

app.py

@@ -27,7 +27,7 @@ FUN_USERNAMES = [
     "MysticMoose 🦌", "GlitchGnome 🧚", "VortexViper 🐍", "ChronoChimp 🐒"
 ]
 
-# Directories
+# Directory for logs
 LOG_DIR = "user_logs"
 os.makedirs(LOG_DIR, exist_ok=True)
 
@@ -41,7 +41,6 @@ def get_node_name():
 
 def get_log_file(username):
     timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
-    # Replace spaces and emojis with underscores for valid filenames
     safe_username = username.replace(" ", "_").encode('ascii', 'ignore').decode('ascii')
     return os.path.join(LOG_DIR, f"{safe_username}_{timestamp}.md")
 
@@ -49,7 +48,6 @@ def save_log_entry(username, entry):
     log_file = get_log_file(username)
     try:
         with open(log_file, 'a') as f:
-            # Format as Markdown with timestamp
             f.write(f"```log\n[{entry['timestamp']}] {entry['level']}: {entry['message']}\n```\n")
         logger.info(f"Saved log entry to {log_file}")
         return log_file
@@ -66,7 +64,6 @@ def load_latest_log(username):
     try:
         with open(os.path.join(LOG_DIR, latest_file), 'r') as f:
             content = f.read()
-        # Add line numbers to the Markdown content
         lines = content.strip().split('\n')
         numbered_content = "\n".join(f"{i+1}. {line}" for i, line in enumerate(lines))
         return f"# Log for {username} ({latest_file})\n\n{numbered_content}"
@@ -79,7 +76,7 @@ active_connections = {}
 async def websocket_handler(websocket, path):
     try:
         client_id = str(uuid.uuid4())
-        room_id = "logs"  # Simplified to a single logs room
+        room_id = "logs"
         active_connections.setdefault(room_id, {})[client_id] = websocket
         logger.info(f"Client {client_id} connected to logs")
 
@@ -128,7 +125,6 @@ class LogBroadcastHandler(logging.Handler):
         }
         log_file = save_log_entry(self.username, entry)
         if log_file:
-            # Notify WebSocket clients of new log file
             asyncio.create_task(broadcast_message({
                 "type": "log",
                 "content": f"New log entry saved to {log_file}",
@@ -138,29 +134,25 @@ class LogBroadcastHandler(logging.Handler):
             }, "logs"))
 
 def create_gradio_interface(username):
-    logger.handlers = [LogBroadcastHandler(username)]  # Replace handlers with user-specific one
-    with gr.Blocks(title=f"Log Viewer: {NODE_NAME}") as interface:
-        interface.css = """
-            .code-container { font-family: monospace; background: #1e1e1e; color: #d4d4d4; padding: 10px; border-radius: 5px; }
-        """
-        interface.js = f"""
-        () => {{
-            setInterval(async () => {{
-                const response = await fetch('/get_log?username={username}');
-                const logContent = await response.text();
-                document.getElementById('log-display').innerText = logContent;
-            }}, 900); // Refresh every 0.9 seconds
-        }}
-        """
+    logger.handlers = [LogBroadcastHandler(username)]
+    def update_log_display(dummy_input):
+        return load_latest_log(username)
 
+    with gr.Blocks(title=f"Log Viewer: {NODE_NAME}", css=".code-container { font-family: monospace; background: #1e1e1e; color: #d4d4d4; padding: 10px; border-radius: 5px; }") as interface:
         gr.Markdown(f"# Log Viewer for {username} on Node: {NODE_NAME}")
-        gr.Markdown("Your logs are displayed below, auto-refreshing every 0.9 seconds.")
-        log_display = gr.Code(label="Your Latest Log", language="markdown", lines=20, elem_classes=["code-container"], elem_id="log-display")
-
-        # Custom endpoint to fetch log
-        def get_log():
-            return load_latest_log(username)
-        interface.load(get_log, [], [log_display])
+        gr.Markdown("Logs update live as new entries are written.")
+        # Dummy input to trigger live updates
+        dummy_input = gr.Textbox(visible=False, value="trigger", interactive=True)
+        log_display = gr.Code(label="Your Latest Log", language="markdown", lines=20, elem_classes=["code-container"])
+
+        # Set live=True to continuously update the log display
+        interface = gr.Interface(
+            fn=update_log_display,
+            inputs=[dummy_input],
+            outputs=[log_display],
+            live=True,
+            title=f"Log Viewer: {NODE_NAME}"
+        )
 
     return interface
 
@@ -169,24 +161,14 @@ async def main():
     NODE_NAME, port = get_node_name()
     await start_websocket_server()
 
-    # Assign a random username on startup
+    # Assign a random username
     username = random.choice(FUN_USERNAMES)
     logger.info(f"Assigned username: {username}")
 
     # Create and run Gradio interface
     interface = create_gradio_interface(username)
-    
-    from starlette.routing import Route
-    from starlette.responses import PlainTextResponse
-    
-    async def get_log_endpoint(request):
-        return PlainTextResponse(load_latest_log(username))
-    
-    app = gr.routes.App.create_app(interface)
-    app.routes.append(Route("/get_log", get_log_endpoint))
-    
     import uvicorn
-    await uvicorn.Server(uvicorn.Config(app, host="0.0.0.0", port=port)).serve()
+    await uvicorn.Server(uvicorn.Config(interface, host="0.0.0.0", port=port)).serve()
 
 if __name__ == "__main__":
     asyncio.run(main())