Update app_enhanced.py

app_enhanced.py

@@ -1,36 +1,27 @@
-import spaces  # <--- MUST BE LINE 1
-from flask import Flask, jsonify, request, send_from_directory, send_file
+import spaces # <--- CRITICAL: MUST BE LINE 1
 import os
-import time
-import threading
-import json
-import traceback
-import string
-import random
-import shutil
-import cv2
-import numpy as np
+import torch
 
 # ======================================================
-# 🧠 ZEROGPU FUNCTIONS (Defined early for detection)
+# 🧠 ZEROGPU FUNCTIONS (Must be at top-level)
 # ======================================================
 
 @spaces.GPU(duration=120)
 def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_pages, panels_per_page_req):
-    """ZeroGPU function to extract frames and metadata"""
-    cap = cv2.VideoCapture(video_path)
-    if not cap.isOpened(): raise Exception("Video open failed")
+    import cv2
+    import numpy as np
+    import json
     
+    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
     
-    target_pages = int(target_pages)
-    panels_per_page = int(panels_per_page_req)
-    total_panels = target_pages * panels_per_page
+    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)
     
-    # Simple logic to grab frames at intervals
-    timestamps = np.linspace(0.5, max(0.5, duration - 0.5), total_panels)
     frame_metadata = {}
     frame_files = []
 
@@ -48,10 +39,9 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
         json.dump(frame_metadata, f)
 
     pages = []
-    for i in range(target_pages):
-        start = i * panels_per_page
-        end = start + panels_per_page
-        subset = frame_files[start:end]
+    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],
@@ -61,7 +51,8 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
 
 @spaces.GPU
 def regen_frame_gpu(video_path, frames_dir, metadata_path, fname, direction):
-    """Adjusts frame time forward or backward"""
+    import cv2
+    import json
     with open(metadata_path, 'r') as f: meta = json.load(f)
     t = meta[fname]['time']
     cap = cv2.VideoCapture(video_path)
@@ -78,37 +69,46 @@ def regen_frame_gpu(video_path, frames_dir, metadata_path, fname, direction):
     return False
 
 # ======================================================
-# ⚙️ CONFIG & STORAGE
+# ⚙️ APP & STORAGE SETUP
 # ======================================================
-STORAGE = '/data' if os.path.exists('/data') else '.'
-BASE_USER_DIR = os.path.join(STORAGE, "userdata")
+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")
 os.makedirs(BASE_USER_DIR, exist_ok=True)
 
 app = Flask(__name__)
 
-class ComicGenerator:
+class ComicBackend:
     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, 'out')
-        for d in [self.f_dir, self.o_dir]: os.makedirs(d, exist_ok=True)
-        self.meta_p = os.path.join(self.f_dir, 'meta.json')
+        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')
 
-    def update_status(self, msg, prog):
+    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 process(self, pgs, ppp):
+    def run(self, pgs, ppp):
         try:
-            self.update_status("GPU Processing...", 20)
+            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.update_status("Done!", 100)
+            self.write_status("Complete!", 100)
         except Exception as e:
-            self.update_status(f"Error: {str(e)}", -1)
+            self.write_status(f"Error: {str(e)}", -1)
 
 # ======================================================
 # 🌐 UI TEMPLATE (VERTICAL TILT)
