Update app_enhanced.py

app_enhanced.py

@@ -1,271 +1,336 @@
-import spaces # <--- CRITICAL: MUST BE LINE 1
+import spaces  # <--- CRITICAL: MUST BE THE FIRST IMPORT
 import os
-import torch
+import time
+import threading
+import json
+import traceback
+import logging
+import string
+import random
+import shutil
+import cv2
+import math
+import numpy as np
+import srt
+from flask import Flask, jsonify, request, send_from_directory, send_file
 
 # ======================================================
-# 🧠 ZEROGPU FUNCTIONS (Must be at top-level)
+# 🧠 GLOBAL GPU FUNCTIONS (Must be at top level for detection)
 # ======================================================
+@spaces.GPU
+def gpu_warmup():
+    import torch
+    print(f"✅ ZeroGPU Warmup: CUDA Available: {torch.cuda.is_available()}")
+    return True
 
-@spaces.GPU(duration=120)
+@spaces.GPU(duration=300)
 def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_pages, panels_per_page_req):
-    import cv2
-    import numpy as np
-    import json
+    print(f"🚀 GPU Task Started: {video_path} | Pages: {target_pages} | Panels/Page: {panels_per_page_req}")
     
     cap = cv2.VideoCapture(video_path)
     if not cap.isOpened(): raise Exception("Cannot open video")
     fps = cap.get(cv2.CAP_PROP_FPS) or 25
     total_frames = int(cap.get(cv2.CAP_PROP_FRAME_COUNT))
     duration = total_frames / fps
-    
-    total_panels = int(target_pages) * int(panels_per_page_req)
-    # Grab frames at even intervals
-    timestamps = np.linspace(1, max(1, duration - 1), total_panels)
-    
+    cap.release()
+
+    # Simple frame extraction logic
+    target_pages = int(target_pages)
+    panels_per_page = int(panels_per_page_req)
+    total_panels_needed = target_pages * panels_per_page
+
+    times = np.linspace(1, max(1, duration-1), total_panels_needed)
     frame_metadata = {}
-    frame_files = []
+    frame_files_ordered = []
 
-    for i, ts in enumerate(timestamps):
-        cap.set(cv2.CAP_PROP_POS_MSEC, ts * 1000)
+    cap = cv2.VideoCapture(video_path)
+    for i, t in enumerate(times):
+        cap.set(cv2.CAP_PROP_POS_MSEC, t * 1000)
         ret, frame = cap.read()
         if ret:
             fname = f"frame_{i:04d}.png"
-            cv2.imwrite(os.path.join(frames_dir, fname), frame)
-            frame_metadata[fname] = {'time': ts, 'dialogue': f"Dialogue {i+1}"}
-            frame_files.append(fname)
+            p = os.path.join(frames_dir, fname)
+            cv2.imwrite(p, frame)
+            frame_metadata[fname] = {'dialogue': f"Dialogue {i+1}", 'time': t}
+            frame_files_ordered.append(fname)
     cap.release()
 
-    with open(metadata_path, 'w') as f:
-        json.dump(frame_metadata, f)
-
+    with open(metadata_path, 'w') as f: json.dump(frame_metadata, f, indent=2)
+            
     pages = []
-    for i in range(int(target_pages)):
-        start = i * int(panels_per_page_req)
-        subset = frame_files[start:start + int(panels_per_page_req)]
-        if subset:
-            pages.append({
-                'panels': [{'image': f} for f in subset],
-                'bubbles': [{'dialog': frame_metadata[f]['dialogue'], 'type': 'speech'} for f in subset]
-            })
+    for i in range(target_pages):
+        start_idx = i * panels_per_page
+        end_idx = start_idx + panels_per_page
+        p_frames = frame_files_ordered[start_idx:end_idx]
+        if p_frames:
+            pg_panels = [{'image': f} for f in p_frames]
+            # Create a simple bubble for each
+            pg_bubbles = [{'dialog': frame_metadata[f]['dialogue'], 'type': 'speech', 'classes': 'speech-bubble speech tail-bottom'} for f in p_frames]
+            pages.append({'panels': pg_panels, 'bubbles': pg_bubbles})
+        
     return pages
 
 @spaces.GPU
 def regen_frame_gpu(video_path, frames_dir, metadata_path, fname, direction):
     import cv2
     import json
