Update app_enhanced.py

app_enhanced.py

@@ -1,55 +1,37 @@
-import spaces  # <--- CRITICAL: MUST BE THE FIRST IMPORT
+import spaces # MUST BE FIRST
 import os
 import time
 import threading
 import json
-import traceback
-import logging
-import string
-import random
-import shutil
 import cv2
 import numpy as np
 import srt
 from flask import Flask, jsonify, request, send_from_directory, send_file
 
 # ======================================================
-# 🚀 ZEROGPU CONFIGURATION
+# 🚀 ZEROGPU & STORAGE
 # ======================================================
 @spaces.GPU
 def gpu_warmup():
     import torch
     return torch.cuda.is_available()
 
-# ======================================================
-# 💾 STORAGE SETUP
-# ======================================================
 BASE_STORAGE_PATH = '/data' if os.path.exists('/data') else '.'
 BASE_USER_DIR = os.path.join(BASE_STORAGE_PATH, "userdata")
 os.makedirs(BASE_USER_DIR, exist_ok=True)
 
-# ======================================================
-# 🔧 JSON SANITIZER (FIX FOR int64 ERROR)
-# ======================================================
 def sanitize_json(obj):
-    if isinstance(obj, dict):
-        return {k: sanitize_json(v) for k, v in obj.items()}
-    elif isinstance(obj, list):
-        return [sanitize_json(v) for v in obj]
-    elif isinstance(obj, (np.int64, np.int32, np.int16)):
-        return int(obj)
-    elif isinstance(obj, (np.float64, np.float32)):
-        return float(obj)
-    elif isinstance(obj, np.ndarray):
-        return sanitize_json(obj.tolist())
+    if isinstance(obj, (np.int64, np.int32, np.int16)): return int(obj)
+    if isinstance(obj, (np.float64, np.float32)): return float(obj)
+    if isinstance(obj, dict): return {k: sanitize_json(v) for k, v in obj.items()}
+    if isinstance(obj, list): return [sanitize_json(v) for v in obj]
     return obj
 
 # ======================================================
-# 🧠 CORE GPU GENERATOR
+# 🧠 THE ENGINE
 # ======================================================
 @spaces.GPU(duration=300)
 def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_pages):
-    # Heavy AI imports inside function to avoid Startup Timeout
     from backend.keyframes.keyframes import black_bar_crop
     from backend.simple_color_enhancer import SimpleColorEnhancer
     from backend.subtitles.subs_real import get_real_subtitles
@@ -62,11 +44,11 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
     duration = total_frames / fps
     cap.release()
 
-    # 1. Subtitles
+    # Subtitles
     user_srt = os.path.join(user_dir, 'subs.srt')
     try:
         get_real_subtitles(video_path)
-        if os.path.exists('test1.srt'): shutil.move('test1.srt', user_srt)
+        if os.path.exists('test1.srt'): os.rename('test1.srt', user_srt)
     except:
         with open(user_srt, 'w') as f: f.write("1\n00:00:01,000 --> 00:00:05,000\nDialogue...\n")
 
@@ -74,11 +56,8 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
         try: all_subs = list(srt.parse(f.read()))
         except: all_subs = []
 
-    # 2. 5-Panel Math
     panels_per_page = 5
-    target_pages = int(target_pages)
-    total_needed = target_pages * panels_per_page
-
+    total_needed = int(target_pages) * panels_per_page
     indices = np.linspace(0, len(all_subs) - 1, total_needed, dtype=int) if all_subs else range(total_needed)
     
     frame_metadata = {}
@@ -90,21 +69,18 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
         ret, frame = cap.read()
         if ret:
             fname = f"frame_{i:04d}.png"
-            p = os.path.join(frames_dir, fname)
-            cv2.imwrite(p, frame)
+            cv2.imwrite(os.path.join(frames_dir, fname), frame)
             frame_metadata[fname] = {'dialogue': all_subs[idx].content if all_subs else "", 'time': t}
             frame_files.append(fname)
     cap.release()
 
-    with open(metadata_path, 'w') as f:
-        json.dump(sanitize_json(frame_metadata), f)
-
+    with open(metadata_path, 'w') as f: json.dump(sanitize_json(frame_metadata), f)
     try: black_bar_crop() 
     except: pass
 
     se = SimpleColorEnhancer()
     pages_data = []
