Update app_enhanced.py

app_enhanced.py

@@ -24,7 +24,7 @@ def gpu_warmup():
     return True
 
 # ======================================================
-# 💾 STORAGE SETUP
+# 💾 PERSISTENT STORAGE
 # ======================================================
 if os.path.exists('/data'):
     BASE_STORAGE_PATH = '/data'
@@ -39,8 +39,11 @@ 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 CONFIG
+# ======================================================
 app = Flask(__name__)
-app.config['MAX_CONTENT_LENGTH'] = 500 * 1024 * 1024
+app.config['MAX_CONTENT_LENGTH'] = 500 * 1024 * 1024  # 500MB Limit
 
 def generate_save_code(length=8):
     chars = string.ascii_uppercase + string.digits
@@ -50,37 +53,52 @@ def generate_save_code(length=8):
             return code
 
 # ======================================================
-# 🧠 DATA & GPU LOGIC
+# 🧱 DATA CLASSES (Restored from safwe.py)
 # ======================================================
-def bubble(dialog="", x=50, y=20, type='speech'):
+def bubble(dialog="", bubble_offset_x=50, bubble_offset_y=20, lip_x=-1, lip_y=-1, emotion='normal', type='speech'):
     return {
         'dialog': dialog,
-        'bubble_offset_x': int(x),
-        'bubble_offset_y': int(y),
+        'bubble_offset_x': int(bubble_offset_x),
+        'bubble_offset_y': int(bubble_offset_y),
+        'lip_x': int(lip_x),
+        'lip_y': int(lip_y),
+        'emotion': emotion,
         'type': type,
         'tail_pos': '50%',
+        'classes': f'speech-bubble {type} tail-bottom',
         'colors': {'fill': '#ffffff', 'text': '#000000'},
         'font': "'Comic Neue', cursive"
     }
 
+def panel(image=""):
+    return {'image': image}
+
+class Page:
+    def __init__(self, panels, bubbles):
+        self.panels = panels
+        self.bubbles = bubbles
+
+# ======================================================
+# 🧠 GPU GENERATION (SQUARE PADDING LOGIC)
+# ======================================================
 @spaces.GPU(duration=300)
 def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_pages):
-    print(f"🚀 Generating HD Comic: {video_path}")
+    print(f"🚀 Generating Square Comic: {video_path}")
+    
     import cv2
     import srt
     import numpy as np
     from backend.subtitles.subs_real import get_real_subtitles
     
+    # 1. Video Setup
     cap = cv2.VideoCapture(video_path)
-    if not cap.isOpened(): 
-        raise Exception("Cannot open video")
-    
+    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
     cap.release()
 
-    # Subtitles logic with FIXED SYNTAX
+    # 2. SUBTITLES
     user_srt = os.path.join(user_dir, 'subs.srt')
     try:
         get_real_subtitles(video_path)
@@ -99,27 +117,31 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
         except:
             all_subs = []
 
-    valid_subs = [s for s in all_subs if s.content.strip()]
+    valid_subs = [s for s in all_subs if s.content and s.content.strip()]
     if valid_subs:
         raw_moments = [{'text': s.content.strip(), 'start': s.start.total_seconds(), 'end': s.end.total_seconds()} for s in valid_subs]
     else:
+        # Fallback moments if no speech
         raw_moments = []
 
-    # 4 Panels Per Page
+    # 3. Frame Selection (4 per page)
     panels_per_page = 4
     total_panels_needed = int(target_pages) * panels_per_page
 
     selected_moments = []
     if not raw_moments:
+        # Generate time-based moments
         times = np.linspace(1, max(1, duration-1), total_panels_needed)
         for t in times:
             selected_moments.append({'text': '', 'start': t, 'end': t+1})
     elif len(raw_moments) <= total_panels_needed:
         selected_moments = raw_moments
     else:
+        # Subsample moments
         indices = np.linspace(0, len(raw_moments) - 1, total_panels_needed, dtype=int)
         selected_moments = [raw_moments[i] for i in indices]
         
+    # 4. Extract & PAD TO SQUARE
     frame_metadata = {}
     cap = cv2.VideoCapture(video_path)
     count = 0
@@ -129,28 +151,49 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
         mid = (moment['start'] + moment['end']) / 2
         cap.set(cv2.CAP_PROP_POS_MSEC, mid * 1000)
         ret, frame = cap.read()
+        
         if ret:
