Update app.py

app.py

@@ -1,9 +1,6 @@
-from flask import Flask, render_template_string, jsonify, Response  # Import Response
+from flask import Flask, render_template_string, jsonify, Response
 import requests
-import threading
-import time
-from sseclient import SSEClient
-import os  # Import the 'os' module
+import os
 
 app = Flask(__name__)
 
@@ -423,7 +420,7 @@ USERNAME = os.environ.get("USERNAME", "yangtb24")  # Default to "yangtb24" if no
 def fetch_instances(username):
     try:
         response = requests.get(f"https://huggingface.co/api/spaces?author={username}")
-        response.raise_for_status()  # Raise an exception for bad status codes
+        response.raise_for_status()
         user_instances = response.json()
         return [{"id": instance["id"].split('/')[1], "owner": username} for instance in user_instances]
     except requests.exceptions.RequestException as e:
@@ -432,7 +429,6 @@ def fetch_instances(username):
 
 @app.route('/')
 def index():
-    # Pass the username to the template
     return render_template_string(htmlTemplate, username=USERNAME)
 
 @app.route('/instances')
@@ -440,32 +436,43 @@ def get_instances():
     instances = fetch_instances(USERNAME)
     return jsonify(instances)
 
-
 @app.route('/metrics/<username>/<instance_id>')
 def stream_metrics(username, instance_id):
     url = f"https://api.hf.space/v1/{username}/{instance_id}/live-metrics/sse"
 
     def generate():
-        session = requests.Session()  # Create a session object
         try:
-            # Add a timeout (e.g., 10 seconds)
-            response = session.get(url, stream=True, headers={"Accept": "text/event-stream"}, timeout=10)
-            response.raise_for_status()  # Important: raise HTTP errors
-            client = SSEClient(response)
-            for event in client.events():
-                if event.event == 'metric':
-                    yield f"event: {event.event}\\ndata: {event.data}\\n\\n"
+            # Use a reasonable timeout
+            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):
+                if chunk:
+                    buffer += chunk
+                    while "\n\n" in buffer:
+                        event_data, buffer = buffer.split("\n\n", 1)
+                        # Basic SSE parsing (event: ...\ndata: ...)
+                        lines = event_data.split("\n")
+                        event_type = "message"  # Default event type
+                        data_lines = []
+                        for line in lines:
+                            if line.startswith("event:"):
+                                event_type = line.split(":", 1)[1].strip()
+                            elif line.startswith("data:"):
+                                data_lines.append(line.split(":", 1)[1].strip())
+                        
+                        if event_type == "metric": # Only send metric event
+                            yield f"event: {event_type}\ndata: {''.join(data_lines)}\n\n"
+
         except requests.exceptions.RequestException as e:
             print(f"Request Exception: {e}")
-            yield f"event: error\ndata: Connection error: {e}\\n\\n"  # Include error details
+            yield f"event: error\ndata: Connection error: {e}\\n\\n"
         except Exception as e:
             print(f"An error occurred: {e}")
-            yield f"event: error\ndata: An error occurred: {e}\\n\\n"  # Include error details
-        finally:
-            session.close() # Close the session
+            yield f"event: error\ndata: An error occurred: {e}\\n\\n"
 
     return Response(generate(), mimetype='text/event-stream')
 
-
 if __name__ == '__main__':
-    app.run(debug=True, host='0.0.0.0', port=7860) #Huggingface use 7860 port
+    app.run(debug=True, host='0.0.0.0', port=7860)