Update app.py

app.py

@@ -370,7 +370,7 @@ class NovelDatabase:
     
     @staticmethod
     def get_all_writer_content(session_id: str, test_mode: bool = False) -> str:
-        """모든 작가의 수정본 내용을 가져와서 합치기 - 테스트 모드에서는 writer1 + writer10"""
+        """모든 작가의 수정본 내용을 가져와서 합치기"""
         with NovelDatabase.get_db() as conn:
             cursor = conn.cursor()
             
@@ -380,12 +380,14 @@ class NovelDatabase:
             
             if test_mode:
                 # 테스트 모드: writer1 revision + writer10 content
-                # Writer 1 수정본
+                # Writer 1 수정본 - 언어 무관
                 cursor.execute('''
                     SELECT content, stage_name, word_count FROM stages 
-                    WHERE session_id = ? AND role = 'writer1' AND stage_name LIKE '%Revision%'
+                    WHERE session_id = ? AND role = 'writer1' 
+                    AND (stage_name LIKE '%Revision%' OR stage_name LIKE '%수정본%')
                 ''', (session_id,))
                 
+                
                 row = cursor.fetchone()
                 if row and row['content']:
                     clean_content = re.sub(r'\[(?:페이지|Page|page)\s*\d+\]', '', row['content'])
