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
@@ -12,16 +11,20 @@ import cv2
 import math
 import numpy as np
 import srt
+import torch
 from flask import Flask, jsonify, request, send_from_directory, send_file
 
 # ======================================================
-# 🚀 ZEROGPU CONFIGURATION
+# 🚀 CUDA CONFIGURATION
 # ======================================================
-@spaces.GPU
-def gpu_warmup():
-    import torch
-    print(f"✅ ZeroGPU Warmup: CUDA Available: {torch.cuda.is_available()}")
-    return True
+def check_cuda():
+    """Checks for CUDA availability without ZeroGPU decorators"""
+    if torch.cuda.is_available():
+        print(f"✅ CUDA Engine Active: {torch.cuda.get_device_name(0)}")
+        return True
+    else:
+        print("⚠️ CUDA Not Detected. Running on CPU (Expect slower generation)")
+        return False
 
 # ======================================================
 # 🧱 DATA CLASSES
@@ -68,15 +71,16 @@ def generate_save_code(length=8):
             return code
 
 # ======================================================
-# 🧠 GLOBAL GPU FUNCTIONS
+# 🧠 CORE PROCESSING FUNCTIONS (Standard CUDA)
+# ======================================================
+# Removed @spaces.GPU decorators. These functions now run 
+# directly in the thread/process invoking them.
 # ======================================================
-@spaces.GPU(duration=300)
-def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_pages):
-    print(f"🚀 GPU Task Started: {video_path} | Pages: {target_pages}")
+
+def generate_comic_core(video_path, user_dir, frames_dir, metadata_path, target_pages):
+    print(f"🚀 Processing Task Started: {video_path} | Pages: {target_pages}")
     
-    import cv2
-    import srt
-    import numpy as np
+    # Import backend logic here to ensure they load into the correct context
     from backend.keyframes.keyframes import black_bar_crop
     from backend.simple_color_enhancer import SimpleColorEnhancer
     from backend.quality_color_enhancer import QualityColorEnhancer
@@ -98,11 +102,15 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
         get_real_subtitles(video_path)
         if os.path.exists('test1.srt'):
             shutil.move('test1.srt', user_srt)
-    except:
+    except Exception as e:
+        print(f"Subtitle error (using placeholder): {e}")
         with open(user_srt, 'w') as f: f.write("1\n00:00:01,000 --> 00:00:04,000\n...\n")
             
     with open(user_srt, 'r', encoding='utf-8') as f:
-        all_subs = list(srt.parse(f.read()))
+        try:
+            all_subs = list(srt.parse(f.read()))
+        except:
+            all_subs = []
 
     # 3. Smart Keyframe Selection
     valid_subs = [s for s in all_subs if s.content.strip()]
@@ -137,7 +145,6 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
             fname = f"frame_{count:04d}.png"
             p = os.path.join(frames_dir, fname)
             cv2.imwrite(p, frame)
-            os.sync() 
             frame_metadata[fname] = {'dialogue': moment['text'], 'time': mid}
             frame_files_ordered.append(fname)
             count += 1
@@ -149,6 +156,7 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
     try: black_bar_crop() 
     except: pass
 
+    # Initialize enhancers (they usually load models to CUDA if available)
     se = SimpleColorEnhancer()
     qe = QualityColorEnhancer()
 
@@ -198,10 +206,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):
-    import cv2
-    import json
+def regen_frame_core(video_path, frames_dir, metadata_path, fname, direction):
     from backend.simple_color_enhancer import SimpleColorEnhancer
 
     if not os.path.exists(metadata_path): return {"success": False, "message": "No metadata"}
@@ -221,7 +226,6 @@ def regen_frame_gpu(video_path, frames_dir, metadata_path, fname, direction):
     if ret:
         p = os.path.join(frames_dir, fname)
         cv2.imwrite(p, frame)
-        os.sync()
         try: SimpleColorEnhancer().enhance_single(p, p)
         except: pass
         
@@ -231,10 +235,7 @@ def regen_frame_gpu(video_path, frames_dir, metadata_path, fname, direction):
         return {"success": True, "message": f"Adjusted to {new_t:.2f}s"}
     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
+def get_frame_at_ts_core(video_path, frames_dir, metadata_path, fname, ts):
     from backend.simple_color_enhancer import SimpleColorEnhancer
 
     cap = cv2.VideoCapture(video_path)
