Update app_enhanced.py

app_enhanced.py

@@ -1,4 +1,3 @@
-import spaces  # <--- CRITICAL: MUST BE THE FIRST IMPORT
 import os
 import time
 import threading
@@ -14,15 +13,6 @@ import numpy as np
 import srt
 from flask import Flask, jsonify, request, send_from_directory, send_file
 
-# ======================================================
-# 🚀 ZEROGPU CONFIGURATION
-# ======================================================
-@spaces.GPU
-def gpu_warmup():
-    import torch
-    print(f"✅ ZeroGPU Warmup: CUDA Available: {torch.cuda.is_available()}")
-    return True
-
 # ======================================================
 # 💾 STORAGE SETUP
 # ======================================================
@@ -81,15 +71,19 @@ class Page:
         self.bubbles = bubbles
 
 # ======================================================
-# 🧠 GPU GENERATION
+# 🧠 CPU GENERATION (Formerly GPU)
 # ======================================================
-@spaces.GPU(duration=300)
-def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_pages):
-    print(f"🚀 Generating 864x1080 Comic: {video_path}")
+def generate_comic_cpu(video_path, user_dir, frames_dir, metadata_path, target_pages):
+    print(f"🚀 Generating 864x1080 Comic (CPU Mode): {video_path}")
     import cv2
     import srt
     import numpy as np
-    from backend.subtitles.subs_real import get_real_subtitles
+    # Assuming backend.subtitles.subs_real exists in your file structure. 
+    # If not, the try/except block below handles the fallback.
+    try:
+        from backend.subtitles.subs_real import get_real_subtitles
+    except ImportError:
+        get_real_subtitles = None
     
     cap = cv2.VideoCapture(video_path)
     if not cap.isOpened(): raise Exception("Cannot open video")
@@ -101,11 +95,14 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
     # 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)
-        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...\n")
+        if get_real_subtitles:
+            get_real_subtitles(video_path)
+            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...\n")
+        else:
+            raise Exception("Subtitles module missing")
     except:
         with open(user_srt, 'w') as f: f.write("1\n00:00:01,000 --> 00:00:04,000\n...\n")
             
@@ -205,8 +202,7 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
 
     return result
 
-@spaces.GPU
-def regen_frame_gpu(video_path, frames_dir, metadata_path, fname, direction):
+def regen_frame_cpu(video_path, frames_dir, metadata_path, fname, direction):
     import cv2
     import json
     if not os.path.exists(metadata_path): return {"success": False, "message": "No metadata"}
@@ -231,8 +227,7 @@ def regen_frame_gpu(video_path, frames_dir, metadata_path, fname, direction):
         return {"success": True, "message": f"Time: {new_t:.2f}s", "new_time": new_t}
     return {"success": False}
 
-@spaces.GPU
-def get_frame_at_ts_gpu(video_path, frames_dir, metadata_path, fname, ts):
+def get_frame_at_ts_cpu(video_path, frames_dir, metadata_path, fname, ts):
     import cv2
     import json
     cap = cv2.VideoCapture(video_path)
@@ -272,7 +267,8 @@ class EnhancedComicGenerator:
     def run(self, target_pages):
         try:
             self.write_status("Generating...", 5)
-            data = generate_comic_gpu(self.video_path, self.user_dir, self.frames_dir, self.metadata_path, int(target_pages))
+            # Call CPU function instead of GPU
+            data = generate_comic_cpu(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)
             self.write_status("Complete!", 100)