+    if not os.path.exists(metadata_path): return {"success": False}
     with open(metadata_path, 'r') as f: meta = json.load(f)
     t = meta[fname]['time']
     cap = cv2.VideoCapture(video_path)
     fps = cap.get(cv2.CAP_PROP_FPS) or 25
-    new_t = max(0, t + (1.0/fps * (1 if direction == 'forward' else -1)))
+    offset = (1.0/fps) * (1 if direction == 'forward' else -1)
+    new_t = max(0, t + offset)
     cap.set(cv2.CAP_PROP_POS_MSEC, new_t * 1000)
     ret, frame = cap.read()
     cap.release()
     if ret:
         cv2.imwrite(os.path.join(frames_dir, fname), frame)
         meta[fname]['time'] = new_t
-        with open(metadata_path, 'w') as f: json.dump(meta, f)
-        return True
-    return False
+        with open(metadata_path, 'w') as f: json.dump(meta, f, indent=2)
+        return {"success": True}
+    return {"success": False}
+
+@spaces.GPU
+def get_frame_at_ts_gpu(video_path, frames_dir, metadata_path, fname, ts):
+    import cv2
+    import json
+    cap = cv2.VideoCapture(video_path)
+    cap.set(cv2.CAP_PROP_POS_MSEC, float(ts) * 1000)
+    ret, frame = cap.read()
+    cap.release()
+    if ret:
+        cv2.imwrite(os.path.join(frames_dir, fname), frame)
+        if os.path.exists(metadata_path):
+            with open(metadata_path, 'r') as f: meta = json.load(f)
+            meta[fname]['time'] = float(ts)
+            with open(metadata_path, 'w') as f: json.dump(meta, f, indent=2)
+        return {"success": True}
+    return {"success": False}
 
 # ======================================================
-# ⚙️ APP & STORAGE SETUP
+# 💾 PERSISTENT STORAGE CONFIGURATION
 # ======================================================
-import time
-import threading
-import json
-import string
-import random
-import shutil
-from flask import Flask, jsonify, request, send_from_directory, send_file
-
 BASE_STORAGE_PATH = '/data' if os.path.exists('/data') else '.'
 BASE_USER_DIR = os.path.join(BASE_STORAGE_PATH, "userdata")
+SAVED_COMICS_DIR = os.path.join(BASE_STORAGE_PATH, "saved_comics")
 os.makedirs(BASE_USER_DIR, exist_ok=True)
+os.makedirs(SAVED_COMICS_DIR, exist_ok=True)
 
-app = Flask(__name__)
-
-class ComicBackend:
+# ======================================================
+# 💻 BACKEND CLASS
+# ======================================================
+class EnhancedComicGenerator:
     def __init__(self, sid):
         self.sid = sid
-        self.dir = os.path.join(BASE_USER_DIR, sid)
-        self.v_path = os.path.join(self.dir, 'video.mp4')
-        self.f_dir = os.path.join(self.dir, 'frames')
-        self.o_dir = os.path.join(self.dir, 'output')
-        os.makedirs(self.f_dir, exist_ok=True)
-        os.makedirs(self.o_dir, exist_ok=True)
-        self.meta_p = os.path.join(self.f_dir, 'metadata.json')
+        self.user_dir = os.path.join(BASE_USER_DIR, sid)
+        self.video_path = os.path.join(self.user_dir, 'uploaded.mp4')
+        self.frames_dir = os.path.join(self.user_dir, 'frames')
+        self.output_dir = os.path.join(self.user_dir, 'output')
+        os.makedirs(self.frames_dir, exist_ok=True)
+        os.makedirs(self.output_dir, exist_ok=True)
+        self.metadata_path = os.path.join(self.frames_dir, 'frame_metadata.json')
 
-    def write_status(self, msg, prog):
-        with open(os.path.join(self.o_dir, 'status.json'), 'w') as f:
-            json.dump({'message': msg, 'progress': prog}, f)
-
-    def run(self, pgs, ppp):
+    def run(self, target_pages, panels_per_page):
         try:
