Update app-backup.py

app-backup.py

@@ -1957,16 +1957,21 @@ def create_interface():
             logger.info(f"Successfully applied storyboard with {len(panel_data)} panels")
             return panel_data, html, gr.update(visible=True, choices=panel_choices, value=[]), gr.update(visible=True, value=edited_text), panel_prompts
         
+# 주요 수정 부분만 포함한 패치 코드
+        # generate_selected_panel_images 함수 수정
         def generate_selected_panel_images(panel_data, selected_panels, session_id, character_profiles, webtoon_system, panel_prompts, genre, progress=gr.Progress()):
-            """Generate images for selected panels only"""
+            """Generate images for selected panels only - 수정된 버전"""
             if not REPLICATE_API_TOKEN:
-                return display_panels_with_editable_prompts(panel_data, panel_prompts, session_id, character_profiles, webtoon_system, genre)[0], gr.update(visible=True, value="⚠️ Replicate API 토큰이 설정되지 않았습니다.")
+                html, _ = display_panels_with_editable_prompts(panel_data, panel_prompts, session_id, character_profiles, webtoon_system, genre)
+                return panel_data, html, gr.update(visible=True, value="⚠️ Replicate API 토큰이 설정되지 않았습니다.")
             
             if not panel_data:
-                return display_panels_with_editable_prompts(panel_data, panel_prompts, session_id, character_profiles, webtoon_system, genre)[0], gr.update(visible=True, value="⚠️ 패널 데이터가 없습니다.")
+                html, _ = display_panels_with_editable_prompts(panel_data, panel_prompts, session_id, character_profiles, webtoon_system, genre)
+                return panel_data, html, gr.update(visible=True, value="⚠️ 패널 데이터가 없습니다.")
             
             if not selected_panels:
-                return display_panels_with_editable_prompts(panel_data, panel_prompts, session_id, character_profiles, webtoon_system, genre)[0], gr.update(visible=True, value="⚠️ 생성할 패널을 선택하세요.")
+                html, _ = display_panels_with_editable_prompts(panel_data, panel_prompts, session_id, character_profiles, webtoon_system, genre)
+                return panel_data, html, gr.update(visible=True, value="⚠️ 생성할 패널을 선택하세요.")
             
             if not webtoon_system:
                 webtoon_system = WebtoonSystem()
@@ -1976,7 +1981,10 @@ def create_interface():
             total = len(selected_numbers)
             successful = 0
             
-            for i, panel in enumerate(panel_data):
+            # panel_data를 복사하여 작업 (원본 보존)
+            updated_panel_data = panel_data.copy()
+            
+            for i, panel in enumerate(updated_panel_data):
                 if panel['number'] in selected_numbers:
                     idx = selected_numbers.index(panel['number'])
                     progress((idx / total), desc=f"패널 {panel['number']} 생성 중...")
@@ -2010,25 +2018,32 @@ def create_interface():
                         time.sleep(0.5)
             
             progress(1.0, desc=f"완료! {successful}/{total} 패널 생성 성공")
-            return display_panels_with_editable_prompts(panel_data, panel_prompts, session_id, character_profiles, webtoon_system, genre)[0], gr.update(visible=False)
-        
+            html, _ = display_panels_with_editable_prompts(updated_panel_data, panel_prompts, session_id, character_profiles, webtoon_system, genre)
+            return updated_panel_data, html, gr.update(visible=False)
+
+        # generate_all_panel_images 함수 수정
         def generate_all_panel_images(panel_data, session_id, character_profiles, webtoon_system, panel_prompts, genre, progress=gr.Progress()):
-            """Generate images for all panels"""
+            """Generate images for all panels - 수정된 버전"""
             if not REPLICATE_API_TOKEN:
-                return display_panels_with_editable_prompts(panel_data, panel_prompts, session_id, character_profiles, webtoon_system, genre)[0], gr.update(visible=True, value="⚠️ Replicate API 토큰이 설정되지 않았습니다.")
+                html, _ = display_panels_with_editable_prompts(panel_data, panel_prompts, session_id, character_profiles, webtoon_system, genre)
+                return panel_data, html, gr.update(visible=True, value="⚠️ Replicate API 토큰이 설정되지 않았습니다.")
             
             if not panel_data:
-                return display_panels_with_editable_prompts(panel_data, panel_prompts, session_id, character_profiles, webtoon_system, genre)[0], gr.update(visible=True, value="⚠️ 패널 데이터가 없습니다.")
+                html, _ = display_panels_with_editable_prompts(panel_data, panel_prompts, session_id, character_profiles, webtoon_system, genre)
+                return panel_data, html, gr.update(visible=True, value="⚠️ 패널 데이터가 없습니다.")
             
             if not webtoon_system:
                 webtoon_system = WebtoonSystem()
                 webtoon_system.current_genre = genre
             
-            total_panels = len(panel_data)
+            # panel_data를 복사하여 작업
+            updated_panel_data = panel_data.copy()
+            
+            total_panels = len(updated_panel_data)
             successful = 0
             failed = 0
             
