Update app_enhanced.py

app_enhanced.py

@@ -1,20 +1,14 @@
-import spaces  # <--- CRITICAL: MUST BE THE FIRST IMPORT
+import spaces
 import os
-import time
-import threading
 import json
-import traceback
-import logging
-import string
-import random
-import shutil
+import threading
 import cv2
 import numpy as np
 import srt
-from flask import Flask, jsonify, request, send_from_directory, send_file
+from flask import Flask, request, jsonify, send_from_directory
 
 # ======================================================
-# 🚀 ZEROGPU CONFIGURATION
+# GPU
 # ======================================================
 @spaces.GPU
 def gpu_warmup():
@@ -22,342 +16,241 @@ def gpu_warmup():
     return torch.cuda.is_available()
 
 # ======================================================
-# 💾 STORAGE SETUP
+# PATHS
 # ======================================================
-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)
+BASE = "/data" if os.path.exists("/data") else "."
+USERDATA = os.path.join(BASE, "userdata")
+os.makedirs(USERDATA, exist_ok=True)
 
 # ======================================================
-# 🔧 JSON SANITIZER (FIX FOR int64 ERROR)
+# SAFE JSON
 # ======================================================
-def sanitize_json(obj):
+def sanitize(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 {k: sanitize(v) for k, v in obj.items()}
+    if isinstance(obj, list):
+        return [sanitize(v) for v in obj]
+    if isinstance(obj, np.integer):
         return int(obj)
-    elif isinstance(obj, (np.float64, np.float32)):
-        return float(obj)
-    elif isinstance(obj, np.ndarray):
-        return sanitize_json(obj.tolist())
     return obj
 
 # ======================================================
-# 🧠 CORE GPU GENERATOR
+# COMIC GENERATOR (5 PANEL TEMPLATE)
 # ======================================================
 @spaces.GPU(duration=300)
-def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_pages):
-    import cv2
-    import srt
-    import numpy as np
-    from backend.keyframes.keyframes import black_bar_crop
-    from backend.simple_color_enhancer import SimpleColorEnhancer
-    from backend.subtitles.subs_real import get_real_subtitles
-    from backend.ai_bubble_placement import ai_bubble_placer
-    from backend.ai_enhanced_core import face_detector
-
-    cap = cv2.VideoCapture(video_path)
+def generate_comic(video, user_dir, frames_dir, pages):
+    cap = cv2.VideoCapture(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 = int(cap.get(cv2.CAP_PROP_FRAME_COUNT))
+    duration = total / fps
     cap.release()
 
-    # 1. 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)
-    except:
-        with open(user_srt, 'w') as f: f.write("1\n00:00:01,000 --> 00:00:05,000\n...\n")
-
-    with open(user_srt, 'r', encoding='utf-8') as f:
-        try: all_subs = list(srt.parse(f.read()))
-        except: all_subs = []
-
-    # 2. Logic for 5 Panels Per Page
     panels_per_page = 5
-    target_pages = int(target_pages)
-    total_needed = target_pages * panels_per_page
-
-    if not all_subs:
-        times = np.linspace(1, max(1.1, duration-1), total_needed)
-        moments = [{'text': '', 'start': t} for t in times]
-    elif len(all_subs) <= total_needed:
-        moments = [{'text': s.content, 'start': s.start.total_seconds()} for s in all_subs]
-        while len(moments) < total_needed: moments.append({'text': '', 'start': duration/2})
-    else:
-        indices = np.linspace(0, len(all_subs) - 1, total_needed, dtype=int)
-        moments = [{'text': all_subs[i].content, 'start': all_subs[i].start.total_seconds()} for i in indices]
-
-    # 3. Frame Extraction
-    frame_metadata = {}
-    cap = cv2.VideoCapture(video_path)
-    frame_files = []
-    for i, m in enumerate(moments):
-        cap.set(cv2.CAP_PROP_POS_MSEC, m['start'] * 1000)
-        ret, frame = cap.read()
-        if ret:
-            fname = f"frame_{i:04d}.png"
-            p = os.path.join(frames_dir, fname)
-            cv2.imwrite(p, frame)
-            frame_metadata[fname] = {'dialogue': m['text'], 'time': m['start']}
-            frame_files.append(fname)
+    pages = int(pages)
+    needed = pages * panels_per_page
+
+    # Simple timestamps
+    times = np.linspace(1, max(1, duration - 1), needed)
+
+    cap = cv2.VideoCapture(video)
+    frames = []
+    for i, t in enumerate(times):
+        cap.set(cv2.CAP_PROP_POS_MSEC, t * 1000)
+        ok, frame = cap.read()
+        if ok:
+            name = f"frame_{i}.png"
+            cv2.imwrite(os.path.join(frames_dir, name), frame)
+            frames.append(name)
     cap.release()
 
-    with open(metadata_path, 'w') as f:
-        json.dump(sanitize_json(frame_metadata), f)
+    # Fixed bubble positions per panel
+    bubble_slots = [
+        {"x": 60, "y": 320},  # panel 1
+        {"x": 40, "y": 60},   # panel 2
+        {"x": 30, "y": 240},  # panel 3
+        {"x": 30, "y": 60},   # panel 4
+        {"x": 30, "y": 240},  # panel 5
+    ]
 
-    try: black_bar_crop() 
-    except: pass
-
-    # 4. Enhance & Assemble
-    se = SimpleColorEnhancer()
     pages_data = []
-    for p_idx in range(target_pages):
-        p_p = []
-        p_b = []
-        start = p_idx * 5
-        for i in range(start, start + 5):
-            if i >= len(frame_files): break
-            f_name = frame_files[i]
-            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}
-            p_p.append({'image': f_name})
-            p_b.append(item)
-        pages_data.append({'panels': p_p, 'bubbles': p_b})
-
-    return sanitize_json(pages_data)
+    for p in range(pages):
+        start = p * 5
+        page = []
+        for i in range(5):
+            idx = start + i
+            if idx >= len(frames):
+                continue
+            page.append({
+                "image": frames[idx],
+                "bubble": {
+                    "text": "...",
+                    **bubble_slots[i]
+                }
+            })
+        pages_data.append(page)
+
+    return sanitize(pages_data)
 
 # ======================================================
