Spaces:

yangtb24
/

Monitor

Paused

App Files Files Community

yangtb24 commited on Feb 15, 2025

Commit

48d99a6

verified ·

1 Parent(s): 8a62759

Update app.py

Browse files

Files changed (1) hide show

app.py +14 -18

app.py CHANGED Viewed

@@ -6,6 +6,7 @@ import json
 app = Flask(__name__)
 lightModeStyle = """
 * {
   margin: 0;
   padding: 0;
@@ -106,8 +107,6 @@ body {
   width: 20px;
   height: 20px;
   border-radius: 4px;
-  /*  You might want to add:  */
-  /*  fill: currentColor;  */
 }
 .metric-grid {
   display: grid;
@@ -144,12 +143,10 @@ body {
 }
 .status-online {
   background-color: #2ecc71;
-  /* color: #2ecc71;  <--  This is redundant, as background-color sets the color */
   box-shadow: 0 0 5px rgba(46, 204, 113, 0.4);
 }
 .status-offline {
   background-color: #e74c3c;
-  /* color: #e74c3c;  <--  Redundant */
   box-shadow: 0 0 5px rgba(231, 76, 60, 0.4);
 }
 @keyframes fadeIn {
@@ -198,14 +195,17 @@ body {
 }
 """
-htmlTemplate = """
 <!DOCTYPE html>
 <html lang="zh">
 <head>
   <meta charset="UTF-8">
   <title>HF Space Monitor</title>
   <link rel="icon" href="data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 100 100%22><text y=%22.9em%22 font-size=%2290%22>🚀</text></svg>">
-  <style>{}</style>
   <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0/css/all.min.css" integrity="sha512-9usAa10IRO0HhonpyAIVpjrylPvoDwiPUiKdWk5t3PyolY1cOd4DSE0Ga+ri4AuTroPR5aQvXU9xC6qOPnzFeg==" crossorigin="anonymous" referrerpolicy="no-referrer" />
 </head>
 <body>
@@ -224,7 +224,7 @@ htmlTemplate = """
     </div>
   </div>
   <script>