-            for i, panel in enumerate(panel_data):
+            for i, panel in enumerate(updated_panel_data):
                 progress((i / total_panels), desc=f"패널 {panel['number']}/{total_panels} 생성 중...")
                 
                 panel_id = f"panel_{panel['number']}"
@@ -2063,12 +2078,118 @@ def create_interface():
                     time.sleep(0.5)
             
             progress(1.0, desc=f"완료! 성공: {successful}, 실패: {failed}")
-            return display_panels_with_editable_prompts(panel_data, panel_prompts, session_id, character_profiles, webtoon_system, genre)[0], gr.update(visible=False)
-        
+            html, _ = display_panels_with_editable_prompts(updated_panel_data, panel_prompts, session_id, character_profiles, webtoon_system, genre)
+            return updated_panel_data, html, gr.update(visible=False)
+
+        # clear_all_images 함수 수정
         def clear_all_images(panel_data, panel_prompts, session_id, character_profiles, webtoon_system, genre):
-            for panel in panel_data:
+            """Clear all images - 수정된 버전"""
+            # panel_data를 복사하여 수정
+            updated_panel_data = panel_data.copy()
+            for panel in updated_panel_data:
                 panel['image_url'] = None
-            return display_panels_with_editable_prompts(panel_data, panel_prompts, session_id, character_profiles, webtoon_system, genre)[0]
+            html, _ = display_panels_with_editable_prompts(updated_panel_data, panel_prompts, session_id, character_profiles, webtoon_system, genre)
+            return updated_panel_data, html
+
+        # download_all_panel_images 함수 수정
+        def download_all_panel_images(panel_data, session_id, genre):
+            """모든 패널 이미지를 ZIP 파일로 다운로드 - 수정된 버전"""
+            try:
+                logger.info(f"Starting image download - Panel data count: {len(panel_data) if panel_data else 0}")
+                
+                if not panel_data:
+                    logger.warning("No panel data available")
+                    return None
+                
+                # 이미지가 있는 패널만 필터링
+                panels_with_images = [p for p in panel_data if p.get('image_url')]
+                logger.info(f"Found {len(panels_with_images)} panels with images")
+                
+                if not panels_with_images:
+                    logger.warning("No images to download")
+                    return None
+                
+                # 임시 디렉토리 생성
+                with tempfile.TemporaryDirectory() as temp_dir:
+                    image_dir = Path(temp_dir) / "webtoon_images"
+                    image_dir.mkdir(exist_ok=True)
+                    
+                    # 각 이미지 저장
+                    saved_count = 0
+                    for panel in panels_with_images:
+                        panel_num = panel['number']
+                        image_url = panel['image_url']
+                        
+                        try:
+                            # base64 이미지 처리
+                            if image_url.startswith('data:image'):
+                                # data URL에서 base64 데이터 추출
+                                header, data = image_url.split(',', 1)
+                                image_data = base64.b64decode(data)
+                                
+                                # 파일로 저장
+                                image_path = image_dir / f"panel_{panel_num:03d}.jpg"
+                                with open(image_path, 'wb') as f:
+                                    f.write(image_data)
+                                saved_count += 1
+                            else:
+                                # URL에서 이미지 다운로드
+                                response = requests.get(image_url, timeout=30)
+                                response.raise_for_status()
+                                
+                                image_path = image_dir / f"panel_{panel_num:03d}.jpg"
+                                with open(image_path, 'wb') as f:
+                                    f.write(response.content)
+                                saved_count += 1
+                            
+                            logger.info(f"Saved panel {panel_num} image")
+                            
+                        except Exception as e:
+                            logger.error(f"Failed to save panel {panel_num}: {e}")
+                            continue
+                    
+                    logger.info(f"Successfully saved {saved_count} images")
+                    
+                    if saved_count == 0:
+                        logger.warning("No images were saved successfully")
+                        return None
+                    
+                    # 메타데이터 파일 생성
+                    metadata_path = image_dir / "metadata.txt"
+                    with open(metadata_path, 'w', encoding='utf-8') as f:
+                        f.write(f"웹툰 이미지 정보\n")
+                        f.write(f"{'=' * 50}\n")
+                        f.write(f"장르: {genre}\n")
+                        f.write(f"세션 ID: {session_id}\n")
+                        f.write(f"총 이미지 수: {saved_count}개\n")
+                        f.write(f"이미지 크기: {WEBTOON_IMAGE_WIDTH}×{WEBTOON_IMAGE_HEIGHT}px\n")
+                        f.write(f"생성 날짜: {datetime.now().strftime('%Y-%m-%d %H:%M:%S')}\n")
+                        f.write(f"{'=' * 50}\n\n")
+                        
+                        for panel in panels_with_images:
+                            f.write(f"패널 {panel['number']:03d}\n")
+                            f.write(f"  - 샷 타입: {panel.get('shot', 'N/A')}\n")
+                            f.write(f"  - 프롬프트: {panel.get('prompt', 'N/A')}\n")
+                            if panel.get('dialogue'):
+                                f.write(f"  - 대사: {panel['dialogue']}\n")
+                            if panel.get('narration'):
+                                f.write(f"  - 나레이션: {panel['narration']}\n")
+                            f.write("\n")
+                    
+                    # ZIP 파일 생성
+                    zip_path = Path(temp_dir) / f"webtoon_{genre}_episode1_images.zip"
+                    shutil.make_archive(str(zip_path.with_suffix('')), 'zip', image_dir)
+                    
+                    # 생성된 ZIP 파일을 임시 파일로 복사
+                    with tempfile.NamedTemporaryFile(suffix='.zip', delete=False) as final_zip:
+                        shutil.copy2(zip_path, final_zip.name)
+                        logger.info(f"Created ZIP file with {saved_count} images: {final_zip.name}")
+                        return final_zip.name
+                        
+            except Exception as e:
+                logger.error(f"Failed to create image ZIP: {e}", exc_info=True)
+                return None
+
         
         def handle_random_theme(genre, language):
             return generate_random_webtoon_theme(genre, language)
