Update app_enhanced.py

app_enhanced.py

@@ -12,6 +12,10 @@ import json
 import shutil
 from typing import List
 import traceback
+# <<< MODIFICATION START: Import for parallel processing >>>
+from concurrent.futures import ThreadPoolExecutor
+# <<< MODIFICATION END >>>
+
 
 # --- ROBUST IMPORTS WITH FALLBACKS ---
 # (Assuming these modules have a method to process a single image, e.g., enhance_single)
@@ -310,7 +314,6 @@ class EnhancedComicGenerator:
             new_path = os.path.join(self.frames_dir, frame_filename)
             cv2.imwrite(new_path, frame)
             
-            # Apply the same enhancements to the new frame to maintain style consistency
             print(f"🎨 Applying enhancements to the new frame: {frame_filename}")
             self._enhance_all_images(single_image_path=new_path)
             self._enhance_quality_colors(single_image_path=new_path)
@@ -347,7 +350,6 @@ class EnhancedComicGenerator:
             new_path = os.path.join(self.frames_dir, frame_filename)
             cv2.imwrite(new_path, frame)
 
-            # Apply enhancements to the new frame from the specific timestamp
             print(f"🎨 Applying enhancements to the new frame from timestamp: {frame_filename}")
             self._enhance_all_images(single_image_path=new_path)
             self._enhance_quality_colors(single_image_path=new_path)
@@ -366,7 +368,7 @@ class EnhancedComicGenerator:
             traceback.print_exc()
             return {"success": False, "message": str(e)}
 
-    def generate_keyframes_from_moments(self, video_path, key_moments, max_frames=48):
+    def generate_keyframes_from_moments(self, video_path, key_moments, max_frames=32):
         try:
             cap = cv2.VideoCapture(video_path)
             if not cap.isOpened(): raise Exception("Cannot open video for keyframe extraction")
@@ -414,14 +416,16 @@ class EnhancedComicGenerator:
             with open('test1.srt', 'r', encoding='utf-8') as f:
                 all_subs = list(srt.parse(f.read()))
             key_moments = [{'index': s.index, 'text': s.content, 'start': s.start.total_seconds(), 'end': s.end.total_seconds()} for s in all_subs]
-            if not self.generate_keyframes_from_moments(self.video_path, key_moments, max_frames=48):
+            # <<< MODIFICATION START: Reduced default max_frames for speed >>>
+            if not self.generate_keyframes_from_moments(self.video_path, key_moments, max_frames=32):
+            # <<< MODIFICATION END >>>
                 raise Exception("Keyframe extraction failed.")
             update_status("Cropping black bars...", 45)
             black_x, black_y, _, _ = black_bar_crop()
-            update_status("Enhancing images...", 50)
+            update_status("Enhancing images (in parallel)...", 50)
             self._enhance_all_images()
             self._enhance_quality_colors()
-            update_status("Placing speech bubbles...", 75)
+            update_status("Placing speech bubbles (in parallel)...", 75)
             bubbles = self._create_ai_bubbles_from_moments(black_x, black_y)
             update_status("Assembling comic pages...", 90)
             pages = self._generate_pages(bubbles)
@@ -437,61 +441,61 @@ class EnhancedComicGenerator:
             update_status(f"Error: {e}", -1)
             return False
 
-    # <<< MODIFICATION START: Made enhancement functions process single files efficiently >>>
+    # <<< MODIFICATION START: Parallelized enhancement functions for speed >>>
     def _enhance_all_images(self, single_image_path=None):
-        """Enhances images. If single_image_path is provided, only enhances that file."""
         try:
             enhancer = SimpleColorEnhancer()
-            if single_image_path and os.path.exists(single_image_path):
-                # Assumes the enhancer class has a method for single images.
-                # If it doesn't, this will gracefully fail or you can implement a fallback.
+            if single_image_path:
                 enhancer.enhance_single(single_image_path)
-            elif not single_image_path:
-                enhancer.enhance_batch(self.frames_dir)
+            else:
+                frame_paths = [os.path.join(self.frames_dir, f) for f in os.listdir(self.frames_dir) if f.endswith('.png')]
+                with ThreadPoolExecutor() as executor:
+                    list(executor.map(enhancer.enhance_single, frame_paths))
         except Exception as e:
-            print(f"❌ Simple enhancement failed: {e}. Falling back to batch processing.")
-            # Fallback for safety if enhance_single doesn't exist
-            try:
-                SimpleColorEnhancer().enhance_batch(self.frames_dir)
-            except Exception as e2:
-                 print(f"❌ Fallback simple enhancement also failed: {e2}")
+            print(f"❌ Simple enhancement failed: {e}")
 
     def _enhance_quality_colors(self, single_image_path=None):