-            self.write_status("Running ZeroGPU Task...", 25)
-            data = generate_comic_gpu(self.v_path, self.dir, self.f_dir, self.meta_p, pgs, ppp)
-            with open(os.path.join(self.o_dir, 'pages.json'), 'w') as f:
-                json.dump(data, f)
+            self.write_status("GPU Extracting...", 10)
+            data = generate_comic_gpu(self.video_path, self.user_dir, self.frames_dir, self.metadata_path, int(target_pages), int(panels_per_page))
+            with open(os.path.join(self.output_dir, 'pages.json'), 'w') as f: json.dump(data, f, indent=2)
             self.write_status("Complete!", 100)
         except Exception as e:
+            traceback.print_exc()
             self.write_status(f"Error: {str(e)}", -1)
 
+    def write_status(self, msg, prog):
+        with open(os.path.join(self.output_dir, 'status.json'), 'w') as f:
+            json.dump({'message': msg, 'progress': prog}, f)
+
 # ======================================================
-# 🌐 UI TEMPLATE (VERTICAL TILT)
+# 🌐 ROUTES & FULL UI
 # ======================================================
+app = Flask(__name__)
+
 INDEX_HTML = '''
-<!DOCTYPE html><html><head><title>Vertical Tilt Comic</title>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/html-to-image/1.11.11/html-to-image.min.js"></script>
-<style>
-    body { font-family: 'Segoe UI', sans-serif; background: #1a1a1a; color: white; margin: 0; padding: 20px; }
-    .page { 
-        width: 800px; height: 1000px; background: white; margin: 20px auto;
-        position: relative; border: 8px solid black; overflow: hidden;
+<!DOCTYPE html><html lang="en"> <head> <meta charset="UTF-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> <title>🎬 Vertical Tilt Comic Generator</title> <script src="https://cdnjs.cloudflare.com/ajax/libs/html-to-image/1.11.11/html-to-image.min.js"></script> <link href="https://fonts.googleapis.com/css2?family=Bangers&family=Comic+Neue:wght@700&family=Gloria+Hallelujah&family=Lato&display=swap" rel="stylesheet"> <style> * { box-sizing: border-box; } body { background-color: #fdf6e3; font-family: 'Lato', sans-serif; color: #3d3d3d; margin: 0; min-height: 100vh; }
+    
+    #upload-container { display: flex; flex-direction:column; justify-content: center; align-items: center; min-height: 100vh; width: 100%; padding: 20px; }
+    .upload-box { max-width: 500px; width: 100%; padding: 40px; background: white; border-radius: 12px; box-shadow: 0 8px 30px rgba(0,0,0,0.12); text-align: center; }
+    #editor-container { display: none; padding: 20px; width: 100%; box-sizing: border-box; padding-bottom: 100px; }
+    
+    h1 { color: #2c3e50; margin-bottom: 20px; font-weight: 600; }
+    .file-label { display: block; padding: 15px; background: #2c3e50; color: white; border-radius: 8px; cursor: pointer; font-weight: bold; margin-bottom: 10px; }
+    .submit-btn { width: 100%; padding: 15px; background: #e67e22; color: white; border: none; border-radius: 8px; font-size: 18px; font-weight: bold; cursor: pointer; }
+    
+    /* COMIC LAYOUT */
+    .comic-page { background: white; width: 864px; height: 1080px; box-shadow: 0 4px 10px rgba(0,0,0,0.1); position: relative; overflow: hidden; border: 2px solid #000; padding: 10px; margin: 0 auto; }
+    .comic-grid { width: 100%; height: 100%; position: relative; background: #000; display: block; }
+    .panel { position: absolute; overflow: hidden; background: #000; cursor: pointer; }
+    
+    /* === VERTICAL TILT LAYOUT (SIDE BY SIDE) === */
+    .comic-grid.layout-custom-slant .panel { border: none; background: transparent; width: 100%; height: 100%; top:0; left:0; }
+    
+    /* Left Panel (1) */
+    .comic-grid.layout-custom-slant .panel:nth-child(1) { 
+        z-index:2; 
+        clip-path: polygon(0 0, var(--split-t, 45%) 0, var(--split-b, 55%) 100%, 0 100%); 
     }
-    .grid { width: 100%; height: 100%; position: relative; background: #000; }
-    .panel { position: absolute; top:0; left:0; width: 100%; height: 100%; overflow: hidden; }
     
-    /* VERTICAL SPLIT CLIP-PATH (Left/Right) */
-    .layout-vertical .panel:nth-child(1) { 
-        z-index: 2; 
-        clip-path: polygon(0 0, var(--v-top, 45%) 0, var(--v-bottom, 55%) 100%, 0 100%); 
+    /* Right Panel (2) */
+    .comic-grid.layout-custom-slant .panel:nth-child(2) { 
+        z-index:1; 
+        clip-path: polygon(var(--split-t, 45%) 0, 100% 0, 100% 100%, var(--split-b, 55%) 100%); 
     }
-    .layout-vertical .panel:nth-child(2) { 
-        z-index: 1; 
-        clip-path: polygon(var(--v-top, 45%) 0, 100% 0, 100% 100%, var(--v-bottom, 55%) 100%); 
+    
+    /* DRAG HANDLES ON TOP AND BOTTOM */
+    .split-handle {
+        position: absolute; width: 26px; height: 26px; 
+        background: #FF9800; border: 3px solid white; border-radius: 50%;
+        cursor: ew-resize; z-index: 1000; box-shadow: 0 2px 5px rgba(0,0,0,0.4); 
     }
+    .split-handle.top { top: -13px; left: var(--split-t, 45%); transform: translateX(-50%); }
+    .split-handle.bottom { bottom: -13px; left: var(--split-b, 55%); transform: translateX(-50%); }
     
-    .panel img { width: 100%; height: 100%; object-fit: cover; }
+    .panel img { width: 100%; height: 100%; object-fit: cover; transform-origin: center center; pointer-events: auto; }
     
-    /* HANDLES ON TOP AND BOTTOM */
-    .handle {
-        position: absolute; width: 32px; height: 32px; background: #ffdf00;
-        border-radius: 50%; z-index: 100; cursor: ew-resize; border: 4px solid #000;
-        box-shadow: 0 0 10px rgba(0,0,0,0.5);
-    }
-    .handle.top { top: -16px; left: var(--v-top, 45%); transform: translateX(-50%); }
-    .handle.bottom { bottom: -16px; left: var(--v-bottom, 55%); transform: translateX(-50%); }
-
-    .controls { position: fixed; left: 20px; top: 20px; background: #333; padding: 20px; border-radius: 12px; width: 220px; }
-    button { width: 100%; padding: 10px; margin-top: 10px; cursor: pointer; font-weight: bold; border-radius: 5px; border: none; }
-    .btn-gen { background: #00ff88; color: #000; }
-    #status { color: #00ff88; font-family: monospace; margin-top: 10px; }
-</style></head><body>
-
-<div id="upload-ui">
-    <div style="text-align:center; margin-top: 100px;">
-        <h1>🎬 Vertical Tilt Comic Generator</h1>
-        <input type="file" id="vid-file"><br><br>
-        <button class="btn-gen" onclick="upload()">Generate Comic</button>
-        <div id="status">Ready.</div>
+    /* BUBBLES */
+    .speech-bubble { position: absolute; display: flex; justify-content: center; align-items: center; width: 150px; height: 80px; z-index: 10; cursor: move; font-family: 'Comic Neue', cursive; font-weight: bold; font-size: 13px; text-align: center; transform: translate(-50%, -50%); }
+    .bubble-text { padding: 0.5em; width: 100%; height: 100%; display: flex; align-items: center; justify-content: center; background: #4ECDC4; color: white; border-radius: 1.2em; border: 2px solid black; }
+    
+    .edit-controls { position: fixed; bottom: 20px; right: 20px; width: 260px; background: rgba(44, 62, 80, 0.95); color: white; padding: 15px; border-radius: 8px; z-index: 900; }
+    button { width: 100%; margin-top: 5px; padding: 8px; border-radius: 4px; border: none; cursor: pointer; font-weight: bold; }
+</style>
+</head> <body> 
+<div id="upload-container">
+    <div class="upload-box">
+        <h1>🎬 Vertical Tilt Comic Gen</h1>
+        <input type="file" id="file-upload" style="display:none" onchange="document.getElementById('fn').innerText=this.files[0].name">
+        <label for="file-upload" class="file-label">📁 Choose Video</label>
+        <span id="fn">No file selected</span>
+        <button class="submit-btn" onclick="upload()">🚀 Generate</button>
+        <div id="loading" style="display:none; margin-top:15px;">
+            <p id="status-text">Processing...</p>
+        </div>
     </div>
 </div>
 
-<div id="editor-ui" style="display:none">
-    <div id="page-list"></div>
-    <div class="controls">
-        <h3>Editor</h3>
-        <p style="font-size: 11px;">Drag the <b style="color:#ffdf00">yellow circles</b> on the TOP and BOTTOM edges to tilt the divider.</p>
-        <button onclick="download()">📥 Download PNG</button>
-        <button onclick="location.reload()" style="background:#ff4444; color:white;">Reset</button>
+<div id="editor-container">
+    <div id="comic-container"></div>
+    <div class="edit-controls">
+        <h4>✏️ Vertical Editor</h4>
+        <button onclick="addBubble()" style="background:#4CAF50; color:white;">Add Bubble</button>
+        <button onclick="exportComic()" style="background:#2196F3; color:white;">Export PNG</button>
+        <button onclick="location.reload()" style="background:#e74c3c; color:white;">Reset</button>
     </div>
 </div>
 
 <script>
-    let sid = "S" + Math.random().toString(36).substr(2, 9);
-    let dragging = null;
+    let sid = 'S' + Math.random().toString(36).substr(2, 9);
+    let isDraggingSplit = false;
+    let selectedSplitHandle = null;
+    let isDraggingBubble = false, selectedBubble = null;
 
     async function upload() {
-        const file = document.getElementById('vid-file').files[0];
-        if(!file) return alert("Select video");
-        const fd = new FormData(); fd.append('file', file);
-        document.getElementById('status').innerText = "Uploading...";
-        
+        const f = document.getElementById('file-upload').files[0];
+        if(!f) return alert("Select video");
+        document.getElementById('loading').style.display='block';
+        const fd = new FormData(); fd.append('file', f);
         await fetch(`/uploader?sid=${sid}`, {method:'POST', body:fd});
-        const check = setInterval(async () => {
+        const timer = setInterval(async () => {
             const r = await fetch(`/status?sid=${sid}`);
             const d = await r.json();
-            document.getElementById('status').innerText = d.message;
-            if(d.progress >= 100) { clearInterval(check); initEditor(); }
+            document.getElementById('status-text').innerText = d.message;
+            if(d.progress >= 100) { clearInterval(timer); loadEditor(); }
         }, 2000);
     }
 
-    async function initEditor() {
+    async function loadEditor() {
         const r = await fetch(`/output/pages.json?sid=${sid}`);
-        const data = await r.json();
-        const list = document.getElementById('page-list');
-        data.forEach(p => {
+        const pages = await r.json();
+        const container = document.getElementById('comic-container');
+        container.innerHTML = '';
+        
+        pages.forEach(p => {
             const pageDiv = document.createElement('div');
-            pageDiv.className = 'page';
+            pageDiv.className = 'comic-page';
             const grid = document.createElement('div');
-            grid.className = 'grid layout-vertical';
-            grid.style.setProperty('--v-top', '45%');
-            grid.style.setProperty('--v-bottom', '55%');
+            grid.className = 'comic-grid layout-custom-slant';
+            grid.style.setProperty('--split-t', '45%');
+            grid.style.setProperty('--split-b', '55%');
 
-            const hTop = document.createElement('div'); hTop.className = 'handle top';
-            const hBot = document.createElement('div'); hBot.className = 'handle bottom';
+            const hT = document.createElement('div'); hT.className = 'split-handle top';
+            hT.onmousedown = (e) => { isDraggingSplit = true; selectedSplitHandle = { grid, side: 'top' }; };
+            const hB = document.createElement('div'); hB.className = 'split-handle bottom';
+            hB.onmousedown = (e) => { isDraggingSplit = true; selectedSplitHandle = { grid, side: 'bottom' }; };
             
-            hTop.onmousedown = () => dragging = { grid, key: '--v-top' };
-            hBot.onmousedown = () => dragging = { grid, key: '--v-bottom' };
-
             p.panels.forEach(pan => {
-                const div = document.createElement('div');
-                div.className = 'panel';
-                div.innerHTML = `<img src="/frames/${pan.image}?sid=${sid}">`;
-                grid.appendChild(div);
+                const pnl = document.createElement('div');
+                pnl.className = 'panel';
+                pnl.innerHTML = `<img src="/frames/${pan.image}?sid=${sid}">`;
+                grid.appendChild(pnl);
             });
 
-            grid.appendChild(hTop); grid.appendChild(hBot);
+            grid.appendChild(hT); grid.appendChild(hB);
             pageDiv.appendChild(grid);
-            list.appendChild(pageDiv);
+            container.appendChild(pageDiv);
         });
-        document.getElementById('upload-ui').style.display='none';
-        document.getElementById('editor-ui').style.display='block';
+        document.getElementById('upload-container').style.display = 'none';
+        document.getElementById('editor-container').style.display = 'block';
     }
 
-    window.onmousemove = (e) => {
-        if(!dragging) return;
-        const rect = dragging.grid.getBoundingClientRect();
-        let x = ((e.clientX - rect.left) / rect.width) * 100;
-        x = Math.max(5, Math.min(95, x)); // Constraints
-        dragging.grid.style.setProperty(dragging.key, x + '%');
-    };
-    window.onmouseup = () => dragging = null;
-
-    async function download() {
-        const pages = document.querySelectorAll('.page');
-        for(let i=0; i<pages.length; i++){
-            const url = await htmlToImage.toPng(pages[i]);
-            const a = document.createElement('a');
-            a.download = `comic-page-${i+1}.png`; a.href = url; a.click();
+    document.addEventListener('mousemove', (e) => {
+        if(isDraggingSplit && selectedSplitHandle) {
+            const rect = selectedSplitHandle.grid.getBoundingClientRect();
+            let percent = ((e.clientX - rect.left) / rect.width) * 100;
+            percent = Math.max(10, Math.min(90, percent));
+            if(selectedSplitHandle.side === 'top') selectedSplitHandle.grid.style.setProperty('--split-t', percent + '%');
+            else selectedSplitHandle.grid.style.setProperty('--split-b', percent + '%');
         }
+        if(isDraggingBubble && selectedBubble) {
+            const rect = selectedBubble.parentElement.getBoundingClientRect();
+            selectedBubble.style.left = ((e.clientX - rect.left) / rect.width * 100) + '%';
+            selectedBubble.style.top = ((e.clientY - rect.top) / rect.height * 100) + '%';
+        }
+    });
+
+    document.addEventListener('mouseup', () => { isDraggingSplit = false; isDraggingBubble = false; });
+
+    function addBubble() {
+        const pg = document.querySelector('.panel'); // add to first panel found
+        if(!pg) return;
+        const b = document.createElement('div');
+        b.className = 'speech-bubble';
+        b.innerHTML = '<div class="bubble-text">New Text</div>';
+        b.style.left = '50%'; b.style.top = '50%';
+        b.onmousedown = (e) => { e.stopPropagation(); selectedBubble = b; isDraggingBubble = true; };
+        pg.appendChild(b);
     }
-</script></body></html>
-'''
 
