Spaces:

1hitonline
/

flaskdockernew

Sleeping

App Files Files Community

MySafeCode commited on Jan 30

Commit

3b4d4ac

verified ·

1 Parent(s): a6d1e63

Update app.py

Browse files

Files changed (1) hide show

app.py +177 -65

app.py CHANGED Viewed

@@ -5,73 +5,144 @@ import os
 from flask import Flask, Response, render_template_string
 from io import BytesIO
 from PIL import Image
 os.environ['SDL_VIDEODRIVER'] = 'dummy'
 pygame.init()
-print("✅ PyGame initialized")
 WIDTH, HEIGHT = 400, 300
 shared = {
-    "frame_count": 0,
-    "streaming": True,
-    "last_frame_data": None  # Store raw bytes instead of filename
 }
-def debug_loop():
-    """Debug version that prints everything"""
-    # Test if surfaces work at all
-    print("🎬 Creating test surface...")
-    screen = pygame.Surface((WIDTH, HEIGHT))
-    # Test drawing
-    screen.fill((255, 0, 0))  # RED
-    pixel_color = screen.get_at((50, 50))
-    print(f"🔴 Test draw - Pixel at (50,50): {pixel_color}")
-    # Now test with circle
-    x, y = 100, 100
-    for i in range(5):
-        screen.fill((25, 25, 45))  # Clear
-        pygame.draw.circle(screen, (255, 80, 80), (x + i*20, y), 20)
-        # Get pixel where circle should be
-        pixel = screen.get_at((x + i*20, y))
-        print(f"🔄 Frame {i}: Circle at ({x + i*20},{y}) - Pixel: {pixel}")
-        # Convert to JPEG
-        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_data"] = buf.getvalue()
-        time.sleep(0.5)
-    print("✅ Debug test complete")
-    shared["streaming"] = False
 app = Flask(__name__)
 HTML = '''<html>
-<body style="background:#0f172a; color:white; text-align:center; padding:20px;">
-    <h1>🔍 Debug Test</h1>
-    <div id="status">Testing PyGame drawing...</div>
-    <img id="streamImg" width="400" height="300" style="border:3px solid #60a5fa;">
     <script>
-        function updateImage() {
-            const img = document.getElementById('streamImg');
-            if (img.src) {
-                // Force reload
-                img.src = img.src.split('?')[0] + '?t=' + Date.now();
-            } else {
-                img.src = '/frame';
-            }
         }
-        // Update every 2 seconds
-        setInterval(updateImage, 2000);
-        updateImage();
     </script>
 </body>
 </html>'''
@@ -80,27 +151,68 @@ HTML = '''<html>
 def index():
     return render_template_string(HTML)
-@app.route('/frame')
-def frame():
-    if shared["last_frame_data"]:
-        return Response(
-            shared["last_frame_data"],
-            mimetype='image/jpeg',
-            headers={'Cache-Control': 'no-cache'}
-        )
-    # Create a simple color test image
-    img = Image.new('RGB', (WIDTH, HEIGHT), color=(0, 255, 0))  # GREEN
     buf = BytesIO()
-    img.save(buf, format='JPEG')
-    return Response(buf.getvalue(), mimetype='image/jpeg')
 if __name__ == "__main__":
-    print("🚀 Starting debug test...")
-    # Run debug loop in thread
-    thread = threading.Thread(target=debug_loop, daemon=True)
     thread.start()
     # Start server
-    app.run(host='0.0.0.0', port=7860, debug=False, threaded=True)

 from flask import Flask, Response, render_template_string
 from io import BytesIO
 from PIL import Image
+import random
 os.environ['SDL_VIDEODRIVER'] = 'dummy'
 pygame.init()
+print("🔥 DEBUG START")
 WIDTH, HEIGHT = 400, 300
+# SIMPLE shared state - just a counter and color
 shared = {
+    "counter": 0,
+    "color_index": 0,
+    "last_update": time.time(),
+    "streaming": True
 }
+# Different colors to clearly see changes
+COLORS = [
+    (255, 50, 50),    # Red
+    (50, 255, 50),    # Green
+    (50, 50, 255),    # Blue
+    (255, 255, 50),   # Yellow
+    (255, 50, 255),   # Purple
+    (50, 255, 255),   # Cyan
+]
+def simple_loop():
+    """Super simple - just changes color and counter"""
+    while shared["streaming"]:
+        time.sleep(0.5)  # Change every 500ms
+        # Update state
+        shared["counter"] += 1
+        shared["color_index"] = (shared["color_index"] + 1) % len(COLORS)
+        shared["last_update"] = time.time()
+        # Log to prove it's running
+        print(f"🔄 UPDATE #{shared['counter']}: Color {shared['color_index']} at {time.strftime('%H:%M:%S')}")
 app = Flask(__name__)
 HTML = '''<html>