-        """Enhances images with a quality model. If single_image_path is provided, only enhances that file."""
         try:
             enhancer = QualityColorEnhancer()
-            if single_image_path and os.path.exists(single_image_path):
-                # Assumes the enhancer class has a method for single images.
+            if single_image_path:
                 enhancer.enhance_single(single_image_path)
-            elif not single_image_path:
-                enhancer.batch_enhance(self.frames_dir)
+            else:
+                frame_paths = [os.path.join(self.frames_dir, f) for f in os.listdir(self.frames_dir) if f.endswith('.png')]
+                with ThreadPoolExecutor() as executor:
+                    list(executor.map(enhancer.enhance_single, frame_paths))
         except Exception as e:
-            print(f"⚠️ Quality enhancement failed: {e}. Falling back to batch processing.")
-            # Fallback for safety if enhance_single doesn't exist
-            try:
-                QualityColorEnhancer().batch_enhance(self.frames_dir)
-            except Exception as e2:
-                print(f"⚠️ Fallback quality enhancement also failed: {e2}")
+            print(f"⚠️ Quality enhancement failed: {e}")
     # <<< MODIFICATION END >>>
 
+    # <<< MODIFICATION START: Parallelized bubble placement for speed >>>
+    def _process_bubble_for_frame(self, frame_file):
+        """Helper function to process a single frame for bubble placement."""
+        frame_path = os.path.join(self.frames_dir, frame_file)
+        dialogue = self.frame_metadata.get(frame_file, {}).get('dialogue', "")
+        try:
+            faces = face_detector.detect_faces(frame_path)
+            lip_x, lip_y = face_detector.get_lip_position(frame_path, faces[0]) if faces else (-1, -1)
+            bubble_x, bubble_y = ai_bubble_placer.place_bubble_ai(frame_path, (lip_x, lip_y))
+            return bubble(bubble_offset_x=bubble_x, bubble_offset_y=bubble_y, lip_x=lip_x, lip_y=lip_y, dialog=dialogue, emotion='normal')
+        except Exception as e:
+            print(f"-> Could not place bubble for {frame_file}: {e}. Using default.")
+            return bubble(bubble_offset_x=50, bubble_offset_y=20, lip_x=-1, lip_y=-1, dialog=dialogue, emotion='normal')
+
     def _create_ai_bubbles_from_moments(self, black_x, black_y):
-        bubbles, frame_files = [], sorted([f for f in os.listdir(self.frames_dir) if f.endswith('.png')])
+        frame_files = sorted([f for f in os.listdir(self.frames_dir) if f.endswith('.png')])
         metadata_path = 'frames/frame_metadata.json'
-        if not os.path.exists(metadata_path): return [bubble(dialog="") for _ in frame_files]
-        with open(metadata_path, 'r') as f: frame_metadata = json.load(f)
-        for i, frame_file in enumerate(frame_files):
-            update_status(f"Placing bubble {i+1}/{len(frame_files)}...", 75 + int(15 * (i / len(frame_files))))
-            frame_path = os.path.join(self.frames_dir, frame_file)
-            dialogue = frame_metadata.get(frame_file, {}).get('dialogue', "")
-            try:
-                faces = face_detector.detect_faces(frame_path)
-                lip_x, lip_y = face_detector.get_lip_position(frame_path, faces[0]) if faces else (-1, -1)
-                bubble_x, bubble_y = ai_bubble_placer.place_bubble_ai(frame_path, (lip_x, lip_y))
-                bubbles.append(bubble(bubble_offset_x=bubble_x, bubble_offset_y=bubble_y, lip_x=lip_x, lip_y=lip_y, dialog=dialogue, emotion='normal'))
-            except Exception as e:
-                print(f"-> Could not place bubble for {frame_file}: {e}. Using default.")
-                bubbles.append(bubble(bubble_offset_x=50, bubble_offset_y=20, lip_x=-1, lip_y=-1, dialog=dialogue, emotion='normal'))
+        if not os.path.exists(metadata_path):
+            return [bubble(dialog="") for _ in frame_files]
+
+        with open(metadata_path, 'r') as f:
+            self.frame_metadata = json.load(f)
+
+        with ThreadPoolExecutor() as executor:
+            # Map the processing function to each frame file and collect results
+            bubbles = list(executor.map(self._process_bubble_for_frame, frame_files))
+
         return bubbles