-            # 🎯 EXTRACT FULL HD (1280x720) - NO CROP
-            frame = cv2.resize(frame, (1280, 720))
+            # ----------------------------------------------------
+            # 🎯 SQUARE PADDING LOGIC (0% Cut)
+            # ----------------------------------------------------
+            h, w = frame.shape[:2]
+            sq_dim = max(h, w)
+            
+            # Create black square canvas
+            square_img = np.zeros((sq_dim, sq_dim, 3), dtype=np.uint8)
+            
+            # Calculate centering offsets
+            x_off = (sq_dim - w) // 2
+            y_off = (sq_dim - h) // 2
+            
+            # Paste original frame in center
+            square_img[y_off:y_off+h, x_off:x_off+w] = frame
+            
+            # Save
             fname = f"frame_{count:04d}.png"
             p = os.path.join(frames_dir, fname)
-            cv2.imwrite(p, frame)
+            cv2.imwrite(p, square_img)
+            
             frame_metadata[fname] = {'dialogue': moment['text'], 'time': mid}
             frame_files_ordered.append(fname)
             count += 1
+            
     cap.release()
-    
     with open(metadata_path, 'w') as f:
         json.dump(frame_metadata, f, indent=2)
         
+    # 5. Bubbles
     bubbles_list = []
     for f in frame_files_ordered:
         dialogue = frame_metadata.get(f, {}).get('dialogue', '')
         b_type = 'speech'
         if '(' in dialogue: b_type = 'narration'
         elif '!' in dialogue: b_type = 'reaction'
-        bubbles_list.append(bubble(dialog=dialogue, x=50, y=30, type=b_type))
+        
+        # Use full bubble function structure
+        bubbles_list.append(bubble(dialog=dialogue, bubble_offset_x=50, bubble_offset_y=20, type=b_type))
             
+    # 6. Pages
     pages = []
     for i in range(int(target_pages)):
         start_idx = i * 4
@@ -160,17 +203,24 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
         
         while len(p_frames) < 4:
              fname = f"empty_{i}_{len(p_frames)}.png"
-             img = np.zeros((720, 1280, 3), dtype=np.uint8)
+             img = np.zeros((800, 800, 3), dtype=np.uint8)
              img[:] = (30,30,30)
              cv2.imwrite(os.path.join(frames_dir, fname), img)
              p_frames.append(fname)
              p_bubbles.append(bubble(dialog="", type='speech'))
 
         if p_frames:
-            pg_panels = [{'image': f} for f in p_frames]
-            pages.append({'panels': pg_panels, 'bubbles': p_bubbles})
-
-    return pages
+            pg_panels = [panel(image=f) for f in p_frames]
+            pages.append(Page(panels=pg_panels, bubbles=p_bubbles))
+
+    # 7. Convert to Dict
+    result = []
+    for pg in pages:
+        p_data = [p if isinstance(p, dict) else p.__dict__ for p in pg.panels]
+        b_data = [b if isinstance(b, dict) else b.__dict__ for b in pg.bubbles]
+        result.append({'panels': p_data, 'bubbles': b_data})
+        
+    return result
 
 @spaces.GPU
 def regen_frame_gpu(video_path, frames_dir, metadata_path, fname, direction):
@@ -178,7 +228,6 @@ def regen_frame_gpu(video_path, frames_dir, metadata_path, fname, direction):
     import json
     if not os.path.exists(metadata_path):
         return {"success": False, "message": "No metadata"}
-    
     with open(metadata_path, 'r') as f:
         meta = json.load(f)
     
@@ -193,8 +242,17 @@ def regen_frame_gpu(video_path, frames_dir, metadata_path, fname, direction):
     cap.release()
 
     if ret:
-        frame = cv2.resize(frame, (1280, 720))
-        cv2.imwrite(os.path.join(frames_dir, fname), frame)
+        # Re-apply Square Padding
+        h, w = frame.shape[:2]
+        sq_dim = max(h, w)
+        square_img = np.zeros((sq_dim, sq_dim, 3), dtype=np.uint8)
+        x_off = (sq_dim - w) // 2
+        y_off = (sq_dim - h) // 2
+        square_img[y_off:y_off+h, x_off:x_off+w] = frame
+        
+        p = os.path.join(frames_dir, fname)
+        cv2.imwrite(p, square_img)
+        
         if isinstance(meta[fname], dict):
             meta[fname]['time'] = new_t
         else:
@@ -202,7 +260,39 @@ def regen_frame_gpu(video_path, frames_dir, metadata_path, fname, direction):
         with open(metadata_path, 'w') as f:
             json.dump(meta, f, indent=2)
         return {"success": True, "message": f"Time: {new_t:.2f}s"}