+<head>
+    <style>
+        body { background:#0f172a; color:white; text-align:center; padding:20px; font-family: monospace; }
+        #frame { border:3px solid white; width:400px; height:300px; margin:20px auto; }
+        .color-box { width:50px; height:50px; display:inline-block; margin:10px; border:2px solid white; }
+        .stats { background:#1e293b; padding:15px; border-radius:10px; display:inline-block; }
+    </style>
+</head>
+<body>
+    <h1>🧪 DEBUG TEST</h1>
+    <div class="stats">
+        <div>Counter: <span id="counter">0</span></div>
+        <div>Color: <span id="color">Red</span></div>
+        <div>Last Update: <span id="time">Never</span></div>
+        <div>Frame: <span id="framenum">0</span></div>
+    </div>
+    <div id="frame"></div>
+    <div>
+        <div class="color-box" style="background:rgb(255,50,50)" title="Red"></div>
+        <div class="color-box" style="background:rgb(50,255,50)" title="Green"></div>
+        <div class="color-box" style="background:rgb(50,50,255)" title="Blue"></div>
+        <div class="color-box" style="background:rgb(255,255,50)" title="Yellow"></div>
+        <div class="color-box" style="background:rgb(255,50,255)" title="Purple"></div>
+        <div class="color-box" style="background:rgb(50,255,255)" title="Cyan"></div>
+    </div>
+    <div style="margin-top:20px;">
+        <button onclick="manualRefresh()">🔄 Manual Refresh</button>
+        <button onclick="forceNew()">⚡ Force New Image</button>
+    </div>
     <script>
+        let lastCounter = 0;
+        let frameNum = 0;
+        function updateDisplay() {
+            frameNum++;
+            document.getElementById('framenum').textContent = frameNum;
+            fetch('/data?_=' + Date.now())
+                .then(r => r.json())
+                .then(data => {
+                    // Update text
+                    document.getElementById('counter').textContent = data.counter;
+                    document.getElementById('color').textContent = ['Red','Green','Blue','Yellow','Purple','Cyan'][data.color_index];
+                    document.getElementById('time').textContent = new Date(data.last_update * 1000).toLocaleTimeString();
+                    // Update visual frame
+                    const color = `rgb(${data.color[0]},${data.color[1]},${data.color[2]})`;
+                    document.getElementById('frame').style.background = color;
+                    document.getElementById('frame').innerHTML = `
+                        <div style="padding-top:120px; font-size:24px;">
+                            #${data.counter}<br>
+                            ${data.color_name}
+                        </div>
+                    `;
+                    // Log if changed
+                    if (data.counter !== lastCounter) {
+                        console.log(`New update: #${data.counter} (${data.color_name})`);
+                        lastCounter = data.counter;
+                    }
+                })
+                .catch(err => {
+                    console.error('Fetch error:', err);
+                    document.getElementById('time').textContent = 'ERROR';
+                });
+        }
+        function manualRefresh() {
+            console.log('Manual refresh triggered');
+            updateDisplay();
+        }
+        function forceNew() {
+            console.log('Forcing new image...');
+            fetch('/image?_=' + Date.now())
+                .then(r => r.blob())
+                .then(blob => {
+                    const url = URL.createObjectURL(blob);
+                    const img = new Image();
+                    img.onload = () => {
+                        document.getElementById('frame').style.background = `url(${url})`;
+                        console.log('New image loaded');
+                    };
+                    img.src = url;
+                });
         }
+        // Update every 500ms
+        setInterval(updateDisplay, 500);
+        updateDisplay();
+        console.log('Debug client started');
     </script>
 </body>
 </html>'''
 def index():
     return render_template_string(HTML)
+@app.route('/data')
+def get_data():
+    """Return current state as JSON"""
+    color = COLORS[shared["color_index"]]
+    color_names = ["Red", "Green", "Blue", "Yellow", "Purple", "Cyan"]
+    return {
+        'counter': shared["counter"],
+        'color_index': shared["color_index"],
+        'color': color,
+        'color_name': color_names[shared["color_index"]],
+        'last_update': shared["last_update"],
+        'timestamp': time.time()
+    }
+@app.route('/image')
+def get_image():
+    """Generate a unique image with counter and color"""
+    color = COLORS[shared["color_index"]]
+    # Create image with counter
+    img = Image.new('RGB', (WIDTH, HEIGHT), color=color)
+    # Add counter text (simple version)
+    from PIL import ImageDraw, ImageFont
+    draw = ImageDraw.Draw(img)
+    # Draw counter in center
+    text = f"#{shared['counter']}"
+    # Simple text drawing
+    for i in range(len(text)):
+        x = 180 + i * 20
+        y = 140
+        draw.rectangle([x, y, x+15, y+20], fill=(255, 255, 255))
+    # Convert to bytes
     buf = BytesIO()
+    img.save(buf, format='PNG')  # PNG for transparency
+    return Response(
+        buf.getvalue(),
+        mimetype='image/png',
+        headers={
+            'Cache-Control': 'no-cache, no-store, must-revalidate',
+            'Pragma': 'no-cache',
+            'Expires': '0'
+        }
+    )
 if __name__ == "__main__":
+    print("🚀 Starting debug server...")
+    print("Expecting updates every 0.5 seconds")
+    print("Check browser console for logs")
+    # Start background thread
+    thread = threading.Thread(target=simple_loop, daemon=True)
     thread.start()
     # Start server
+    app.run(
+        host='0.0.0.0',
+        port=int(os.environ.get('PORT', 7860)),
+        debug=False,
+        threaded=True
+    )