-    for p_idx in range(target_pages):
+    for p_idx in range(int(target_pages)):
         p_p, p_b = [], []
         start = p_idx * 5
         for i in range(start, start + 5):
@@ -113,22 +89,19 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
             img_p = os.path.join(frames_dir, f_name)
             try: se.enhance_single(img_p, img_p)
             except: pass
-            
             txt = frame_metadata[f_name]['dialogue']
             try:
                 faces = face_detector.detect_faces(img_p)
                 lip = face_detector.get_lip_position(img_p, faces[0]) if faces else (-1, -1)
                 bx, by = ai_bubble_placer.place_bubble_ai(img_p, lip)
                 item = {'dialog': txt, 'x': bx, 'y': by}
-            except:
-                item = {'dialog': txt, 'x': 50, 'y': 25}
+            except: item = {'dialog': txt, 'x': 50, 'y': 25}
             p_p.append({'image': f_name}); p_b.append(item)
         pages_data.append({'panels': p_p, 'bubbles': p_b})
-
     return sanitize_json(pages_data)
 
 # ======================================================
-# 🔧 APP ENGINE
+# 🌐 FLASK & HTML
 # ======================================================
 app = Flask(__name__)
 
@@ -141,185 +114,119 @@ def uploader():
     u_dir = os.path.join(BASE_USER_DIR, sid)
     f_dir = os.path.join(u_dir, 'frames'); o_dir = os.path.join(u_dir, 'output')
     os.makedirs(f_dir, exist_ok=True); os.makedirs(o_dir, exist_ok=True)
-    vid_p = os.path.join(u_dir, 'video.mp4')
-    request.files['file'].save(vid_p)
-    pages = request.form.get('pages', 2)
-
+    request.files['file'].save(os.path.join(u_dir, 'video.mp4'))
+    
     def task():
         try:
-            with open(os.path.join(o_dir, 'status.json'), 'w') as f:
-                json.dump({'message': 'Drafting Parallel Geometry...', 'progress': 30}, f)
-            data = generate_comic_gpu(vid_p, u_dir, f_dir, os.path.join(f_dir, 'meta.json'), pages)
-            with open(os.path.join(o_dir, 'pages.json'), 'w') as f: json.dump(data, f)
-            with open(os.path.join(o_dir, 'status.json'), 'w') as f:
-                json.dump({'message': 'Complete', 'progress': 100}, f)
+            data = generate_comic_gpu(os.path.join(u_dir, 'video.mp4'), u_dir, f_dir, os.path.join(f_dir, 'm.json'), request.form.get('pages', 2))
+            with open(os.path.join(o_dir, 'p.json'), 'w') as f: json.dump(data, f)
+            with open(os.path.join(o_dir, 's.json'), 'w') as f: json.dump({'progress': 100}, f)
         except Exception as e:
-            with open(os.path.join(o_dir, 'status.json'), 'w') as f:
-                json.dump({'message': f'Error: {str(e)}', 'progress': -1}, f)
+            with open(os.path.join(o_dir, 's.json'), 'w') as f: json.dump({'progress': -1, 'msg': str(e)}, f)
 
     threading.Thread(target=task).start()
-    return jsonify({'success': True})
+    return jsonify({'ok': True})
 
 @app.route('/status')
 def status():
-    sid = request.args.get('sid')
-    p = os.path.join(BASE_USER_DIR, sid, 'output', 'status.json')
+    p = os.path.join(BASE_USER_DIR, request.args.get('sid'), 'output', 's.json')
     return send_file(p) if os.path.exists(p) else jsonify({'progress': 0})
 
-@app.route('/frames/<sid>/<path:filename>')
-def get_frame(sid, filename): return send_from_directory(os.path.join(BASE_USER_DIR, sid, 'frames'), filename)
+@app.route('/frames/<sid>/<path:f>')
+def get_frame(sid, f): return send_from_directory(os.path.join(BASE_USER_DIR, sid, 'frames'), f)
 
-@app.route('/output/<sid>/<path:filename>')
-def get_output(sid, filename): return send_from_directory(os.path.join(BASE_USER_DIR, sid, 'output'), filename)
+@app.route('/output/<sid>/<path:f>')
+def get_output(sid, f): return send_from_directory(os.path.join(BASE_USER_DIR, sid, 'output'), f)
 