-    return {"success": False}
+    return {"success": False, "message": "End of video"}
+
+@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:
+        h, w = frame.shape[:2]
+        sq_dim = max(h, w)
+        square_img = np.zeros((sq_dim, sq_dim, 3), dtype=np.uint8)
+        x_off = (sq_dim - w) // 2
+        y_off = (sq_dim - h) // 2
+        square_img[y_off:y_off+h, x_off:x_off+w] = frame
+        
+        p = os.path.join(frames_dir, fname)
+        cv2.imwrite(p, square_img)
+        if os.path.exists(metadata_path):
+            with open(metadata_path, 'r') as f:
+                meta = json.load(f)
+            if fname in meta:
+                if isinstance(meta[fname], dict):
+                    meta[fname]['time'] = float(ts)
+                else:
+                    meta[fname] = float(ts)
+                with open(metadata_path, 'w') as f:
+                    json.dump(meta, f, indent=2)
+        return {"success": True, "message": f"Jumped to {ts}s"}
+    return {"success": False, "message": "Invalid timestamp"}
 
 # ======================================================
 # 💻 BACKEND CLASS
@@ -228,7 +318,7 @@ class EnhancedComicGenerator:
 
     def run(self, target_pages):
         try:
-            self.write_status("Generating...", 10)
+            self.write_status("Generating...", 5)
             data = generate_comic_gpu(self.video_path, self.user_dir, self.frames_dir, self.metadata_path, int(target_pages))
             with open(os.path.join(self.output_dir, 'pages.json'), 'w') as f:
                 json.dump(data, f, indent=2)
@@ -242,10 +332,10 @@ class EnhancedComicGenerator:
             json.dump({'message': msg, 'progress': prog}, f)
 
 # ======================================================