@@ -1986,20 +1988,27 @@ def download_novel(novel_text: str, format: str, language: str, session_id: str
         logger.error(f"Session not found: {session_id}")
         return None
     
+    # 세션의 실제 언어 사용 (파라미터로 받은 language 대신)
+    actual_language = session['language']
+    logger.info(f"Using session language: {actual_language} (parameter was: {language})")
+    
     # DB에서 모든 스테이지 가져오기
     stages = NovelDatabase.get_stages(session_id)
     logger.info(f"Found {len(stages)} stages in database")
     
     # 디버깅: 모든 stage 정보 출력
-    for stage in stages:
-        logger.debug(f"Stage: role={stage.get('role')}, stage_name={stage.get('stage_name')}, "
-                    f"content_length={len(stage.get('content', ''))}, status={stage.get('status')}")
+    for i, stage in enumerate(stages):
+        role = stage['role'] if 'role' in stage.keys() else 'None'
+        stage_name = stage['stage_name'] if 'stage_name' in stage.keys() else 'None'
+        content_len = len(stage['content']) if 'content' in stage.keys() and stage['content'] else 0
+        status = stage['status'] if 'status' in stage.keys() else 'None'
+        logger.debug(f"Stage {i}: role={role}, stage_name={stage_name}, content_length={content_len}, status={status}")
     
     # 테스트 모드 감지 - writer10이 있으면 테스트 모드
     is_test_mode = False
-    has_writer10 = any(stage['role'] == 'writer10' for stage in stages)
-    has_writer1 = any(stage['role'] == 'writer1' for stage in stages)
-    has_writer3 = any(stage['role'] == 'writer3' for stage in stages)
+    has_writer10 = any(stage['role'] == 'writer10' for stage in stages if 'role' in stage.keys())
+    has_writer1 = any(stage['role'] == 'writer1' for stage in stages if 'role' in stage.keys())
+    has_writer3 = any(stage['role'] == 'writer3' for stage in stages if 'role' in stage.keys())
     
     if has_writer10 and has_writer1 and not has_writer3:
         is_test_mode = True
@@ -2045,17 +2054,20 @@ def download_novel(novel_text: str, format: str, language: str, session_id: str
         if is_test_mode:
             # 테스트 모드: writer1 revision + writer10 내용 처리
             for stage in stages:
-                logger.info(f"[TEST MODE] Checking stage: role={stage['role']}, name={stage['stage_name']}, status={stage['status']}")
+                role = stage['role'] if 'role' in stage.keys() else None
+                stage_name = stage['stage_name'] if 'stage_name' in stage.keys() else ''
+                content = stage['content'] if 'content' in stage.keys() else ''
+                
+                logger.info(f"[TEST MODE] Checking stage: role={role}, name={stage_name}, status={stage['status'] if 'status' in stage.keys() else 'None'}")
                 
                 # Writer 1 수정본
-                if stage['role'] == 'writer1' and stage['stage_name'] and ('Revision' in stage['stage_name'] or '수정본' in stage['stage_name']):
-                    content = stage['content'] or ""
+                if role == 'writer1' and stage_name and ('Revision' in stage_name or '수정본' in stage_name):
                     content = re.sub(r'\[(?:페이지|Page|page)\s*\d+\]', '', content)
                     content = re.sub(r'(?:페이지|Page)\s*\d+:', '', content)
                     content = content.strip()
                     
                     if content:
-                        word_count = stage['word_count'] or len(content.split())
+                        word_count = stage['word_count'] if 'word_count' in stage.keys() else len(content.split())
                         total_words += word_count
                         writer_contents.append({
                             'writer_num': 1,
@@ -2066,8 +2078,7 @@ def download_novel(novel_text: str, format: str, language: str, session_id: str
                         logger.info(f"Added writer 1 (Chapter 1): {word_count} words")
                 
                 # Writer 10 (테스트 모드에서 나머지 챕터들)
-                elif stage['role'] == 'writer10':
-                    content = stage['content'] or ""
+                elif role == 'writer10':
                     logger.info(f"Processing writer10 content: {len(content)} chars")
                     
                     # [Chapter X] 패턴으로 챕터 분리
@@ -2094,34 +2105,37 @@ def download_novel(novel_text: str, format: str, language: str, session_id: str
             logger.info("[NORMAL MODE] Processing all writer revisions...")
             
             for stage in stages:
-                logger.info(f"[NORMAL MODE] Checking stage: role={stage['role']}, name={stage['stage_name']}, status={stage['status']}")
+                role = stage['role'] if 'role' in stage.keys() else None
+                stage_name = stage['stage_name'] if 'stage_name' in stage.keys() else ''
+                content = stage['content'] if 'content' in stage.keys() else ''
+                status = stage['status'] if 'status' in stage.keys() else ''
+                
+                # 디버깅 정보
+                logger.debug(f"[NORMAL MODE] Checking: role={role}, name={stage_name}, status={status}, content_len={len(content)}")
                 
                 # 언어에 상관없이 작가 수정본 찾기
-                is_revision = (stage['role'] and stage['role'].startswith('writer') and 
-                             stage['stage_name'] and 
-                             ('Revision' in stage['stage_name'] or '수정본' in stage['stage_name']))
+                is_writer = role and role.startswith('writer')
+                is_revision = stage_name and ('Revision' in stage_name or '수정본' in stage_name)
                 
-                if is_revision:
+                if is_writer and is_revision:
                     # 작가 번호 추출
                     try:
-                        writer_num = int(stage['role'].replace('writer', ''))
-                        logger.info(f"Found writer {writer_num} revision - stage_name: {stage['stage_name']}")
+                        writer_num = int(role.replace('writer', ''))
+                        logger.info(f"Found writer {writer_num} revision - stage_name: {stage_name}")
                     except:
-                        logger.warning(f"Could not extract writer number from role: {stage['role']}")
+                        logger.warning(f"Could not extract writer number from role: {role}")
                         continue
                     
-                    content = stage['content'] or ""
-                    
                     # 페이지 마크 제거
                     content = re.sub(r'\[(?:페이지|Page|page)\s*\d+\]', '', content)
                     content = re.sub(r'(?:페이지|Page)\s*\d+:', '', content)
                     content = content.strip()
                     
                     if content:
-                        word_count = stage['word_count'] or len(content.split())
+                        word_count = stage['word_count'] if 'word_count' in stage.keys() else len(content.split())
                         total_words += word_count
                         writer_contents.append({
-                            'writer_num': writer_num,  # ✅ 올바른 작가 번호 사용!
+                            'writer_num': writer_num,
                             'content': content,
                             'word_count': word_count
                         })
@@ -2139,7 +2153,7 @@ def download_novel(novel_text: str, format: str, language: str, session_id: str
         doc.add_paragraph(f'Total Chapters: {writer_count}')
         doc.add_paragraph(f'Total Words: {total_words:,}')
         doc.add_paragraph(f'Estimated Pages: ~{total_words/500:.0f}')
-        doc.add_paragraph(f'Language: {session["language"]}')
+        doc.add_paragraph(f'Language: {actual_language}')
         doc.add_page_break()
         
         # 목차
@@ -2210,7 +2224,7 @@ def download_novel(novel_text: str, format: str, language: str, session_id: str
             f.write(f"AI COLLABORATIVE NOVEL - {'TEST MODE' if is_test_mode else 'COMPLETE VERSION'}\n")
             f.write("="*60 + "\n")
             f.write(f"Theme: {session['user_query']}\n")
-            f.write(f"Language: {session['language']}\n")
+            f.write(f"Language: {actual_language}\n")
             f.write(f"Created: {datetime.now()}\n")
             f.write(f"Mode: {'Test Mode (Actual chapters)' if is_test_mode else 'Full Mode (10 chapters)'}\n")
             f.write("="*60 + "\n\n")
@@ -2221,15 +2235,18 @@ def download_novel(novel_text: str, format: str, language: str, session_id: str
             if is_test_mode:
                 # 테스트 모드: writer1 + writer10 처리
                 for stage in stages:
+                    role = stage['role'] if 'role' in stage.keys() else None
+                    stage_name = stage['stage_name'] if 'stage_name' in stage.keys() else ''
+                    content = stage['content'] if 'content' in stage.keys() else ''
+                    
                     # Writer 1 수정본
-                    if stage['role'] == 'writer1' and stage['stage_name'] and ('Revision' in stage['stage_name'] or '수정본' in stage['stage_name']):
-                        content = stage['content'] or ""
+                    if role == 'writer1' and stage_name and ('Revision' in stage_name or '수정본' in stage_name):
                         content = re.sub(r'\[(?:페이지|Page|page)\s*\d+\]', '', content)
                         content = re.sub(r'(?:페이지|Page)\s*\d+:', '', content)
                         content = content.strip()
                         
                         if content:
-                            word_count = stage['word_count'] or len(content.split())
+                            word_count = stage['word_count'] if 'word_count' in stage.keys() else len(content.split())
                             total_words += word_count
                             writer_count = 1
                             
@@ -2241,9 +2258,7 @@ def download_novel(novel_text: str, format: str, language: str, session_id: str
                             f.write("\n\n")
                     
                     # Writer 10
-                    elif stage['role'] == 'writer10':
-                        content = stage['content'] or ""
-                        
+                    elif role == 'writer10':
                         # [Chapter X] 패턴으로 챕터 분리
                         chapters = re.split(r'\[Chapter\s+(\d+)\]', content)
                         
@@ -2266,26 +2281,28 @@ def download_novel(novel_text: str, format: str, language: str, session_id: str
             else:
                 # 일반 모드 - 수정된 로직
                 for stage in stages:
+                    role = stage['role'] if 'role' in stage.keys() else None
+                    stage_name = stage['stage_name'] if 'stage_name' in stage.keys() else ''
+                    content = stage['content'] if 'content' in stage.keys() else ''
+                    
                     # 언어에 상관없이 작가 수정본 찾기
-                    is_revision = (stage['role'] and stage['role'].startswith('writer') and 
-                                 stage['stage_name'] and 
-                                 ('Revision' in stage['stage_name'] or '수정본' in stage['stage_name']))
+                    is_writer = role and role.startswith('writer')
+                    is_revision = stage_name and ('Revision' in stage_name or '수정본' in stage_name)
                     
-                    if is_revision:
+                    if is_writer and is_revision:
                         # 작가 번호 추출
                         try:
-                            writer_num = int(stage['role'].replace('writer', ''))
+                            writer_num = int(role.replace('writer', ''))
                         except:
                             continue
                         
-                        content = stage['content'] or ""
                         # 페이지 마크 제거
                         content = re.sub(r'\[(?:페이지|Page|page)\s*\d+\]', '', content)
                         content = re.sub(r'(?:페이지|Page)\s*\d+:', '', content)
                         content = content.strip()
                         
                         if content:
-                            word_count = stage['word_count'] or len(content.split())
+                            word_count = stage['word_count'] if 'word_count' in stage.keys() else len(content.split())
                             total_words += word_count
                             writer_count += 1