-# ======================================================
-# 🚀 ROUTES
-# ======================================================
+    async function exportComic() {
+        const node = document.querySelector('.comic-page');
+        const dataUrl = await htmlToImage.toPng(node);
+        const link = document.createElement('a');
+        link.download = 'comic.png'; link.href = dataUrl; link.click();
+    }
+</script>
+</body> </html>
+'''
 
 @app.route('/')
 def index(): return INDEX_HTML
 
 @app.route('/uploader', methods=['POST'])
-def uploader():
+def upload():
     sid = request.args.get('sid')
     f = request.files['file']
-    gen = ComicBackend(sid)
-    f.save(gen.v_path)
+    gen = EnhancedComicGenerator(sid)
+    f.save(gen.video_path)
     threading.Thread(target=gen.run, args=(2, 2)).start()
     return jsonify({'ok': True})
 
 @app.route('/status')
 def get_status():
     sid = request.args.get('sid')
-    try:
-        with open(os.path.join(BASE_USER_DIR, sid, 'output', 'status.json'), 'r') as f:
-            return f.read()
-    except: return jsonify({'message': 'Starting...', 'progress': 0})
+    return send_from_directory(os.path.join(BASE_USER_DIR, sid, 'output'), 'status.json')
 
 @app.route('/output/<path:filename>')
 def get_output(filename):