@@ -2158,8 +2279,10 @@ def create_interface():
             fn=lambda: gr.update(visible=True, value="편집 내용이 적용되었습니다."),
             outputs=[generation_progress]
         )
-        
-        # 선택한 패널 이미지 생성
+
+# create_interface 함수 내의 이벤트 핸들러 수정 부분
+
+# 선택한 패널 이미지 생성 - panel_data_state 업데이트 추가
         generate_selected_btn.click(
             fn=lambda pd: (pd, gr.update(visible=True, value="선택한 패널 이미지 생성 시작...")),
             inputs=[panel_data_state],
@@ -2167,10 +2290,10 @@ def create_interface():
         ).then(
             fn=generate_selected_panel_images,
             inputs=[panel_data_state, panel_selector, current_session_id, character_profiles_state, webtoon_system, panel_prompts_state, current_genre],
-            outputs=[panels_display, generation_progress]
+            outputs=[panel_data_state, panels_display, generation_progress]  # panel_data_state 출력 추가
         )
-        
-        # 모든 패널 이미지 생성
+
+# 모든 패널 이미지 생성 - panel_data_state 업데이트 추가
         generate_all_images_btn.click(
             fn=lambda pd: (pd, gr.update(visible=True, value="모든 패널 이미지 생성 시작...")),
             inputs=[panel_data_state],
@@ -2178,15 +2301,36 @@ def create_interface():
         ).then(
             fn=generate_all_panel_images,
             inputs=[panel_data_state, current_session_id, character_profiles_state, webtoon_system, panel_prompts_state, current_genre],
-            outputs=[panels_display, generation_progress]
+            outputs=[panel_data_state, panels_display, generation_progress]  # panel_data_state 출력 추가
         )
-        
-        # 이미지 초기화
+
+# 이미지 초기화 - panel_data_state 업데이트 추가
         clear_images_btn.click(
             fn=clear_all_images,
             inputs=[panel_data_state, panel_prompts_state, current_session_id, character_profiles_state, webtoon_system, current_genre],
-            outputs=[panels_display]
+            outputs=[panel_data_state, panels_display]  # panel_data_state 출력 추가
+        )
+
+# 전체 이미지 다운로드 - 수정된 메시지
+        download_all_images_btn.click(
+            fn=lambda pd, sid, genre: (
+                download_all_panel_images(pd, sid, genre),
+                gr.update(visible=True, value="이미지 ZIP 파일 생성 중...")
+            ),
+            inputs=[panel_data_state, current_session_id, current_genre],
+            outputs=[images_download_file, generation_progress]
+        ).then(
+            fn=lambda x: (
+                gr.update(visible=True, value=x) if x else gr.update(visible=False),
+                gr.update(
+                    visible=True, 
+                    value="✅ 이미지 다운로드 준비 완료!" if x else "⚠️ 다운로드할 이미지가 없습니다. 먼저 이미지를 생성하세요."
+                )
+            ),
+            inputs=[images_download_file],
+            outputs=[images_download_file, generation_progress]
         )
+
         
         # 랜덤 테마
         random_btn.click(
@@ -2216,24 +2360,7 @@ def create_interface():
             inputs=[storyboard_download_file],
             outputs=[storyboard_download_file]
         )
-        
-        # 전체 이미지 다운로드
-        download_all_images_btn.click(
-            fn=download_all_panel_images,
-            inputs=[panel_data_state, current_session_id, current_genre],
-            outputs=[images_download_file]
-        ).then(
-            fn=lambda x: gr.update(visible=True, value=x) if x else gr.update(visible=False),
-            inputs=[images_download_file],
-            outputs=[images_download_file]
-        ).then(
-            fn=lambda x: gr.update(
-                visible=True, 
-                value="✅ 이미지 다운로드 준비 완료!" if x else "⚠️ 다운로드할 이미지가 없습니다. 먼저 이미지를 생성하세요."
-            ),
-            inputs=[images_download_file],
-            outputs=[generation_progress]
-        )
+
 
     return interface