@@ -117,129 +117,134 @@ 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: sans-serif; background: #eef2f3; padding: 20px; }
-    .comic-page { 
+    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: 6px solid black; overflow: hidden;
+        position: relative; border: 8px solid black; overflow: hidden;
     }
     .grid { width: 100%; height: 100%; position: relative; background: #000; }
-    .panel { position: absolute; top:0; left:0; width:100%; height:100%; overflow:hidden; }
+    .panel { position: absolute; top:0; left:0; width: 100%; height: 100%; overflow: hidden; }
     
-    /* VERTICAL TILT CLIPPING (Left/Right Split) */
-    .layout-slant .panel:nth-child(1) { 
+    /* VERTICAL SPLIT CLIP-PATH (Left/Right) */
+    .layout-vertical .panel:nth-child(1) { 
         z-index: 2; 
-        clip-path: polygon(0 0, var(--v-split-top, 45%) 0, var(--v-split-bottom, 55%) 100%, 0 100%); 
+        clip-path: polygon(0 0, var(--v-top, 45%) 0, var(--v-bottom, 55%) 100%, 0 100%); 
     }
-    .layout-slant .panel:nth-child(2) { 
+    .layout-vertical .panel:nth-child(2) { 
         z-index: 1; 
-        clip-path: polygon(var(--v-split-top, 45%) 0, 100% 0, 100% 100%, var(--v-split-bottom, 55%) 100%); 
+        clip-path: polygon(var(--v-top, 45%) 0, 100% 0, 100% 100%, var(--v-bottom, 55%) 100%); 
     }
     
     .panel img { width: 100%; height: 100%; object-fit: cover; }
     
-    /* TILT HANDLES (Top and Bottom) */
-    .v-handle {
-        position: absolute; width: 30px; height: 30px; background: #ff4757;
-        border-radius: 50%; z-index: 100; cursor: ew-resize; border: 3px solid white;
+    /* 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);
     }
-    .v-handle.top { top: -15px; left: var(--v-split-top, 45%); transform: translateX(-50%); }
-    .v-handle.bottom { bottom: -15px; left: var(--v-split-bottom, 55%); transform: translateX(-50%); }
+    .handle.top { top: -16px; left: var(--v-top, 45%); transform: translateX(-50%); }
+    .handle.bottom { bottom: -16px; left: var(--v-bottom, 55%); transform: translateX(-50%); }
 
-    .bubble { position: absolute; padding: 10px; background: white; border: 2px solid black; border-radius: 20px; cursor: move; z-index: 50; transform: translate(-50%, -50%); }
-    .controls { position: fixed; right: 20px; top: 20px; width: 200px; background: white; padding: 15px; border-radius: 10px; box-shadow: 0 4px 10px rgba(0,0,0,0.1); }
+    .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-view" style="text-align:center; padding-top: 100px;">
-    <h1>🎬 Vertical Tilt Comic Generator</h1>
-    <input type="file" id="vid-file"><br><br>
-    <button onclick="startProcessing()" style="padding:10px 20px; cursor:pointer;">Generate</button>
-    <p id="status-msg"></p>
+<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>
+    </div>
 </div>
 
-<div id="editor-view" style="display:none">
-    <div id="page-container"></div>
+<div id="editor-ui" style="display:none">
+    <div id="page-list"></div>
     <div class="controls">
         <h3>Editor</h3>
-        <p style="font-size: 12px;">Drag the red circles at the <b>top</b> and <b>bottom</b> to tilt the vertical divider.</p>
-        <button onclick="exportPNG()">Export Page 1</button>
-        <button onclick="location.reload()">Start Over</button>
+        <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>
 </div>
 
 <script>
-    let sid = "SID_" + Math.random().toString(36).substr(2, 9);
-    let draggingHandle = null;
+    let sid = "S" + Math.random().toString(36).substr(2, 9);
+    let dragging = null;
 
-    async function startProcessing() {
+    async function upload() {
         const file = document.getElementById('vid-file').files[0];
-        if(!file) return alert("Select a video");
+        if(!file) return alert("Select video");
         const fd = new FormData(); fd.append('file', file);
-        document.getElementById('status-msg').innerText = "Uploading & Waiting for ZeroGPU...";
+        document.getElementById('status').innerText = "Uploading...";
         
         await fetch(`/uploader?sid=${sid}`, {method:'POST', body:fd});
-        const timer = setInterval(async () => {
+        const check = setInterval(async () => {
             const r = await fetch(`/status?sid=${sid}`);
             const d = await r.json();
-            document.getElementById('status-msg').innerText = d.message;
-            if(d.progress >= 100) { clearInterval(timer); showEditor(); }
+            document.getElementById('status').innerText = d.message;
+            if(d.progress >= 100) { clearInterval(check); initEditor(); }
         }, 2000);
     }
 
-    async function showEditor() {
+    async function initEditor() {
         const r = await fetch(`/output/pages.json?sid=${sid}`);
         const data = await r.json();
-        const container = document.getElementById('page-container');
-        
+        const list = document.getElementById('page-list');
         data.forEach(p => {
-            const pg = document.createElement('div');
-            pg.className = 'comic-page';
+            const pageDiv = document.createElement('div');
+            pageDiv.className = 'page';
             const grid = document.createElement('div');
-            grid.className = 'grid layout-slant';
-            grid.style.setProperty('--v-split-top', '45%');
-            grid.style.setProperty('--v-split-bottom', '55%');
+            grid.className = 'grid layout-vertical';
+            grid.style.setProperty('--v-top', '45%');
+            grid.style.setProperty('--v-bottom', '55%');
 
-            const hTop = document.createElement('div'); hTop.className = 'v-handle top';
-            const hBot = document.createElement('div'); hBot.className = 'v-handle bottom';
+            const hTop = document.createElement('div'); hTop.className = 'handle top';
+            const hBot = document.createElement('div'); hBot.className = 'handle bottom';
             
-            hTop.onmousedown = () => draggingHandle = { grid, key: '--v-split-top' };
-            hBot.onmousedown = () => draggingHandle = { grid, key: '--v-split-bottom' };
+            hTop.onmousedown = () => dragging = { grid, key: '--v-top' };
+            hBot.onmousedown = () => dragging = { grid, key: '--v-bottom' };
 
             p.panels.forEach(pan => {
-                const pnl = document.createElement('div');
-                pnl.className = 'panel';
-                pnl.innerHTML = `<img src="/frames/${pan.image}?sid=${sid}">`;
-                grid.appendChild(pnl);
+                const div = document.createElement('div');
+                div.className = 'panel';
+                div.innerHTML = `<img src="/frames/${pan.image}?sid=${sid}">`;
+                grid.appendChild(div);
             });
 
             grid.appendChild(hTop); grid.appendChild(hBot);
-            pg.appendChild(grid);
-            container.appendChild(pg);
+            pageDiv.appendChild(grid);
+            list.appendChild(pageDiv);
         });
-
-        document.getElementById('upload-view').style.display = 'none';
-        document.getElementById('editor-view').style.display = 'block';
+        document.getElementById('upload-ui').style.display='none';
+        document.getElementById('editor-ui').style.display='block';
     }
 
     window.onmousemove = (e) => {
-        if(!draggingHandle) return;
-        const rect = draggingHandle.grid.getBoundingClientRect();
+        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));
-        draggingHandle.grid.style.setProperty(draggingHandle.key, x + '%');
+        x = Math.max(5, Math.min(95, x)); // Constraints
+        dragging.grid.style.setProperty(dragging.key, x + '%');
     };
-    window.onmouseup = () => draggingHandle = null;
+    window.onmouseup = () => dragging = null;
 
-    async function exportPNG() {
-        const node = document.querySelector('.comic-page');
-        const dataUrl = await htmlToImage.toPng(node);
-        const link = document.createElement('a');
-        link.download = 'comic-page.png'; link.href = dataUrl; link.click();
+    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();
+        }
     }
 </script></body></html>
 '''
 
 # ======================================================
-# 🚀 FLASK ROUTES
+# 🚀 ROUTES
 # ======================================================
 
 @app.route('/')
@@ -249,24 +254,23 @@ def index(): return INDEX_HTML
 def uploader():
     sid = request.args.get('sid')
     f = request.files['file']
-    gen = ComicGenerator(sid)
+    gen = ComicBackend(sid)
     f.save(gen.v_path)
-    threading.Thread(target=gen.process, args=(2, 2)).start()
+    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, 'out', 'status.json'), 'r') as f:
+        with open(os.path.join(BASE_USER_DIR, sid, 'output', 'status.json'), 'r') as f:
             return f.read()
-    except:
-        return jsonify({'message': 'Initializing...', 'progress': 0})
+    except: return jsonify({'message': 'Starting...', 'progress': 0})
 
 @app.route('/output/<path:filename>')
 def get_output(filename):
     sid = request.args.get('sid')
-    return send_from_directory(os.path.join(BASE_USER_DIR, sid, 'out'), filename)
+    return send_from_directory(os.path.join(BASE_USER_DIR, sid, 'output'), filename)
 
 @app.route('/frames/<path:filename>')
 def get_frame(filename):