Spaces:

1hitonline
/

flaskdockernew

Sleeping

App Files Files Community

MySafeCode commited on Jan 30

Commit

c1ecc31

verified ·

1 Parent(s): 3a405e3

Update app.py

Browse files

Files changed (1) hide show

app.py +84 -66

app.py CHANGED Viewed

@@ -13,11 +13,12 @@ WIDTH, HEIGHT = 400, 300
 shared = {
     "frame_count": 0,
     "streaming": True,
-    "x_position": 200,  # Track circle position
-    "current_filename": None
 }
 def game_loop():
     screen = pygame.Surface((WIDTH, HEIGHT))
     x, y = 200, 150
     speed = 5
@@ -30,28 +31,27 @@ def game_loop():
         if x < 30 or x > WIDTH-30:
             speed *= -1
-        # Draw
         screen.fill((25, 25, 45))
         pygame.draw.circle(screen, (255, 80, 80), (int(x), int(y)), 20)
-        # Create UNIQUE filename with position
-        shared["frame_count"] += 1
-        filename = f"frame_{shared['frame_count']}_x{x}.jpg"
-        # Save directly with PyGame (fastest)
-        pygame.image.save(screen, filename)
-        # Update shared state
         shared["x_position"] = x
-        shared["current_filename"] = filename
-        # Clean old files (keep last 5 only)
-        all_files = sorted([f for f in os.listdir('.') if f.startswith('frame_')])
-        for old_file in all_files[:-5]:
-            try:
-                os.remove(old_file)
-            except:
-                pass
         # Control FPS
         elapsed = time.time() - start
@@ -62,50 +62,60 @@ app = Flask(__name__)
 HTML = '''<html>
 <body style="background:#0f172a; color:white; padding:20px; text-align:center;">
-    <h1>🎮 PyGame Stream</h1>
-    <!-- Image loads from unique URL each time -->
     <img id="stream"
          width="400"
          height="300"
-         style="border:3px solid #60a5fa;"
-         src="/get_frame">
-    <div style="margin-top:20px; background:#1e293b; padding:15px; border-radius:10px; display:inline-block;">
-        Frame: <span id="count">0</span> |
-        Position: <span id="pos">(200,150)</span> |
-        File: <span id="file">none</span>
     </div>
     <script>
-        let lastFrame = 0;
         function updateStream() {
-            // Get fresh frame with timestamp
             const img = document.getElementById('stream');
-            img.src = '/get_frame?t=' + Date.now();
-            // Get stats
-            fetch('/stats?t=' + Date.now())
                 .then(r => r.json())
                 .then(data => {
-                    if (data.frame_count > lastFrame) {
-                        document.getElementById('count').textContent = data.frame_count;
-                        document.getElementById('pos').textContent = `(${data.x},150)`;
-                        document.getElementById('file').textContent = data.filename;
-                        lastFrame = data.frame_count;
-                        // Visual feedback
-                        img.style.borderColor = '#10b981';
-                        setTimeout(() => {
-                            img.style.borderColor = '#60a5fa';
-                        }, 100);
-                    }
                 });
         }
-        // Fast polling - 50ms (20 FPS)
-        setInterval(updateStream, 50);
     </script>
 </body>
 </html>'''
@@ -115,25 +125,20 @@ def index():
     return render_template_string(HTML)
 @app.route('/stats')
-def get_stats():
-    """Return current game state"""
     return {
         'frame_count': shared['frame_count'],
         'x': shared['x_position'],
-        'filename': shared['current_filename'] or 'frame_0.jpg'
     }
-@app.route('/get_frame')
-def get_frame():
-    """Serve the LATEST frame file"""
-    filename = shared.get('current_filename', 'frame_0.jpg')
-    if os.path.exists(filename):
-        with open(filename, 'rb') as f:
-            data = f.read()
         return Response(
-            data,
             mimetype='image/jpeg',
             headers={
                 'Cache-Control': 'no-cache, no-store, must-revalidate',
@@ -143,29 +148,42 @@ def get_frame():
             }
         )
-    # Fallback: generate a simple frame
     screen = pygame.Surface((WIDTH, HEIGHT))
     screen.fill((25, 25, 45))
     pygame.draw.circle(screen, (255, 80, 80), (200, 150), 20)
     buf = BytesIO()
-    pygame.image.save(screen, buf, format='JPEG')
-    buf.seek(0)
     return Response(buf.getvalue(), mimetype='image/jpeg')
 if __name__ == "__main__":
     # Create initial frame
     screen = pygame.Surface((WIDTH, HEIGHT))
     screen.fill((25, 25, 45))
     pygame.draw.circle(screen, (255, 80, 80), (200, 150), 20)
-    pygame.image.save(screen, "frame_0.jpg")
-    shared["current_filename"] = "frame_0.jpg"
-    print("✅ Created initial frame_0.jpg")
     # Start game loop
-    threading.Thread(target=game_loop, daemon=True).start()
     # Start server
-    app.run(host='0.0.0.0', port=7860, debug=False, threaded=True)

 shared = {
     "frame_count": 0,
     "streaming": True,
+    "x_position": 200,
+    "last_frame_bytes": None  # Store frame as bytes in memory
 }
 def game_loop():