-    const username = '{}';
     async function fetchInstances() {{
       try {{
@@ -240,7 +240,7 @@ htmlTemplate = """
      class MetricsManager {{
       constructor() {{
         this.eventSources = new Map();
-        this.serversData = new Map(); // Use a consistent name
         this.instanceOwners = new Map();
         this.spaceIds = new Map();
       }}
@@ -271,7 +271,7 @@ htmlTemplate = """
         eventSource.onerror = (error) => {{
             console.error(`EventSource 错误 (${{instanceId}}):`, error);
             eventSource.close();
-            this.eventSources.delete(instanceId); // Remove on error
         }};
       }}
@@ -279,7 +279,7 @@ htmlTemplate = """
       disconnectAll() {{
         this.eventSources.forEach(es => es.close());
         this.eventSources.clear();
-        this.serversData.clear(); // Clear server data on disconnect
       }}
     }}
@@ -404,8 +404,7 @@ htmlTemplate = """
   </script>
 </body>
 </html>
-""".format(lightModeStyle, USERNAME)
 @app.route('/')
@@ -424,7 +423,7 @@ def stream_metrics(username, instance_id):
     def generate():
         try:
             response = requests.get(url, stream=True, headers={"Accept": "text/event-stream"}, timeout=15)
-            response.raise_for_status()  # Raise HTTPError for bad responses (4xx or 5xx)
             buffer = ""
             for chunk in response.iter_content(chunk_size=1024, decode_unicode=True):
@@ -433,7 +432,7 @@ def stream_metrics(username, instance_id):
                     while "\n\n" in buffer:
                         event_data, buffer = buffer.split("\n\n", 1)
                         lines = event_data.split("\n")
-                        event_type = "message"  # Default event type
                         data_lines = []
                         for line in lines:
@@ -444,7 +443,6 @@ def stream_metrics(username, instance_id):
                         if event_type == "metric":
                             try:
-                                # Parse and re-serialize to ensure valid JSON
                                 json_data = json.loads("".join(data_lines))
                                 yield f"event: {event_type}\ndata: {json.dumps(json_data)}\n\n"
                             except json.JSONDecodeError as e:
@@ -453,15 +451,13 @@ def stream_metrics(username, instance_id):
         except requests.exceptions.RequestException as e:
             print(f"Request Exception: {e}")
-            yield f"event: error\ndata: Connection error\n\n"  # Simplified error message
         except Exception as e:
             print(f"An error occurred: {e}")
             yield f"event: error\ndata: An unexpected error occurred\n\n"
     return Response(generate(), mimetype='text/event-stream')
 if __name__ == '__main__':
     app.run(debug=True, host='0.0.0.0', port=7860)

 app = Flask(__name__)
 lightModeStyle = """
+/* ... (Your CSS styles, same as before) ... */
 * {
   margin: 0;
   padding: 0;
   width: 20px;
   height: 20px;
   border-radius: 4px;
 }
 .metric-grid {
   display: grid;
 }
 .status-online {
   background-color: #2ecc71;
   box-shadow: 0 0 5px rgba(46, 204, 113, 0.4);
 }
 .status-offline {
   background-color: #e74c3c;
   box-shadow: 0 0 5px rgba(231, 76, 60, 0.4);
 }
 @keyframes fadeIn {
 }
 """
+# Define USERNAME *before* using it in htmlTemplate
+USERNAME = os.environ.get("USERNAME", "yangtb24")
+htmlTemplate = f"""
 <!DOCTYPE html>
 <html lang="zh">
 <head>
   <meta charset="UTF-8">
   <title>HF Space Monitor</title>
   <link rel="icon" href="data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 100 100%22><text y=%22.9em%22 font-size=%2290%22>🚀</text></svg>">
+  <style>{lightModeStyle}</style>
   <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0/css/all.min.css" integrity="sha512-9usAa10IRO0HhonpyAIVpjrylPvoDwiPUiKdWk5t3PyolY1cOd4DSE0Ga+ri4AuTroPR5aQvXU9xC6qOPnzFeg==" crossorigin="anonymous" referrerpolicy="no-referrer" />
 </head>
 <body>
     </div>
   </div>
   <script>
+    const username = '{USERNAME}';
     async function fetchInstances() {{
       try {{
      class MetricsManager {{
       constructor() {{
         this.eventSources = new Map();
+        this.serversData = new Map();
         this.instanceOwners = new Map();
         this.spaceIds = new Map();
       }}
         eventSource.onerror = (error) => {{
             console.error(`EventSource 错误 (${{instanceId}}):`, error);
             eventSource.close();
+            this.eventSources.delete(instanceId);
         }};
       }}
       disconnectAll() {{
         this.eventSources.forEach(es => es.close());
         this.eventSources.clear();
+        this.serversData.clear();
       }}
     }}
   </script>
 </body>
 </html>
+"""
 @app.route('/')
     def generate():
         try:
             response = requests.get(url, stream=True, headers={"Accept": "text/event-stream"}, timeout=15)
+            response.raise_for_status()
             buffer = ""
             for chunk in response.iter_content(chunk_size=1024, decode_unicode=True):
                     while "\n\n" in buffer:
                         event_data, buffer = buffer.split("\n\n", 1)
                         lines = event_data.split("\n")
+                        event_type = "message"
                         data_lines = []
                         for line in lines:
                         if event_type == "metric":
                             try:
                                 json_data = json.loads("".join(data_lines))
                                 yield f"event: {event_type}\ndata: {json.dumps(json_data)}\n\n"
                             except json.JSONDecodeError as e:
         except requests.exceptions.RequestException as e:
             print(f"Request Exception: {e}")
+            yield f"event: error\ndata: Connection error\n\n"
         except Exception as e:
             print(f"An error occurred: {e}")
             yield f"event: error\ndata: An unexpected error occurred\n\n"
     return Response(generate(), mimetype='text/event-stream')
 if __name__ == '__main__':
     app.run(debug=True, host='0.0.0.0', port=7860)