+    # <<< MODIFICATION END >>>
 
     def _generate_pages(self, bubbles):
         try:
@@ -550,40 +554,37 @@ class EnhancedComicGenerator:
         .speech-bubble.selected { outline: 2px dashed #4CAF50; }
         .speech-bubble textarea { position: absolute; top: 0; left: 0; width: 100%; height: 100%; box-sizing: border-box; border: 1px solid #4CAF50; background: rgba(255,255,255,0.95); font: inherit; text-align: center; resize: none; padding: 8px; z-index: 102; }
         
-        /* <<< MODIFICATION START: New CSS for 'speech' bubble type >>> */
+        /* <<< MODIFICATION START: New CSS for 'speech' bubble with curvy tail >>> */
         .speech-bubble.speech {
-            color: #fff;
-            font-size: 16px;
-            text-align: center;
-            padding: 1em;
-            /* Remove standard border/background to allow gradient to show */
-            border: none;
-            background: none;
-            border-radius: 0;
-            /* Gradient background applied via border-image */
-            border-image: fill 0 linear-gradient(30deg, #4ECDC4, #6A4A3C);
+            /* Use a CSS variable for dynamic color changes from JS */
+            background-color: var(--bubble-fill-color, white);
+            border: 2px solid #333;
+            color: #333;
+            border-radius: 15px;
         }
 
-        /* Generic tail for all bubbles */
-        .speech-bubble::after, .speech-bubble.idea::after { content: ''; position: absolute; width: 0; height: 0; border-left: 10px solid transparent; border-right: 10px solid transparent; }
-        
-        /* Specific tail for the new 'speech' bubble style */
         .speech-bubble.speech::after {
-            border-top: 20px solid #6A4A3C; /* Long tail, color matches one end of the gradient */
+            content: '';
+            position: absolute;
+            width: 20px;
+            height: 20px;
+            background: var(--bubble-fill-color, white);
+            border-right: 2px solid #333;
+            border-bottom: 2px solid #333;
+            /* The combination of rotate and border-radius creates the curve */
         }
         
-        /* 4-WAY TAIL POSITIONING CLASSES for .speech bubbles */
-        .speech-bubble.speech.tail-bl::after { bottom: -19px; left: 20px; transform: rotate(0deg); }
-        .speech-bubble.speech.tail-br::after { bottom: -19px; right: 20px; transform: rotate(0deg); }
-        .speech-bubble.speech.tail-tr::after { top: -19px; right: 20px; transform: rotate(180deg); }
-        .speech-bubble.speech.tail-tl::after { top: -19px; left: 20px; transform: rotate(180deg); }
+        /* 4-WAY CURVY TAIL POSITIONING */
+        .speech-bubble.speech.tail-bl::after { bottom: -11px; left: 30px; transform: rotate(45deg); border-radius: 0 0 12px 0; border-left: none; border-top: none;}
+        .speech-bubble.speech.tail-br::after { bottom: -11px; right: 30px; transform: rotate(135deg); border-radius: 0 0 12px 0; border-left: none; border-top: none;}
+        .speech-bubble.speech.tail-tr::after { top: -11px; right: 30px; transform: rotate(225deg); border-radius: 0 0 12px 0; border-left: none; border-top: none;}
+        .speech-bubble.speech.tail-tl::after { top: -11px; left: 30px; transform: rotate(315deg); border-radius: 0 0 12px 0; border-left: none; border-top: none;}
         /* <<< MODIFICATION END >>> */
 
         .speech-bubble.thought { background: white; border: 2px dashed #555; color: #333; border-radius: 50%; }
         .speech-bubble.reaction { background: #FFD700; border: 3px solid #E53935; color: #D32F2F; font-weight: 900; text-transform: uppercase; width: 180px; 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: #FAFAFA; border: 2px solid #BDBDBD; color: #424242; border-radius: 3px; }
         .speech-bubble.idea { background: linear-gradient(180deg,#FFFDD0 0%, #FFF8B5 100%); border: 2px solid #FFA500; color: #6a4b00; border-radius: 40% 60% 40% 60% / 60% 40% 60% 40%; }
-        .speech-bubble.idea::after { border-top: 10px solid #FFA500; bottom: -9px; left: 20px; }
         
         .speech-bubble.thought::after { display: none; }
         .thought-dot { position: absolute; background-color: white; border: 2px solid #555; border-radius: 50%; z-index: -1; }
@@ -731,14 +732,15 @@ class EnhancedComicGenerator:
             document.getElementById('bubble-text-color').addEventListener('input', (e) => {
                 if(currentlySelectedBubble) currentlySelectedBubble.style.color = e.target.value;
             });
+            // <<< MODIFICATION START: Re-enabled fill color picker for all bubble types >>>
             document.getElementById('bubble-fill-color').addEventListener('input', (e) => {
                 if(currentlySelectedBubble) {
-                     // The new speech bubble uses a gradient, so standard fill color is disabled for it.
-                    if (currentlySelectedBubble.dataset.type !== 'speech') {
-                        currentlySelectedBubble.style.backgroundColor = e.target.value;
-                    }
+                    // This now works for all bubbles, including the new 'speech' one.
+                    // We use a CSS variable to color the bubble and its pseudo-element tail.
+                    currentlySelectedBubble.style.setProperty('--bubble-fill-color', e.target.value);
                 }
             });
+            // <<< MODIFICATION END >>>
 
             document.addEventListener('mousemove', e => { if (isPanning) panImage(e); if (draggedBubble) drag(e); if(isResizing) resizeBubble(e); });
             document.addEventListener('mouseup', e => { if (isPanning) stopPan(e); if (draggedBubble) stopDrag(e); if(isResizing) stopResize(e);});
@@ -783,7 +785,6 @@ class EnhancedComicGenerator:
 
         function applyBubbleType(bubble, type) {
             bubble.querySelectorAll('.thought-dot').forEach(el => el.remove());
-            // Preserve essential classes
             let classesToKeep = 'speech-bubble';
             if (bubble.classList.contains('selected')) classesToKeep += ' selected';
             
@@ -792,7 +793,6 @@ class EnhancedComicGenerator:
             bubble.dataset.type = type;
 
             if (type === 'speech') {
-                 // Set initial tail position for speech bubbles
                 bubble.classList.add('tail-bl');
                 bubble.dataset.tailPos = '0';
             }
@@ -815,10 +815,8 @@ class EnhancedComicGenerator:
             currentlySelectedBubble.style.fontFamily = font;
         }
         
-        // <<< MODIFICATION START: Rewritten 4-way tail rotation function >>>
         function rotateBubbleTail() {
             if (!currentlySelectedBubble) { alert("Please select a bubble first."); return; }
-            // This function now only works for the 'speech' type which has the new tail logic
             if (currentlySelectedBubble.dataset.type !== 'speech') {
                 alert("Tail rotation is only available for the 'Speech' bubble type.");
                 return;
@@ -826,18 +824,11 @@ class EnhancedComicGenerator:
 
             const positions = ['tail-bl', 'tail-br', 'tail-tr', 'tail-tl'];
             let currentPos = parseInt(currentlySelectedBubble.dataset.tailPos || 0);
-
-            // Remove current position class
             currentlySelectedBubble.classList.remove(positions[currentPos]);
-
-            // Get next position, cycling back to 0
             let nextPos = (currentPos + 1) % positions.length;
-
-            // Add new position class and update data attribute
             currentlySelectedBubble.classList.add(positions[nextPos]);
             currentlySelectedBubble.dataset.tailPos = nextPos;
         }
-        // <<< MODIFICATION END >>>
         
         function selectPanel(panel) {
             document.querySelectorAll('.panel.selected').forEach(p => p.classList.remove('selected'));
@@ -859,13 +850,13 @@ class EnhancedComicGenerator:
                 const styles = window.getComputedStyle(currentlySelectedBubble);
                 document.getElementById('bubble-text-color').value = rgbToHex(styles.color);
                 
+                // <<< MODIFICATION START: Updated color picker logic >>>
                 const fillColorPicker = document.getElementById('bubble-fill-color');
-                if (currentlySelectedBubble.dataset.type === 'speech') {
-                    fillColorPicker.disabled = true; // Disable fill for gradient bubble
-                } else {
-                    fillColorPicker.disabled = false;
-                    fillColorPicker.value = rgbToHex(styles.backgroundColor);
-                }
+                fillColorPicker.disabled = false; // Always enabled
+                // Read the value from the CSS variable if it exists, otherwise from the computed style
+                const currentFill = styles.getPropertyValue('--bubble-fill-color').trim();
+                fillColorPicker.value = currentFill ? currentFill : rgbToHex(styles.backgroundColor);
+                // <<< MODIFICATION END >>>
 
                 document.getElementById('bubble-type-select').value = currentlySelectedBubble.dataset.type || 'speech';
                 document.getElementById('font-select').value = styles.fontFamily.split(',')[0].replace(/"/g, "").replace(/'/g, "").trim();