+    """PyGame draws, PIL converts to web-ready JPEG"""
     screen = pygame.Surface((WIDTH, HEIGHT))
     x, y = 200, 150
     speed = 5
         if x < 30 or x > WIDTH-30:
             speed *= -1
+        # PyGame: Draw to surface
         screen.fill((25, 25, 45))
         pygame.draw.circle(screen, (255, 80, 80), (int(x), int(y)), 20)
+        pygame.draw.circle(screen, (255, 255, 255), (int(x), int(y)), 20, 2)
+        # Convert PyGame surface to PIL Image
+        frame_str = pygame.image.tostring(screen, 'RGB')
+        img = Image.frombytes('RGB', (WIDTH, HEIGHT), frame_str)
+        # PIL: Optimize for web (small, fast JPEG)
+        buf = BytesIO()
+        img.save(buf, format='JPEG', quality=85, optimize=True)
+        # Store frame in memory (no filesystem!)
+        shared["frame_count"] += 1
         shared["x_position"] = x
+        shared["last_frame_bytes"] = buf.getvalue()
+        # Log occasionally
+        if shared["frame_count"] % 10 == 0:
+            print(f"Frame {shared['frame_count']}: X={x}")
         # Control FPS
         elapsed = time.time() - start
 HTML = '''<html>
 <body style="background:#0f172a; color:white; padding:20px; text-align:center;">
+    <h1>🎮 PyGame + PIL Stream</h1>
+    <!-- Image auto-updates via JavaScript -->
     <img id="stream"
          width="400"
          height="300"
+         style="border:3px solid #60a5fa; background:black;">
+    <div style="margin:20px auto; background:#1e293b; padding:15px; border-radius:10px; width:400px;">
+        <div>Frame: <span id="count">0</span></div>
+        <div>Position: X=<span id="pos">200</span></div>
+        <div>FPS: <span id="fps">0</span></div>
     </div>
     <script>
+        let frameCounter = 0;
+        let lastUpdate = Date.now();
         function updateStream() {
             const img = document.getElementById('stream');
+            const timestamp = Date.now();
+            // Force fresh image load
+            img.src = `/frame?t=${timestamp}`;
+            // Update stats
+            frameCounter++;
+            const now = Date.now();
+            if (now - lastUpdate >= 1000) {
+                const fps = frameCounter / ((now - lastUpdate) / 1000);
+                document.getElementById('fps').textContent = fps.toFixed(1);
+                frameCounter = 0;
+                lastUpdate = now;
+            }
+            // Get latest position
+            fetch(`/stats?t=${timestamp}`)
                 .then(r => r.json())
                 .then(data => {
+                    document.getElementById('count').textContent = data.frame_count;
+                    document.getElementById('pos').textContent = data.x;
                 });
         }
+        // Update every 33ms (~30 FPS)
+        setInterval(updateStream, 33);
+        // Image load events for visual feedback
+        document.getElementById('stream').onload = function() {
+            this.style.borderColor = '#10b981';
+            setTimeout(() => this.style.borderColor = '#60a5fa', 100);
+        };
+        console.log('Stream started');
     </script>
 </body>
 </html>'''
     return render_template_string(HTML)
 @app.route('/stats')
+def stats():
+    """Return game state as JSON"""
     return {
         'frame_count': shared['frame_count'],
         'x': shared['x_position'],
+        'time': time.time()
     }
+@app.route('/frame')
+def frame():
+    """Serve the latest frame as JPEG"""
+    if shared["last_frame_bytes"]:
         return Response(
+            shared["last_frame_bytes"],
             mimetype='image/jpeg',
             headers={
                 'Cache-Control': 'no-cache, no-store, must-revalidate',
             }
         )
+    # Create a default frame if none exists yet
     screen = pygame.Surface((WIDTH, HEIGHT))
     screen.fill((25, 25, 45))
     pygame.draw.circle(screen, (255, 80, 80), (200, 150), 20)
+    frame_str = pygame.image.tostring(screen, 'RGB')
+    img = Image.frombytes('RGB', (WIDTH, HEIGHT), frame_str)
     buf = BytesIO()
+    img.save(buf, format='JPEG')
     return Response(buf.getvalue(), mimetype='image/jpeg')
 if __name__ == "__main__":
+    print("🚀 Starting PyGame + PIL stream...")
     # Create initial frame
     screen = pygame.Surface((WIDTH, HEIGHT))
     screen.fill((25, 25, 45))
     pygame.draw.circle(screen, (255, 80, 80), (200, 150), 20)
+    frame_str = pygame.image.tostring(screen, 'RGB')
+    img = Image.frombytes('RGB', (WIDTH, HEIGHT), frame_str)
+    buf = BytesIO()
+    img.save(buf, format='JPEG')
+    shared["last_frame_bytes"] = buf.getvalue()
     # Start game loop
+    thread = threading.Thread(target=game_loop, daemon=True)
+    thread.start()
+    # Wait a moment for first update
+    time.sleep(0.5)
     # Start server
+    app.run(
+        host='0.0.0.0',
+        port=int(os.environ.get('PORT', 7860)),
+        debug=False,
+        threaded=True
+    )