@@ -245,7 +246,6 @@ def get_frame_at_ts_gpu(video_path, frames_dir, metadata_path, fname, ts):
     if ret:
         p = os.path.join(frames_dir, fname)
         cv2.imwrite(p, frame)
-        os.sync()
         try: SimpleColorEnhancer().enhance_single(p, p)
         except: pass
         
@@ -280,8 +280,9 @@ class EnhancedComicGenerator:
 
     def run(self, target_pages):
         try:
-            self.write_status("Waiting for GPU...", 5)
-            data = generate_comic_gpu(self.video_path, self.user_dir, self.frames_dir, self.metadata_path, int(target_pages))
+            self.write_status("Waiting for GPU/Processor...", 5)
+            # Directly call the core function (standard CUDA)
+            data = generate_comic_core(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)
@@ -485,7 +486,7 @@ INDEX_HTML = '''
             </div>
         </div>
         
-        <!-- NEW TEMPLATE OPTIONS -->
+        <!-- TEMPLATE OPTIONS -->
         <div class="control-group">
             <label>📐 Page Layout (Template):</label>
             <select id="template-select" onchange="changeTemplate(this.value)">
@@ -629,7 +630,6 @@ INDEX_HTML = '''
     function getCurrentState() {
         const pages = [];
         document.querySelectorAll('.comic-page').forEach(p => {
-            // Get Grid Class
             const grid = p.querySelector('.comic-grid');
             let template = 't-classic';
             if(grid) {
@@ -665,12 +665,9 @@ INDEX_HTML = '''
     
     function saveDraft() { localStorage.setItem('comic_draft_'+sid, JSON.stringify({ pages: getCurrentState(), saveCode: currentSaveCode, savedAt: new Date().toISOString() })); }
     
-    // FUNCTION ADDED: Change Template
     function changeTemplate(tpl) {
         document.querySelectorAll('.comic-grid').forEach(g => {
-            // Remove existing template classes
             g.classList.remove('t-classic', 't-feat-top', 't-side', 't-cinematic');
-            // Add new
             g.classList.add(tpl);
         });
         saveDraft();
@@ -685,11 +682,9 @@ INDEX_HTML = '''
             const div = document.createElement('div'); div.className = 'comic-page';
             
             const grid = document.createElement('div'); 
-            // Apply saved template or default
             const tpl = page.template || 't-classic';
             grid.className = `comic-grid ${tpl}`;
             
-            // Set dropdown to current template (of first page)
             if(pageIdx === 0) document.getElementById('template-select').value = tpl;
 
             page.panels.forEach((pan) => {
@@ -900,7 +895,6 @@ def upload():
     if 'file' not in request.files or not request.files['file'].filename:
         return jsonify({'success': False, 'message': 'No file selected'}), 400
     
-    # GET PAGE COUNT FROM FORM
     target_pages = request.form.get('target_pages', 4)
 
     f = request.files['file']
@@ -909,7 +903,7 @@ def upload():
     f.save(gen.video_path)
     gen.write_status("Starting...", 5)
     
-    # Run in thread
+    # Run in thread - Standard processing
     threading.Thread(target=gen.run, args=(target_pages,)).start()
     return jsonify({'success': True, 'message': 'Generation started.'})
 
@@ -935,16 +929,16 @@ def regen():
     sid = request.args.get('sid')
     d = request.get_json()
     gen = EnhancedComicGenerator(sid)
-    # CALL GLOBAL GPU FUNCTION
-    return jsonify(regen_frame_gpu(gen.video_path, gen.frames_dir, gen.metadata_path, d['filename'], d['direction']))
+    # Direct function call
+    return jsonify(regen_frame_core(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)
-    # CALL GLOBAL GPU FUNCTION
-    return jsonify(get_frame_at_ts_gpu(gen.video_path, gen.frames_dir, gen.metadata_path, d['filename'], float(d['timestamp'])))
+    # Direct function call
+    return jsonify(get_frame_at_ts_core(gen.video_path, gen.frames_dir, gen.metadata_path, d['filename'], float(d['timestamp'])))
 
 @app.route('/replace_panel', methods=['POST'])
 def rep_panel():
@@ -1010,6 +1004,5 @@ def load_comic(code):
         return jsonify({'success': False, 'message': str(e)})
 
 if __name__ == '__main__':
-    try: gpu_warmup()
-    except: pass
+    check_cuda()
     app.run(host='0.0.0.0', port=7860)