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'
@@ -43,7 +43,7 @@ os.makedirs(SAVED_COMICS_DIR, exist_ok=True)
 # 🔧 APP CONFIG
 # ======================================================
 app = Flask(__name__)
-app.config['MAX_CONTENT_LENGTH'] = 500 * 1024 * 1024  # 500MB Limit
+app.config['MAX_CONTENT_LENGTH'] = 500 * 1024 * 1024  # 500MB Upload Limit
 
 def generate_save_code(length=8):
     chars = string.ascii_uppercase + string.digits
@@ -74,16 +74,16 @@ class Page:
         self.bubbles = bubbles
 
 # ======================================================
-# 🧠 GPU GENERATION (FULL TEXT + HD IMAGE)
+# 🧠 GPU GENERATION (SQUARE PADDING + TEXT)
 # ======================================================
 @spaces.GPU(duration=300)
 def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_pages):
-    print(f"🚀 Generating HD Comic with TEXT: {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 # Ensure this backend file exists
+    from backend.subtitles.subs_real import get_real_subtitles
     
     # 1. Video Setup
     cap = cv2.VideoCapture(video_path)
@@ -93,7 +93,7 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
     duration = total_frames / fps
     cap.release()
 
-    # 2. GENERATE SUBTITLES
+    # 2. SUBTITLES
     user_srt = os.path.join(user_dir, 'subs.srt')
     try:
         print("🎙️ Extracting subtitles...")
@@ -101,24 +101,22 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
         if os.path.exists('test1.srt'):
             shutil.move('test1.srt', user_srt)
         elif not os.path.exists(user_srt):
-            with open(user_srt, 'w') as f: f.write("1\n00:00:01,000 --> 00:00:04,000\n(No Text)\n")
+            with open(user_srt, 'w') as f: f.write("1\n00:00:01,000 --> 00:00:04,000\n...\n")
     except Exception as e:
         print(f"⚠️ Subtitle error: {e}")
-        with open(user_srt, 'w') as f: f.write("1\n00:00:01,000 --> 00:00:04,000\n(Error)\n")
+        with open(user_srt, 'w') as f: f.write("1\n00:00:01,000 --> 00:00:04,000\n...\n")
             
-    # 3. Parse Subtitles
     with open(user_srt, 'r', encoding='utf-8') as f:
         try: all_subs = list(srt.parse(f.read()))
         except: all_subs = []
 
     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:
         raw_moments = []
 
-    # 4. Determine Frames needed (4 per page)
+    # 3. Frame Selection (4 per page)
     panels_per_page = 4
     total_panels_needed = int(target_pages) * panels_per_page
 
@@ -132,7 +130,7 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
         indices = np.linspace(0, len(raw_moments) - 1, total_panels_needed, dtype=int)
         selected_moments = [raw_moments[i] for i in indices]
         
-    # 5. Extract Frames (HD 1280x720)
+    # 4. Extract & PAD TO SQUARE
     frame_metadata = {}
     cap = cv2.VideoCapture(video_path)
     count = 0
@@ -145,13 +143,29 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
         ret, frame = cap.read()
         
         if ret:
-            # 🎯 KEEP 16:9 ASPECT RATIO (1280x720)
-            # This ensures no data is lost. Frontend controls crop/zoom.
-            frame = cv2.resize(frame, (1280, 720))
+            # ----------------------------------------------------
+            # 🎯 SQUARE PADDING LOGIC (0% Cut)
+            # ----------------------------------------------------
+            h, w = frame.shape[:2]
+            # Determine square size based on max dimension
+            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
+            
+            # Place original frame in center
+            square_img[y_off:y_off+h, x_off:x_off+w] = frame
+            
+            # Optionally resize to standard high res (e.g. 1024x1024) to normalize
+            square_img = cv2.resize(square_img, (1024, 1024))
             
             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)
@@ -160,18 +174,17 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
     cap.release()
     with open(metadata_path, 'w') as f: json.dump(frame_metadata, f, indent=2)
         
-    # 6. Generate Bubbles
+    # 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'
-        
-        # Center bubbles initially
+        # Position bubbles somewhat centrally to avoid black bars
         bubbles_list.append(bubble(dialog=dialogue, x=50, y=20, type=b_type))
             
-    # 7. Construct Pages
+    # 6. Pages
     pages = []
     for i in range(int(target_pages)):
         start_idx = i * 4
@@ -179,10 +192,9 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
         p_frames = frame_files_ordered[start_idx:end_idx]
         p_bubbles = bubbles_list[start_idx:end_idx]
         
-        # Pad with empty frames if not enough
         while len(p_frames) < 4:
              fname = f"empty_{i}_{len(p_frames)}.png"