@@ -334,7 +330,6 @@ INDEX_HTML = '''
         --y: 50%; --t1: 100%; --t2: 100%; --b1: 100%; --b2: 100%; 
         --gap: 5px; /* Size of White Gap */
     }
-
     /* 🎯 BLACK BORDER INSIDE THE PANEL */
     .panel { 
         position: absolute; top: 0; left: 0; width: 100%; height: 100%; 
@@ -352,13 +347,11 @@ INDEX_HTML = '''
     }
     .panel img.panning { cursor: grabbing; transition: none; }
     .panel.selected { border: 4px solid #3498db; z-index: 5; }
-
     /* Clip Paths */
     .panel:nth-child(1) { clip-path: polygon(0 0, calc(var(--t1) - var(--gap)) 0, calc(var(--t2) - var(--gap)) calc(var(--y) - var(--gap)), 0 calc(var(--y) - var(--gap))); z-index: 1; }
     .panel:nth-child(2) { clip-path: polygon(calc(var(--t1) + var(--gap)) 0, 100% 0, 100% calc(var(--y) - var(--gap)), calc(var(--t2) + var(--gap)) calc(var(--y) - var(--gap))); z-index: 1; }
     .panel:nth-child(3) { clip-path: polygon(0 calc(var(--y) + var(--gap)), calc(var(--b1) - var(--gap)) calc(var(--y) + var(--gap)), calc(var(--b2) - var(--gap)) 100%, 0 100%); z-index: 1; }
     .panel:nth-child(4) { clip-path: polygon(calc(var(--b1) + var(--gap)) calc(var(--y) + var(--gap)), 100% calc(var(--y) + var(--gap)), 100% 100%, calc(var(--b2) + var(--gap)) 100%); z-index: 1; }
-
     .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); }
     .h-t1 { background: #3498db; left: var(--t1); top: 0%; margin-top: 15px; }
     .h-t2 { background: #3498db; left: var(--t2); top: 50%; margin-top: -15px; }
@@ -385,7 +378,6 @@ INDEX_HTML = '''
     .speech-bubble.speech.tail-top:before { bottom: 100%; left: clamp(0%, calc(var(--p) - (1 - var(--t)) * var(--b) / 2), calc(100% - (1 - var(--t)) * var(--b))); transform: scaleY(-1); }
     .speech-bubble.speech.tail-left:before { right: 100%; top: clamp(0%, calc(var(--p) - (1 - var(--t)) * var(--b) / 2), calc(100% - (1 - var(--t)) * var(--b))); transform: rotate(90deg); transform-origin: top right; }
     .speech-bubble.speech.tail-right:before { left: 100%; top: clamp(0%, calc(var(--p) - (1 - var(--t)) * var(--b) / 2), calc(100% - (1 - var(--t)) * var(--b))); transform: rotate(-90deg); transform-origin: top left; }
-
     .speech-bubble.thought { background: var(--bubble-fill, #fff); color: var(--bubble-text, #000); border: 2px dashed #555; border-radius: 50%; }
     .speech-bubble.thought::before { display:none; }
     .thought-dot { position: absolute; background-color: var(--bubble-fill, #fff); border: 2px solid #555; border-radius: 50%; z-index: -1; }
@@ -397,7 +389,6 @@ INDEX_HTML = '''
     
     .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; }
-
     /* CONTROLS */
     .edit-controls { position: fixed; bottom: 20px; right: 20px; width: 280px; background: rgba(44, 62, 80, 0.95); color: white; padding: 15px; border-radius: 8px; box-shadow: 0 5px 15px rgba(0,0,0,0.3); z-index: 900; font-size: 13px; max-height: 90vh; overflow-y: auto; }
     .edit-controls h4 { margin: 0 0 10px 0; color: #4ECDC4; text-align: center; }
@@ -420,10 +411,9 @@ INDEX_HTML = '''
     .code { font-size: 24px; font-weight: bold; letter-spacing: 3px; background: #eee; padding: 10px; margin: 15px 0; display: inline-block; font-family: monospace; }
 </style>
 </head> <body> 
-
 <div id="upload-container"> 
     <div class="upload-box"> 
-        <h1>⚡ 864x1080 Robust Comic</h1> 
+        <h1>⚡ 864x1080 Robust Comic (CPU)</h1> 
         <input type="file" id="file-upload" class="file-input" onchange="document.getElementById('fn').innerText=this.files[0].name"> 
         <label for="file-upload" class="file-label">📁 Choose Video</label> 
         <span id="fn" style="margin-bottom:10px; display:block; color:#aaa;">No file selected</span>
@@ -446,7 +436,6 @@ INDEX_HTML = '''
         </div>
     </div>
 </div>
-
 <div id="editor-container">
     <div class="tip">👉 Drag Right-Side Dots to reveal 4 panels! | 📜 Scroll to Zoom/Pan</div>
     <div class="comic-wrapper" id="comic-container"></div>
@@ -459,7 +448,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>💬 Bubble Styling:</label>
             <select id="bubble-type" onchange="updateBubbleType()">
@@ -487,7 +475,6 @@ INDEX_HTML = '''
                 <input type="range" min="10" max="90" value="50" oninput="slideTail(this.value)" title="Tail Pos">
             </div>
         </div>
-
         <div class="control-group">
             <label>🖼️ Time Frame (MM:SS):</label>
             <div class="timestamp-controls">
@@ -514,7 +501,6 @@ INDEX_HTML = '''
         </div>
     </div>
 </div>
-
 <div class="modal-overlay" id="save-modal">
     <div class="modal-content">
         <h2>✅ Comic Saved!</h2>
@@ -522,7 +508,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();
@@ -619,7 +604,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;
@@ -654,7 +638,6 @@ INDEX_HTML = '''
         renderFromState(cleanData);
         saveState();
     }
-
     function renderFromState(pagesData) {
         const con = document.getElementById('comic-container'); con.innerHTML = '';
         pagesData.forEach((page, pageIdx) => {
@@ -820,7 +803,6 @@ INDEX_HTML = '''
         }
         saveState();
     }
-
     function handleZoom(val) { if(selectedPanel) { const img = selectedPanel.querySelector('img'); img.dataset.zoom = val; updateImageTransform(img); saveState(); } }
     function updateImageTransform(img) { const z = (img.dataset.zoom||100)/100, x = img.dataset.translateX||0, y = img.dataset.translateY||0; img.style.transform = `translateX(${x}px) translateY(${y}px) scale(${z})`; }
     function resetPanelTransform() { if(selectedPanel) { const img = selectedPanel.querySelector('img'); img.dataset.zoom=100; img.dataset.translateX=0; img.dataset.translateY=0; updateImageTransform(img); document.getElementById('zoom-slider').value=100; saveState(); } }
@@ -942,14 +924,14 @@ def regen():
     sid = request.args.get('sid')
     d = request.get_json()
     gen = EnhancedComicGenerator(sid)
-    return jsonify(regen_frame_gpu(gen.video_path, gen.frames_dir, gen.metadata_path, d['filename'], d['direction']))
+    return jsonify(regen_frame_cpu(gen.video_path, gen.frames_dir, gen.metadata_path, d['filename'], d['direction']))
 
 @app.route('/goto_timestamp', methods=['POST'])
 def go_time():
     sid = request.args.get('sid')
     d = request.get_json()
     gen = EnhancedComicGenerator(sid)
-    return jsonify(get_frame_at_ts_gpu(gen.video_path, gen.frames_dir, gen.metadata_path, d['filename'], float(d['timestamp'])))
+    return jsonify(get_frame_at_ts_cpu(gen.video_path, gen.frames_dir, gen.metadata_path, d['filename'], float(d['timestamp'])))
 
 @app.route('/replace_panel', methods=['POST'])
 def rep_panel():
@@ -996,6 +978,4 @@ def load_comic(code):
     except Exception as e: return jsonify({'success': False, 'message': str(e)})
 
 if __name__ == '__main__':
-    try: gpu_warmup()
-    except: pass
     app.run(host='0.0.0.0', port=7860)