-# 🌐 FRONTEND
+# 🌐 ROUTES & FRONTEND
 # ======================================================
 INDEX_HTML = '''
-<!DOCTYPE html><html lang="en"> <head> <meta charset="UTF-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> <title>Ultimate Square Comic</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: #2c3e50; font-family: 'Lato', sans-serif; color: #eee; margin: 0; min-height: 100vh; }
+<!DOCTYPE html><html lang="en"> <head> <meta charset="UTF-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> <title>Square HD Comic</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&display=swap" rel="stylesheet"> <style> * { box-sizing: border-box; } body { background-color: #2c3e50; font-family: 'Comic Neue', sans-serif; color: #eee; 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: #34495e; border-radius: 12px; box-shadow: 0 10px 30px rgba(0,0,0,0.5); text-align: center; }
@@ -285,7 +375,15 @@ INDEX_HTML = '''
     }
 
     .panel { position: absolute; top: 0; left: 0; width: 100%; height: 100%; overflow: hidden; background: #1a1a1a; cursor: grab; }
-    .panel img { width: 100%; height: 100%; object-fit: cover; transform-origin: center; transition: transform 0.05s ease-out; display: block; }
+    
+    /* IMAGE: Cover ensures it fills. Zoom allows control. */
+    .panel img { 
+        width: 100%; height: 100%; 
+        object-fit: cover; 
+        transform-origin: center; 
+        transition: transform 0.05s ease-out; 
+        display: block; 
+    }
     .panel img.panning { cursor: grabbing; transition: none; }
     .panel.selected { outline: 4px solid #3498db; z-index: 5; }
 
@@ -297,6 +395,7 @@ INDEX_HTML = '''
 
     /* Handles */
     .handle { position: absolute; width: 26px; height: 26px; border: 3px solid white; border-radius: 50%; transform: translate(-50%, -50%); z-index: 101; cursor: ew-resize; box-shadow: 0 2px 5px rgba(0,0,0,0.8); }
+    .handle:hover { transform: translate(-50%, -50%) scale(1.3); }
     .h-t1 { background: #3498db; left: var(--t1); top: 0%; margin-top: 15px; }
     .h-t2 { background: #3498db; left: var(--t2); top: 50%; margin-top: -15px; }
     .h-b1 { background: #2ecc71; left: var(--b1); top: 50%; margin-top: 15px; }
@@ -312,15 +411,16 @@ INDEX_HTML = '''
     .bubble-text { padding: 0.8em; width: 100%; height: 100%; display: flex; align-items: center; justify-content: center; overflow: hidden; white-space: pre-wrap; pointer-events: none; border-radius: inherit; }
     .speech-bubble.selected { outline: 2px dashed #4CAF50; z-index: 100; }
     
-    .speech-bubble.speech { background: var(--bubble-fill, #fff); color: var(--bubble-text, #000); border: 2px solid #000; border-radius: 50%; width: 180px; height: 100px; }
+    /* Bubble Styles */
+    .speech-bubble.speech { background: var(--bubble-fill, #fff); color: var(--bubble-text, #000); border: 3px solid #000; border-radius: 50%; }
     .speech-bubble.speech::after { content: ''; position: absolute; bottom: -12px; left: var(--tail-pos); border: 12px solid transparent; border-top-color: #000; border-bottom: 0; margin-left: -12px; }
     
-    .speech-bubble.thought { background: var(--bubble-fill, #fff); color: var(--bubble-text, #000); border: 2px dashed #555; border-radius: 50%; width: 180px; height: 100px; }
+    .speech-bubble.thought { background: var(--bubble-fill, #fff); color: var(--bubble-text, #000); border: 2px dashed #555; border-radius: 50%; }
     .speech-bubble.thought .dots { position: absolute; bottom:-20px; left:20px; width:15px; height:15px; background:#fff; border:2px solid #555; border-radius:50%; }
     
-    .speech-bubble.reaction { background: #ff0; border: 3px solid red; color: red; font-family: 'Bangers'; text-transform: uppercase; width: 200px; height: 120px; clip-path: polygon(0% 25%, 17% 21%, 17% 0%, 31% 16%, 50% 4%, 69% 16%, 83% 0%, 83% 21%, 100% 25%, 85% 45%, 95% 62%, 82% 79%, 100% 97%, 79% 89%, 60% 98%, 46% 82%, 27% 95%, 15% 78%, 5% 62%, 15% 45%); }
+    .speech-bubble.reaction { background: #ff0; border: 3px solid red; color: red; font-family: 'Bangers'; text-transform: uppercase; clip-path: polygon(0% 25%, 17% 21%, 17% 0%, 31% 16%, 50% 4%, 69% 16%, 83% 0%, 83% 21%, 100% 25%, 85% 45%, 95% 62%, 82% 79%, 100% 97%, 79% 89%, 60% 98%, 46% 82%, 27% 95%, 15% 78%, 5% 62%, 15% 45%); }
     
-    .speech-bubble.narration { background: #eee; border: 2px solid #000; color: #000; border-radius: 0; width: 300px; height: 60px; font-family: 'Lato'; bottom: 10px; left: 50%; transform: translateX(-50%); }
+    .speech-bubble.narration { background: #eee; border: 2px solid #000; color: #000; border-radius: 0; font-family: 'Lato'; bottom: 10px; left: 50%; transform: translateX(-50%); }
     
     .resize-handle { position: absolute; bottom:-5px; right:-5px; width:15px; height:15px; background:#3498db; border:1px solid white; cursor:se-resize; display:none; }
     .speech-bubble.selected .resize-handle { display:block; }
@@ -721,6 +821,18 @@ INDEX_HTML = '''
         if(d.success) img.src = `/frames/${fname}?sid=${sid}&t=${Date.now()}`;
         img.style.opacity='1'; saveState();
     }
+    async function gotoTimestamp() {
+        if(!selectedPanel) return alert("Select a panel");
+        let v = document.getElementById('timestamp-input').value.trim();
+        if(!v) return;
+        if(v.includes(':')) { let p = v.split(':'); v = parseInt(p[0]) * 60 + parseFloat(p[1]); } else { v = parseFloat(v); }
+        const img = selectedPanel.querySelector('img'); let fname = img.src.split('/').pop().split('?')[0]; 
+        img.style.opacity = '0.5';
+        const r = await fetch(`/goto_timestamp?sid=${sid}`, { method:'POST', headers:{'Content-Type':'application/json'}, body:JSON.stringify({filename:fname, timestamp:v}) });
+        const d = await r.json();
+        if(d.success) img.src = `/frames/${fname}?sid=${sid}&t=${Date.now()}`;
+        img.style.opacity='1'; saveState();
+    }
     
     async function exportComic() {
         const pgs = document.querySelectorAll('.comic-page');
@@ -751,7 +863,7 @@ INDEX_HTML = '''
             const layout = { t1: grid.style.getPropertyValue('--t1')||'100%', t2: grid.style.getPropertyValue('--t2')||'100%', b1: grid.style.getPropertyValue('--b1')||'100%', b2: grid.style.getPropertyValue('--b2')||'100%' };
             const bubbles = [];
             grid.querySelectorAll('.speech-bubble').forEach(b => {
-                bubbles.push({ text: b.querySelector('.bubble-text').textContent, left: b.style.left, top: b.style.top, width: b.style.width, height: b.style.height, type: b.dataset.type, colors: { fill: b.style.getPropertyValue('--bubble-fill'), text: b.style.getPropertyValue('--bubble-text') }, tailPos: b.style.getPropertyValue('--tail-pos') });
+                bubbles.push({ text: b.querySelector('.bubble-text').textContent, left: b.style.left, top: b.style.top, width: b.style.width, height: b.style.height, colors: { fill: b.style.getPropertyValue('--bubble-fill'), text: b.style.getPropertyValue('--bubble-text') } });
             });
             const panels = [];
             grid.querySelectorAll('.panel').forEach(pan => {