-# 🔧 APP ENGINE
+# APP
 # ======================================================
 app = Flask(__name__)
 
-@app.route('/')
-def index(): return INDEX_HTML
+@app.route("/")
+def index():
+    return INDEX_HTML
+
+@app.route("/upload", methods=["POST"])
+def upload():
+    sid = request.args.get("sid")
+    user = os.path.join(USERDATA, sid)
+    frames = os.path.join(user, "frames")
+    out = os.path.join(user, "output")
+    os.makedirs(frames, exist_ok=True)
+    os.makedirs(out, exist_ok=True)
 
-@app.route('/uploader', methods=['POST'])
-def uploader():
-    sid = request.args.get('sid')
-    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)
+    video = os.path.join(user, "video.mp4")
+    request.files["file"].save(video)
+    pages = request.form.get("pages", 1)
 
     def task():
-        try:
-            with open(os.path.join(o_dir, 'status.json'), 'w') as f:
-                json.dump({'message': 'Generating 0.1px Hairlines...', '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)
-        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)
+        data = generate_comic(video, user, frames, pages)
+        with open(os.path.join(out, "pages.json"), "w") as f:
+            json.dump(data, 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')
-    if os.path.exists(p): return send_file(p)
-    return jsonify({'progress': 0})
+@app.route("/frames/<sid>/<name>")
+def frames(sid, name):
+    return send_from_directory(os.path.join(USERDATA, sid, "frames"), name)
 
-@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('/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>/<name>")
+def output(sid, name):
+    return send_from_directory(os.path.join(USERDATA, sid, "output"), name)
 
 # ======================================================
-# 🌐 UI HTML (0.1px HAIRLINE + ENGLISH UI)
+# FRONTEND
 # ======================================================
-INDEX_HTML = '''
-<!DOCTYPE html><html lang="en">
+INDEX_HTML = """
+<!DOCTYPE html>
+<html lang="hi">
 <head>
-    <meta charset="UTF-8"><title>Elite Razor-Thin 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=Comic+Neue:wght@700&family=Lato:wght@400;900&display=swap" rel="stylesheet">
-    <style>
-        :root { 
-            --slant: 40px; 
-            --gutter: 0.1px; /* RAZOR THIN HAIRLINE */
-            --page-border: 12px;
-            --panel-ink: 1px; 
-        }
-        
-        body { background: #000; font-family: 'Lato', sans-serif; margin: 0; padding: 20px; color: white; }
-        .setup-box { max-width: 450px; margin: 80px auto; background: white; padding: 40px; border-radius: 12px; color: black; text-align: center; }
-        
-        /* ⚡ THE 0.1px PIXEL-PERFECT TEMPLATE ⚡ */
-        .comic-page { 
-            background: white; width: 1000px; height: 720px; margin: 40px auto; 
-            border: var(--page-border) solid black; padding: 2px; box-sizing: border-box;
-            display: grid; gap: var(--gutter);
-            grid-template-columns: repeat(6, 1fr); 
-            grid-template-rows: 1.35fr 1fr; 
-            position: relative; overflow: hidden;
-        }
-
-        .panel { position: relative; background: #000; overflow: hidden; cursor: pointer; border: var(--panel-ink) solid black; }
-        /* Oversize images slightly and center them top-weighted for faces */
-        .panel img { width: 118%; height: 118%; object-fit: cover; position: absolute; top: -9%; left: -9%; object-position: center 15%; pointer-events: none; }
-        
-        /* ROW 1: Slant LEFT \ (Panel 1 Wide, Panel 2 Narrow) */
-        .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 / (Three equal action panels) */
-        .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: 6px solid #00d2ff; z-index: 5; filter: brightness(1.1); }
-
-        /* BUBBLE STYLING - PRECISE WHITE CAPSULE */
-        .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; transition: 0.2s; }
-        .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>
+<meta charset="UTF-8">
+<title>Comic Generator</title>
+
+<style>
+body { background:#111; margin:0; font-family:sans-serif; }
+
+.comic-page {
+  width:1000px;
+  height:1400px;
+  margin:40px auto;
+  background:#fff;
+  border:10px solid #000;
+  padding:10px;
+  display:grid;
+  grid-template-columns:2fr 1fr;
+  grid-template-rows:1fr 1fr;
+  gap:10px;
+}
+
+.panel { position:relative; border:5px solid #000; overflow:hidden; }
+.panel img { width:100%; height:100%; object-fit:cover; }
+
+.bottom {
+  grid-column:1 / span 2;
+  display:grid;
+  grid-template-columns:1fr 1fr 1fr;
+  gap:10px;
+}
+
+.title {
+  position:absolute;
+  top:20px; left:20px; right:20px;
+  padding:20px;
+  border:4px solid #000;
+  background:#fff;
+  font-size:32px;
+  font-weight:900;
+}
+
+.bubble {
+  position:absolute;
+  background:#fff;
+  border:4px solid #000;
+  border-radius:30px;
+  padding:12px 20px;
+  font-weight:bold;
+}
+</style>
 </head>
+
 <body>
-    <div id="upload-zone" class="setup-box">
-        <h1>🎬 Hairline Comic Maker</h1>
-        <p>0.1px Gap Precision & Parallel 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:#00d2ff; color:black; font-size:16px;">🚀 GENERATE COMIC</button>
-        <div id="loading" class="hidden"><div class="loader"></div><p id="st">Acquiring GPU...</p></div>
-    </div>
-
-    <div id="editor-zone" class="hidden">
-        <div id="output"></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>
-        </div>
-    </div>
+<input type="file" id="f">
+<button onclick="go()">Generate</button>
+<div id="out"></div>
 
 <script>
-    let sid = 's' + Math.random().toString(36).substr(2,9);
-    let selP = null;
-
-    async function start() {
-        const f = document.getElementById('vid').files[0];
-        if(!f) return alert("Select a video!");
-        document.getElementById('loading').classList.remove('hidden');
-        const fd = new FormData(); fd.append('file', f); fd.append('pages', document.getElementById('pg').value);
-        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 || "Processing...";
-            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');
-        pages.forEach(p => {
-            const pgDiv = document.createElement('div'); pgDiv.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);
-            });
-            out.appendChild(pgDiv);
-        });
-    }
-
-    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)); else alert("Select a panel first!"); }
-
-    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();
-        }
-    }
+let sid = "s" + Math.random().toString(36).slice(2);
+
+async function go(){
+  let fd = new FormData();
+  fd.append("file", f.files[0]);
+  fd.append("pages", 1);
+  await fetch(`/upload?sid=${sid}`, {method:"POST", body:fd});
+  setTimeout(load, 3000);
+}
+
+async function load(){
+  let r = await fetch(`/output/${sid}/pages.json`);
+  let pages = await r.json();
+  pages.forEach(p=>{
+    let page = document.createElement("div");
+    page.className="comic-page";
+
+    // panel 1
+    let p1 = mk(p[0], true); page.appendChild(p1);
+    let p2 = mk(p[1]); page.appendChild(p2);
+
+    let bottom = document.createElement("div");
+    bottom.className="bottom";
+    bottom.appendChild(mk(p[2]));
+    bottom.appendChild(mk(p[3]));
+    bottom.appendChild(mk(p[4]));
+
+    page.appendChild(bottom);
+    out.appendChild(page);
+  });
+}
+
+function mk(d, title=false){
+  let p = document.createElement("div");
+  p.className="panel";
+  let img = document.createElement("img");
+  img.src = `/frames/${sid}/${d.image}`;
+  p.appendChild(img);
+
+  if(title){
+    let t = document.createElement("div");
+    t.className="title";
+    t.innerText="गट्टू चिंकी और मलतियों का रहस्य";
+    p.appendChild(t);
+  }
+
+  let b = document.createElement("div");
+  b.className="bubble";
+  b.style.left=d.bubble.x+"px";
+  b.style.top=d.bubble.y+"px";
+  b.innerText=d.bubble.text;
+  p.appendChild(b);
+  return p;
+}
 </script>
-</body></html>
-'''
+</body>
+</html>
+"""
 
-if __name__ == '__main__':
-    try: gpu_warmup()
-    except: pass
-    app.run(host='0.0.0.0', port=7860)
+if __name__ == "__main__":
+    gpu_warmup()
+    app.run(host="0.0.0.0", port=7860)