-# ======================================================
-# 🌐 HTML (MATHEMATICALLY PARALLEL TILT TEMPLATE)
-# ======================================================
 INDEX_HTML = '''
-<!DOCTYPE html><html lang="en">
-<head>
-    <meta charset="UTF-8"><title>Geometric Consistency 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=Comic+Neue:wght@700&family=Lato:wght@400;900&display=swap" rel="stylesheet">
-    <style>
-        :root { 
-            --slant: 35px; /* Fixed angle for all panels */
-            --hairline: 1.5px; /* Minimal consistent gap */
-            --page-border: 12px;
-        }
-        body { background: #111; font-family: 'Lato', sans-serif; margin: 0; padding: 20px; }
-        .setup-box { max-width: 450px; margin: 80px auto; background: white; padding: 40px; border-radius: 12px; color: black; text-align: center; }
-        
-        /* ⚡ THE PERFECT PARALLEL TEMPLATE ⚡ */
-        .comic-page { 
-            background: white; width: 1000px; height: 750px; margin: 40px auto; 
-            border: var(--page-border) solid black; padding: 3px; box-sizing: border-box;
-            display: grid; gap: var(--hairline);
-            grid-template-columns: repeat(6, 1fr); 
-            grid-template-rows: 1.35fr 1fr; /* Straight horizontal line between tiers */
-            position: relative; overflow: hidden;
-        }
-
-        .panel { position: relative; background: #000; overflow: hidden; cursor: pointer; border: 1.5px solid black; }
-        .panel img { width: 115%; height: 115%; object-fit: cover; position: absolute; top: -7.5%; left: -7.5%; object-position: center 15%; pointer-events: none; }
-        
-        /* ROW 1: Slant Left \ (Dividers are perfectly parallel) */
-        .panel:nth-child(1) { 
-            grid-column: span 4; 
-            clip-path: polygon(0 0, 100% 0, calc(100% - var(--slant)) 100%, 0 100%); 
-        }
-        .panel:nth-child(2) { 
-            grid-column: span 2; 
-            clip-path: polygon(var(--slant) 0, 100% 0, 100% 100%, 0 100%); 
-        }
-
-        /* ROW 2: Slant Right / (Dividers are perfectly parallel) */
-        .panel:nth-child(3) { 
-            grid-column: span 2; 
-            clip-path: polygon(0 0, calc(100% - var(--slant)) 0, 100% 100%, 0 100%); 
-        }
-        .panel:nth-child(4) { 
-            grid-column: span 2; 
-            clip-path: polygon(var(--slant) 0, calc(100% - var(--slant)) 0, 100% 100%, var(--slant) 100%); 
-        }
-        .panel:nth-child(5) { 
-            grid-column: span 2; 
-            clip-path: polygon(var(--slant) 0, 100% 0, 100% 100%, var(--slant) 100%); 
-        }
-
-        .panel.selected { outline: 8px solid #00d2ff; z-index: 5; filter: brightness(1.1); }
-
-        .bubble { 
-            position: absolute; background: white; border: 2.5px solid black; border-radius: 25px;
-            padding: 10px 20px; font-family: 'Comic Neue'; font-weight: bold; font-size: 15px;
-            color: black; min-width: 110px; text-align: center; cursor: move; z-index: 10;
-            box-shadow: 4px 4px 0 rgba(0,0,0,0.1);
-        }
-        .bubble::after { content: ""; position: absolute; bottom: -18px; left: 30px; width: 0; height: 0; border-left: 10px solid transparent; border-right: 10px solid transparent; border-top: 20px solid black; }
-        .bubble::before { content: ""; position: absolute; bottom: -13px; left: 31px; width: 0; height: 0; border-left: 9px solid transparent; border-right: 9px solid transparent; border-top: 17px solid white; z-index: 2; }
-
-        .controls { position: fixed; bottom: 20px; right: 20px; background: #000; padding: 25px; border-radius: 12px; width: 240px; border: 2px solid #333; }
-        button { width: 100%; padding: 12px; margin-top: 10px; cursor: pointer; font-weight: bold; border-radius: 6px; border: none; }
-        .hidden { display: none; }
-        .loader { border: 5px solid #333; border-top: 5px solid #00d2ff; border-radius: 50%; width: 40px; height: 40px; animation: spin 1s linear infinite; margin: 20px auto; }
-        @keyframes spin { 0% { transform: rotate(0deg); } 100% { transform: rotate(360deg); } }
-    </style>
-</head>
+<!DOCTYPE html><html><head><meta charset="UTF-8">
+<script src="https://cdnjs.cloudflare.com/ajax/libs/html-to-image/1.11.11/html-to-image.min.js"></script>
+<style>
+    :root { 
+        --slant: 40px; /* MATHEMATICAL PARALLEL OFFSET */
+        --hairline: 0.1px; /* SUB-PIXEL PRECISION GAP */
+    }
+    body { background: #000; font-family: sans-serif; padding: 20px; color: white; }
+    
+    /* THE PERFECT GEOMETRIC TEMPLATE */
+    .comic-page { 
+        background: white; width: 1000px; height: 750px; margin: auto; 
+        border: 12px solid black; padding: 2px; display: grid; gap: var(--hairline);
+        grid-template-columns: repeat(6, 1fr); grid-template-rows: 1.35fr 1fr;
+        position: relative; overflow: hidden;
+    }
+    .panel { position: relative; background: #000; overflow: hidden; border: 1px solid black; }
+    
+    /* TECHNIQUE: OVERSCAN & HEADROOM PROTECTION */
+    .panel img { 
+        width: 115%; height: 115%; object-fit: cover; 
+        position: absolute; top: -7.5%; left: -7.5%; 
+        object-position: center 15%; /* PROTECTS FACES FROM TOP CLIPPING */
+    }
+    
+    /* ROW 1: PARALLEL SLANT LEFT \ */
+    .panel:nth-child(1) { grid-column: span 4; clip-path: polygon(0 0, 100% 0, calc(100% - var(--slant)) 100%, 0 100%); }
+    .panel:nth-child(2) { grid-column: span 2; clip-path: polygon(var(--slant) 0, 100% 0, 100% 100%, 0 100%); }
+
+    /* ROW 2: PARALLEL SLANT RIGHT / */
+    .panel:nth-child(3) { grid-column: span 2; clip-path: polygon(0 0, calc(100% - var(--slant)) 0, 100% 100%, 0 100%); }
+    .panel:nth-child(4) { grid-column: span 2; clip-path: polygon(var(--slant) 0, calc(100% - var(--slant)) 0, 100% 100%, var(--slant) 100%); }
+    .panel:nth-child(5) { grid-column: span 2; clip-path: polygon(var(--slant) 0, 100% 0, 100% 100%, var(--slant) 100%); }
+
+    .bubble { position: absolute; background: white; border: 2.5px solid black; border-radius: 25px; padding: 10px; color: black; font-weight: bold; cursor: move; z-index: 99; text-align: center; min-width: 100px;}
+    .controls { position: fixed; bottom: 20px; right: 20px; background: #222; padding: 20px; border-radius: 10px; }
+    .hidden { display: none; }
+</style></head>
 <body>
-    <div id="upload-zone" class="setup-box">
-        <h1>🎬 Elite Comic Maker</h1>
-        <p>Consistent Straight & Slanted Geometry</p>
-        <input type="file" id="vid" accept="video/mp4"><br><br>
-        <label>Total Pages: </label><input type="number" id="pg" value="2" style="width:50px">
-        <br><br>
-        <button onclick="start()" style="background:#e67e22; color:white;">GENERATE COMIC</button>
-        <div id="loading" class="hidden"><div class="loader"></div><p id="st">Acquiring GPU...</p></div>
+    <div id="u-zone" style="text-align:center; margin-top:100px;">
+        <h1>Elite Geometric Generator</h1>
+        <input type="file" id="vid"><br><br>
+        <button onclick="start()" style="padding:10px 20px; background:cyan; font-weight:bold;">GENERATE PERFECT COMIC</button>
     </div>
-    <div id="editor-zone" class="hidden">
-        <div id="output"></div>
+    <div id="e-zone" class="hidden">
+        <div id="out"></div>
         <div class="controls">
-            <h4 style="margin:0; color:#00d2ff;">EDITOR</h4>
-            <button onclick="addB()" style="background:#2ecc71; color:white;">💬 Add Bubble</button>
-            <button onclick="exportPNG()" style="background:#3498db; color:white;">📥 Download PNGs</button>
-            <button onclick="location.reload()" style="background:#e74c3c; color:white;">🏠 Reset</button>
+            <button onclick="exportPNG()" style="background:lime; padding:10px; width:100%;">DOWNLOAD PNG</button>
         </div>
     </div>
 <script>
-    let sid = 's' + Math.random().toString(36).substr(2,9);
-    let selP = null;
+    let sid = 's'+Math.random().toString(36).substr(2,9);
     async function start() {
-        const f = document.getElementById('vid').files[0];
-        if(!f) return alert("Select video!");
-        document.getElementById('loading').classList.remove('hidden');
-        const fd = new FormData(); fd.append('file', f); fd.append('pages', document.getElementById('pg').value);
+        const fd = new FormData(); fd.append('file', document.getElementById('vid').files[0]);
         await fetch(`/uploader?sid=${sid}`, {method: 'POST', body: fd});
         const itv = setInterval(async () => {
             const r = await fetch(`/status?sid=${sid}`); const d = await r.json();
-            document.getElementById('st').innerText = d.message || "Working...";
             if(d.progress >= 100) { clearInterval(itv); load(); }
         }, 2000);
     }
     async function load() {
-        const r = await fetch(`/output/${sid}/pages.json`); const pages = await r.json();
-        document.getElementById('upload-zone').classList.add('hidden');
-        document.getElementById('editor-zone').classList.remove('hidden');
-        const out = document.getElementById('output');
+        const r = await fetch(`/output/${sid}/p.json`); const pages = await r.json();
+        document.getElementById('u-zone').classList.add('hidden');
+        document.getElementById('e-zone').classList.remove('hidden');
         pages.forEach(p => {
-            const pgDiv = document.createElement('div'); pgDiv.className = 'comic-page';
+            const pg = document.createElement('div'); pg.className='comic-page';
             p.panels.forEach((pan, i) => {
-                const pDiv = document.createElement('div'); pDiv.className = 'panel';
-                pDiv.onclick = (e) => { e.stopPropagation(); if(selP) selP.classList.remove('selected'); selP=pDiv; pDiv.classList.add('selected'); };
-                const img = document.createElement('img'); img.src = `/frames/${sid}/${pan.image}`;
-                pDiv.appendChild(img);
-                if(p.bubbles[i]) pDiv.appendChild(createB(p.bubbles[i].dialog, p.bubbles[i].x, p.bubbles[i].y));
-                pgDiv.appendChild(pDiv);
+                const div = document.createElement('div'); div.className='panel';
+                const img = document.createElement('img'); img.src=`/frames/${sid}/${pan.image}`;
+                div.appendChild(img);
+                if(p.bubbles[i]) {
+                    const b = document.createElement('div'); b.className='bubble'; b.innerText=p.bubbles[i].dialog;
+                    b.style.left=p.bubbles[i].x+'px'; b.style.top=p.bubbles[i].y+'px';
+                    div.appendChild(b);
+                }
+                pg.appendChild(div);
             });
-            out.appendChild(pgDiv);
+            document.getElementById('out').appendChild(pg);
         });
     }
-    function createB(txt, x, y) {
-        const b = document.createElement('div'); b.className = 'bubble';
-        b.innerText = txt || '...'; b.style.left = (x || 50) + 'px'; b.style.top = (y || 20) + 'px';
-        b.onmousedown = (e) => {
-            e.stopPropagation();
-            let ox = e.clientX - b.offsetLeft, oy = e.clientY - b.offsetTop;
-            document.onmousemove = (ev) => { b.style.left=(ev.clientX-ox)+'px'; b.style.top=(ev.clientY-oy)+'px'; };
-            document.onmouseup = () => { document.onmousemove = null; };
-        };
-        b.ondblclick = () => { let n = prompt("Edit text:", b.innerText); if(n) b.innerText = n; };
-        return b;
-    }
-    function addB() { if(selP) selP.appendChild(createB("Dialogue", 60, 60)); }
     async function exportPNG() {
         const pgs = document.querySelectorAll('.comic-page');
         for(let pg of pgs) {
-            const url = await htmlToImage.toPng(pg, {pixelRatio: 2});
-            const l = document.createElement('a'); l.download='Elite_Comic.png'; l.href=url; l.click();
+            const url = await htmlToImage.toPng(pg, {pixelRatio: 3});
+            const l = document.createElement('a'); l.download='Page.png'; l.href=url; l.click();
         }
     }
-</script>
-</body></html>
-'''
+</script></body></html>'''
 
 if __name__ == '__main__':
     try: gpu_warmup()