-             img = np.zeros((720, 1280, 3), dtype=np.uint8); img[:] = (30,30,30)
+             img = np.zeros((1024, 1024, 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'))
@@ -191,7 +203,6 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
             pg_panels = [panel(image=f) for f in p_frames]
             pages.append(Page(panels=pg_panels, bubbles=p_bubbles))
 
-    # 8. Output
     result = []
     for pg in pages:
         p_data = [p if isinstance(p, dict) else p.__dict__ for p in pg.panels]
@@ -219,9 +230,17 @@ def regen_frame_gpu(video_path, frames_dir, metadata_path, fname, direction):
     cap.release()
 
     if ret:
-        frame = cv2.resize(frame, (1280, 720)) # Keep HD
+        # Re-apply Square Padding logic
+        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
+        square_img = cv2.resize(square_img, (1024, 1024))
+        
         p = os.path.join(frames_dir, fname)
-        cv2.imwrite(p, frame)
+        cv2.imwrite(p, square_img)
         
         if isinstance(meta[fname], dict): meta[fname]['time'] = new_t
         else: meta[fname] = new_t
@@ -239,9 +258,16 @@ def get_frame_at_ts_gpu(video_path, frames_dir, metadata_path, fname, ts):
     cap.release()
 
     if ret:
-        frame = cv2.resize(frame, (1280, 720)) # Keep HD
+        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
+        square_img = cv2.resize(square_img, (1024, 1024))
+        
         p = os.path.join(frames_dir, fname)
-        cv2.imwrite(p, frame)
+        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:
@@ -342,7 +368,7 @@ INDEX_HTML = '''
 
     .panel { position: absolute; top: 0; left: 0; width: 100%; height: 100%; overflow: hidden; background: #1a1a1a; cursor: grab; }
     
-    /* IMAGE HANDLING: Object-fit cover fills the square. Pan/Zoom reveals hidden parts. */
+    /* IMAGE: Cover ensures it fills. Zoom allows control. */
     .panel img { 
         width: 100%; height: 100%; 
         object-fit: cover; 
@@ -421,14 +447,12 @@ INDEX_HTML = '''
             <input type="text" id="load-code" placeholder="ENTER SAVE CODE" style="width:70%; display:inline-block;">
             <button onclick="loadComic()" style="width:25%; display:inline-block; background:#9b59b6; color:white;">Load</button>
         </div>
-
         <div class="loading-view" id="loading-view" style="display:none; margin-top:20px;">
             <div class="loader" style="margin:0 auto;"></div>
             <p id="status-text" style="margin-top:10px;">Starting...</p>
         </div>
     </div>
 </div>
-
 <div id="editor-container">
     <div class="tip">👉 Drag Blue/Green dots from the RIGHT edge to reveal hidden square panels!</div>
     <div class="comic-wrapper" id="comic-container"></div>
@@ -440,7 +464,6 @@ INDEX_HTML = '''
             <button onclick="undo()" style="background:#7f8c8d; color:white;">↩️ Undo</button>
             <button onclick="saveComic()" class="save-btn">💾 Save Comic</button>
         </div>
-
         <div class="control-group">
             <label>💬 Bubbles:</label>
             <div class="button-grid">
@@ -452,7 +475,6 @@ INDEX_HTML = '''
                 <input type="color" id="bub-text" value="#000000" onchange="updateBubbleColor()">
             </div>
         </div>
-
         <div class="control-group">
             <label>🖼️ Image Control:</label>
             <div class="button-grid">
@@ -463,7 +485,7 @@ INDEX_HTML = '''
         
         <div class="control-group">
             <label>🔍 Zoom (Mouse Wheel):</label>
-            <!-- Min zoom 20 allowed to zoom OUT -->
+            <!-- Min zoom 20 allowed to zoom OUT to see whole square image -->
             <input type="range" id="zoom-slider" min="20" max="300" value="100" step="5" oninput="handleZoom(this.value)" disabled>
             <button onclick="resetPanelTransform()" class="secondary-btn">Reset View</button>
         </div>
@@ -474,7 +496,6 @@ INDEX_HTML = '''
         </div>
     </div>
 </div>
-
 <div class="modal-overlay" id="save-modal">
     <div class="modal-content">
         <h2>✅ Comic Saved!</h2>
@@ -482,7 +503,6 @@ INDEX_HTML = '''
         <button onclick="closeModal()">Close</button>
     </div>
 </div>
-
 <script>
     function genUUID(){ return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g,c=>{var r=Math.random()*16|0,v=c=='x'?r:(r&0x3|0x8);return v.toString(16);}); }
     let sid = localStorage.getItem('comic_sid') || genUUID();
@@ -491,7 +511,6 @@ INDEX_HTML = '''
     let dragType = null, activeObj = null, dragStart = {x:0, y:0};
     let historyStack = [];
     
-    // HISTORY & UNDO
     function saveState() {
         const state = [];
         document.querySelectorAll('.comic-page').forEach(pg => {
@@ -508,9 +527,7 @@ INDEX_HTML = '''
             const panels = [];
             grid.querySelectorAll('.panel').forEach(pan => {
                 const img = pan.querySelector('img');
-                const srcParts = img.src.split('frames/');
-                const fname = srcParts.length > 1 ? srcParts[1].split('?')[0] : '';
-                panels.push({ image: fname, zoom: img.dataset.zoom, tx: img.dataset.translateX, ty: img.dataset.translateY });
+                panels.push({ zoom: img.dataset.zoom, tx: img.dataset.translateX, ty: img.dataset.translateY });
             });
             state.push({ layout, bubbles, panels });
         });
@@ -558,7 +575,6 @@ INDEX_HTML = '''
             setTimeout(() => restoreFromState(JSON.parse(localStorage.getItem('comic_draft_'+sid))), 500);
         });
     }
-
     async function upload() {
         const f = document.getElementById('file-upload').files[0];
         const pCount = document.getElementById('page-count').value;
@@ -590,7 +606,6 @@ INDEX_HTML = '''
         renderFromState(cleanData);
         saveState();
     }
-
     function renderFromState(pagesData) {
         const con = document.getElementById('comic-container'); con.innerHTML = '';
         pagesData.forEach((page, pageIdx) => {