Update app.py

app.py

@@ -613,13 +613,20 @@ def display_historical_glossary_for_reporter(scenario_key, vocab_level):
         st.sidebar.markdown(f"**{term}:** {definition}")
     st.sidebar.markdown("---")
 
-# --- 세션 상태 초기화 ---
+# (상단 import 및 설정, 함수 정의 등은 기존 코드 유지)
+# ... (initialize_reporter_scenario_state, get_next_assignment, process_reporter_action, 
+#      generate_article_interface, evaluate_article_and_get_feedback_openai, 
+#      display_reporter_dashboard, display_reporter_notebook, 
+#      display_historical_glossary_for_reporter 등 함수 정의는 그대로 사용) ...
+
+# --- 세션 상태 초기화 (기존과 동일) ---
 if 'game_mode' not in st.session_state: st.session_state.game_mode = 'scenario_select'
 if 'current_scenario_key' not in st.session_state: st.session_state.current_scenario_key = None
 if 'game_state' not in st.session_state: st.session_state.game_state = None
 if 'current_assignment_data' not in st.session_state: st.session_state.current_assignment_data = None
 if 'actions_taken_this_turn' not in st.session_state: st.session_state.actions_taken_this_turn = 0
 if 'desk_feedback_message' not in st.session_state: st.session_state.desk_feedback_message = None
+if 'active_main_tab' not in st.session_state: st.session_state.active_main_tab = "취재 브리핑" # 기본 활성 탭
 
 # --- 메인 게임 로직 (기자 컨셉) ---
 def reporter_simulation_main():
@@ -630,6 +637,7 @@ def reporter_simulation_main():
 
     st.title(get_text_main("game_title"))
 
+    # --- 시나리오 선택 (기존과 동일) ---
     if st.session_state.game_mode == 'scenario_select':
         st.header(get_text_main("scenario_select_title"))
         scenario_descriptions = {
@@ -649,94 +657,161 @@ def reporter_simulation_main():
                     st.session_state.actions_taken_this_turn = 0
                     st.session_state.desk_feedback_message = None
                     st.session_state.game_mode = 'assignment_briefing'
+                    st.session_state.active_main_tab = "취재 브리핑" # 탭 초기화
                     st.rerun()
         st.stop()
 
+    # --- 게임 진행 ---
     if st.session_state.game_mode != 'scenario_select' and st.session_state.game_state:
         game_state = st.session_state.game_state
         scenario_key = st.session_state.current_scenario_key
         vocab_level = SCENARIOS[scenario_key]["vocab_level"]
         get_text_main = lambda key: get_text(key, vocab_level)
 
-        st.caption(f"취재 중: {SCENARIOS[scenario_key]['display_name']} | 기자: {game_state['player_role']}")
+        # --- 사이드바 구성 ---
+        with st.sidebar:
+            st.header(get_text_main("dashboard_title"))
+            st.caption(f"시나리오: {SCENARIOS[scenario_key]['display_name']}")
+            st.caption(f"역할: {game_state['player_role']}")
+            st.markdown(f"**{get_text_main('dashboard_term').format(year=game_state['game_year'], turn=game_state['current_turn'])}**")
+            display_reporter_dashboard(game_state) # 핵심 지표 표시
+            st.markdown("---")
+
+            if st.button(get_text_main("button_next_day"), use_container_width=True, key="next_day_button_sidebar",
+                         disabled=(st.session_state.game_mode == 'article_writing' or 
+                                   (st.session_state.game_mode == 'reporter_action' and 
+                                    st.session_state.actions_taken_this_turn < ACTIONS_PER_TURN_LIMIT and
+                                    st.session_state.current_assignment_data and 
+                                    len(st.session_state.current_assignment_data.get("options", [])) > 0 
+                                   ) # 아직 할 수 있는 액션이 남았거나 기사 작성 중이면 비활성화
+                                  )
+                        ):
+                current_turn = game_state['current_turn']
+                max_turns_for_scenario = SCENARIOS[scenario_key]['max_turns']
+
+                if current_turn >= max_turns_for_scenario or \
+                   (st.session_state.current_assignment_data and st.session_state.current_assignment_data.get("is_final_turn_event", False)):
+                    st.session_state.game_mode = 'assignment_over'
+                    if game_state.get('event_log') is not None:
+                        game_state['event_log'].append(get_text_main("log_assignment_over").format(scenario_name=SCENARIOS[scenario_key]['display_name']))
+                else:
+                    game_state['current_turn'] += 1
+                    if game_state.get('event_log') is not None:
+                        game_state['event_log'].append(get_text_main("log_next_day_start").format(year=game_state['game_year'], turn=game_state['current_turn']))
+                    st.session_state.game_mode = 'assignment_briefing'
+                
+                st.session_state.current_assignment_data = None
+                st.session_state.actions_taken_this_turn = 0
+                st.session_state.desk_feedback_message = None # 피드백 초기화
+                st.session_state.active_main_tab = "취재 브리핑" # 탭 초기화
+                st.rerun()
+            
+            st.markdown("---")
+            display_historical_glossary_for_reporter(scenario_key, vocab_level)
+            
+            st.subheader(get_text_main("sidebar_current_source_title"))
+            if st.session_state.current_assignment_data and st.session_state.current_assignment_data.get('source_text'):
+                st.sidebar.info(st.session_state.current_assignment_data.get('source_text'))
+            else:
+                st.sidebar.caption(get_text_main("sidebar_no_source"))
 
+            st.markdown("---")
+            if st.button(get_text_main("button_back_to_scenario_select") + " (다른 시대 취재)", use_container_width=True):
+                st.session_state.game_mode = 'scenario_select'
+                keys_to_clear = ['current_scenario_key', 'game_state', 'current_assignment_data', 'actions_taken_this_turn', 'desk_feedback_message', 'active_main_tab']
+                for k_to_clear in keys_to_clear:
+                    if k_to_clear in st.session_state: del st.session_state[k_to_clear]
+                st.rerun()
+
+        # --- 취재 기간 종료 처리 ---
         if st.session_state.game_mode == 'assignment_over':
             st.balloons()
             st.header(get_text_main("assignment_over_title"))
             st.subheader(get_text_main("assignment_over_subtitle"))
-            display_reporter_dashboard(game_state)
-
+            # 최종 대시보드는 사이드바에 이미 표시됨
+            
             st.subheader("송고한 주요 기사 목록")
             if game_state['submitted_articles']:
-                for article in game_state['submitted_articles']:
+                for article_idx, article in enumerate(game_state['submitted_articles']):
                     tone_text_key = f"article_tone_{article['tone']}"
                     tone_display_text = get_text_main(tone_text_key)
-                    st.markdown(f"- **{article['headline']}** (논조: {tone_display_text}) - {article['turn']}일차 송고 (AI 점수: {game_state['submitted_articles'][-1].get('ai_score', 'N/A')}점)") # 마지막 기사 점수 표시 (개선 필요)
+                    # AI 점수는 article 딕셔너리에 저장해야 함 (evaluate 함수에서)
+                    ai_score = article.get('ai_score', 'N/A') # 'ai_score' 키로 저장했다고 가정
+                    st.markdown(f"- **{article['headline']}** (논조: {tone_display_text}) - {article['turn']}일차 송고 (AI 점수: {ai_score}점)")
             else:
                 st.caption("이번 취재 기간 동안 송고한 기사가 없습니다.")
 
-            st.subheader(get_text_main("term_event_log"))
-            log_text = "\n".join(game_state.get('event_log', [])[::-1])
-            st.text_area(get_text_main("term_event_log"), log_text, height=250, disabled=True, key="final_log_reporter")
-
-            col_btn1, col_btn2 = st.columns(2)
-            with col_btn1:
-                if st.button(get_text_main("button_restart_assignment"), use_container_width=True):
-                    st.session_state.game_state = initialize_reporter_scenario_state(scenario_key)
-                    st.session_state.current_assignment_data = None
-                    st.session_state.actions_taken_this_turn = 0
-                    st.session_state.desk_feedback_message = None
-                    st.session_state.game_mode = 'assignment_briefing'
-                    st.rerun()
-            with col_btn2:
-                if st.button(get_text_main("button_back_to_scenario_select"), use_container_width=True):
-                    st.session_state.game_mode = 'scenario_select'
-                    keys_to_clear = ['current_scenario_key', 'game_state', 'current_assignment_data', 'actions_taken_this_turn', 'desk_feedback_message']
-                    for k_to_clear in keys_to_clear:
-                        if k_to_clear in st.session_state: del st.session_state[k_to_clear]
-                    st.rerun()
+            with st.expander(get_text_main("term_event_log"), expanded=False):
+                log_text = "\n".join(game_state.get('event_log', [])[::-1])
+                st.text_area("로그 내용", log_text, height=250, disabled=True, key="final_log_reporter_main")
+
+            if st.button(get_text_main("button_restart_assignment"), key="restart_assignment_main_btn"):
+                st.session_state.game_state = initialize_reporter_scenario_state(scenario_key)
+                st.session_state.current_assignment_data = None
+                st.session_state.actions_taken_this_turn = 0
+                st.session_state.desk_feedback_message = None
+                st.session_state.game_mode = 'assignment_briefing'
+                st.session_state.active_main_tab = "취재 브리핑"
+                st.rerun()
             st.stop()
 
-        col_dashboard, col_main_content, col_actions_notebook = st.columns([1.2, 1.8, 1.5])
 
-        with col_dashboard:
-            st.header(get_text_main("dashboard_title"))
-            st.markdown(f"**{get_text_main('dashboard_term').format(year=game_state['game_year'], turn=game_state['current_turn'])}**")
-            display_reporter_dashboard(game_state)
-            st.divider()
-            display_reporter_notebook(game_state, vocab_level)
-
-        with col_main_content:
-            if st.session_state.game_mode == 'assignment_briefing':
-                st.header(get_text_main("current_assignment_title"))
-                if st.session_state.current_assignment_data is None:
-                    spinner_text = get_text_main('status_loading_assignment').format(year=game_state['game_year'], turn=game_state['current_turn'])
-                    with st.spinner(spinner_text):
-                        time.sleep(0.5)
-                        assignment = get_next_assignment(scenario_key, game_state['current_turn'], game_state)
-                        if assignment:
-                            st.session_state.current_assignment_data = assignment
-                            st.session_state.actions_taken_this_turn = 0
-                            st.session_state.desk_feedback_message = None
-                            st.session_state.game_mode = 'reporter_action'
-                            st.rerun()
-                        else: # 모든 턴 종료
-                            st.session_state.game_mode = 'assignment_over'
-                            if game_state.get('event_log') is not None:
-                                game_state['event_log'].append(get_text_main("log_assignment_over").format(scenario_name=SCENARIOS[scenario_key]['display_name']))
-                            st.rerun()
+        # --- 메인 콘텐츠 영역 ---
+        # 탭 대신 단계별 UI 전환 또는 주요 정보만 표시하는 방식으로 변경 가능
+        # 여기서는 주요 정보를 먼저 표시하고, 액션은 버튼으로 유도
+
+        # 1. 오늘의 취재 지시 로드 (assignment_briefing 모드에서 처리)
+        if st.session_state.game_mode == 'assignment_briefing':
+            if st.session_state.current_assignment_data is None:
+                spinner_text = get_text_main('status_loading_assignment').format(year=game_state['game_year'], turn=game_state['current_turn'])
+                with st.spinner(spinner_text):
+                    time.sleep(0.5)
+                    assignment = get_next_assignment(scenario_key, game_state['current_turn'], game_state)
+                    if assignment:
+                        st.session_state.current_assignment_data = assignment
+                        st.session_state.actions_taken_this_turn = 0
+                        st.session_state.desk_feedback_message = None # 이전 피드백 초기화
+                        st.session_state.game_mode = 'reporter_action' # 바로 취재 활동으로
+                        st.session_state.active_main_tab = "취재 활동" # 탭 전환
+                        st.rerun()
+                    else:
+                        st.session_state.game_mode = 'assignment_over'
+                        if game_state.get('event_log') is not None:
+                            game_state['event_log'].append(get_text_main("log_assignment_over").format(scenario_name=SCENARIOS[scenario_key]['display_name']))
+                        st.rerun()
+        
+        # 메인 화면에 현재 취재 지시 표시
+        if st.session_state.current_assignment_data:
+            assignment_data = st.session_state.current_assignment_data
+            st.header(get_text_main("current_assignment_title"))
+            st.subheader(f"{assignment_data['assignment_text']}")
+            # 배경 정보는 사이드바로 이동했으므로 여기서는 생략 가능
+            st.markdown("---")
+
+        # 탭으로 주요 활동 구분
+        tab_titles = ["🎤 취재 활동"]
+        if st.session_state.current_assignment_data and st.session_state.current_assignment_data.get("article_writing_phase"):
+            tab_titles.append("🖋️ 기사 작성")
+        if st.session_state.desk_feedback_message:
+            tab_titles.append("📢 AI 편집장 평가")
+        
+        # 탭 상태 관리 (선택된 탭 유지)
+        if 'active_main_tab' not in st.session_state or st.session_state.active_main_tab not in tab_titles:
+            st.session_state.active_main_tab = tab_titles[0] # 기본값 또는 유효한 값으로 설정
+
+        # 현재 활성화된 탭을 selected_tab으로 사용
+        # selected_tab = st.radio("메인 활동 선택:", tab_titles, horizontal=True, key="main_activity_radio", index=tab_titles.index(st.session_state.active_main_tab))
+        # st.session_state.active_main_tab = selected_tab # 선택된 탭 업데이트
+        # radio 대신 st.tabs 사용
+        
+        tabs_ui = st.tabs(tab_titles)
 
+        with tabs_ui[0]: # 취재 활동 탭
+            # st.header(get_text_main("reporter_actions_title")) # 탭 이름으로 대체
             if st.session_state.game_mode == 'reporter_action' and st.session_state.current_assignment_data:
                 assignment_data = st.session_state.current_assignment_data
-                st.header(get_text_main("current_assignment_title"))
-                st.subheader(assignment_data['assignment_text'])
-                if assignment_data.get('source_text'):
-                    st.info(f"**{get_text_main('historical_source_title')}:** {assignment_data['source_text']}")
-                
-                st.divider()
-                st.subheader(get_text_main("reporter_actions_title"))
-                
                 if st.session_state.actions_taken_this_turn < ACTIONS_PER_TURN_LIMIT:
+                    st.write(f"남은 활동 횟수: {ACTIONS_PER_TURN_LIMIT - st.session_state.actions_taken_this_turn}")
                     for i, opt in enumerate(assignment_data['options']):
                         risk_info = []
                         if opt.get('cost_freedom_risk',0) > 0: risk_info.append(f"자유도↓{opt['cost_freedom_risk']}%")
@@ -746,89 +821,69 @@ def reporter_simulation_main():
                         
                         if st.button(button_label, key=f"rep_action_{game_state['current_turn']}_{i}_{scenario_key}", use_container_width=True):
                             process_reporter_action(opt, game_state)
+                            # 취재 활동 후 바로 기사 작성 탭으로 이동할지, 아니면 현재 탭 유지할지 결정 필요
+                            # 여기서는 현재 탭 유지하고, 모든 활동 끝나면 기사 작성 버튼 활성화
                             st.rerun()
                 else:
                     st.info(get_text_main("status_actions_taken"))
-                    if assignment_data.get("article_writing_phase"):
-                        if st.button(get_text_main("button_go_to_article_writing"), key="go_to_article_writing"):
-                            st.session_state.game_mode = 'article_writing'
-                            st.rerun()
+                    if assignment_data.get("article_writing_phase") and "🖋️ 기사 작성" in tab_titles:
+                        st.success("모든 취재 활동을 마쳤습니다. '기사 작성' 탭으로 이동하여 기사를 작성하세요.")
+                        # 자동으로 탭 이동은 어려우므로 사용자에게 안내
+                    elif not assignment_data.get("article_writing_phase"):
+                        st.success("오늘의 모든 취재 활동을 마쳤습니다. 사이드바에서 '다음 날로' 버튼을 눌러 진행하세요.")
 
-            if st.session_state.game_mode == 'article_writing' and st.session_state.current_assignment_data:
-                assignment_data = st.session_state.current_assignment_data
-                submitted_article = generate_article_interface(game_state, vocab_level)
-                if submitted_article:
-                    feedback = evaluate_article_and_get_feedback_openai(submitted_article, game_state, assignment_data)
-                    st.session_state.desk_feedback_message = feedback
-                    st.session_state.game_mode = 'reporter_action' # 피드백 표시 후 다음날로 넘어갈 수 있도록
-                    st.rerun()
-            
-            if st.session_state.desk_feedback_message and st.session_state.game_mode == 'reporter_action':
-                st.divider()
-                st.subheader(get_text_main("desk_feedback_title"))
-                st.warning(st.session_state.desk_feedback_message) # AI 피드백 표시
-
-        with col_actions_notebook: # 오른쪽 컬럼
-            st.header("활동 기록 및 다음 단계")
-            can_proceed_to_next_day = False
-            if st.session_state.game_mode == 'reporter_action' and st.session_state.current_assignment_data:
-                assignment_data = st.session_state.current_assignment_data
-                if st.session_state.actions_taken_this_turn >= ACTIONS_PER_TURN_LIMIT:
-                    if not assignment_data.get("article_writing_phase"): # 기사 작성 없는 턴
-                        can_proceed_to_next_day = True
-                    elif st.session_state.desk_feedback_message: # 기사 작성 후 피드백까지 받은 상태
-                         can_proceed_to_next_day = True
-            
-            if can_proceed_to_next_day:
-                if st.button(get_text_main("button_next_day"), use_container_width=True, key="next_day_button"):
-                    current_turn = game_state['current_turn']
-                    max_turns_for_scenario = SCENARIOS[scenario_key]['max_turns']
 
-                    if current_turn >= max_turns_for_scenario or st.session_state.current_assignment_data.get("is_final_turn_event", False):
-                        st.session_state.game_mode = 'assignment_over'
-                        if game_state.get('event_log') is not None:
-                            game_state['event_log'].append(get_text_main("log_assignment_over").format(scenario_name=SCENARIOS[scenario_key]['display_name']))
-                    else:
-                        game_state['current_turn'] += 1
-                        if game_state.get('event_log') is not None:
-                            game_state['event_log'].append(get_text_main("log_next_day_start").format(year=game_state['game_year'], turn=game_state['current_turn']))
-                        st.session_state.game_mode = 'assignment_briefing'
-                    
-                    st.session_state.current_assignment_data = None
-                    st.session_state.actions_taken_this_turn = 0
-                    # desk_feedback_message는 다음 턴 시작 시 assignment_briefing에서 초기화
-                    st.rerun()
-            
-            st.divider()
-            st.subheader(get_text_main("term_event_log"))
-            log_text = "\n".join(game_state.get('event_log', [])[::-1])
-            st.text_area(get_text_main("term_event_log"), log_text, height=300, disabled=True, key="event_log_area_reporter")
+            with st.expander("📝 나의 취재 노트 보기", expanded=False):
+                display_reporter_notebook(game_state, vocab_level)
 
-        with st.sidebar:
-            st.header(get_text_main("sidebar_title"))
-            display_historical_glossary_for_reporter(scenario_key, vocab_level)
-            
-            st.subheader(get_text_main("sidebar_current_source_title"))
-            if st.session_state.current_assignment_data and st.session_state.current_assignment_data.get('source_text'):
-                st.sidebar.info(st.session_state.current_assignment_data.get('source_text'))
-            else:
-                st.sidebar.caption(get_text_main("sidebar_no_source"))
 
-            st.divider()
-            if st.button(get_text_main("button_back_to_scenario_select") + " (다른 시대 취재)", use_container_width=True):
-                st.session_state.game_mode = 'scenario_select'
-                keys_to_clear = ['current_scenario_key', 'game_state', 'current_assignment_data', 'actions_taken_this_turn', 'desk_feedback_message']
-                for k_to_clear in keys_to_clear:
-                    if k_to_clear in st.session_state: del st.session_state[k_to_clear]
-                st.rerun()
+        if "🖋️ 기사 작성" in tab_titles:
+            with tabs_ui[tab_titles.index("🖋️ 기사 작성")]:
+                if st.session_state.game_mode in ['reporter_action', 'article_writing'] and \
+                   st.session_state.current_assignment_data and \
+                   st.session_state.current_assignment_data.get("article_writing_phase") and \
+                   st.session_state.actions_taken_this_turn >= ACTIONS_PER_TURN_LIMIT: # 모든 취재 활동을 마친 후
+                    
+                    # 기사 작성 중이 아니면, 작성 모드로 변경
+                    if st.session_state.game_mode != 'article_writing':
+                        st.session_state.game_mode = 'article_writing'
+                        # st.rerun() # generate_article_interface를 바로 호출하므로 rerun 불필요
+
+                    assignment_data = st.session_state.current_assignment_data
+                    submitted_article = generate_article_interface(game_state, vocab_level)
+                    if submitted_article:
+                        feedback = evaluate_article_and_get_feedback_openai(submitted_article, game_state, assignment_data)
+                        st.session_state.desk_feedback_message = feedback
+                        st.session_state.game_mode = 'reporter_action' # 피드백 표시 및 다음날로 진행 가능하도록
+                        st.session_state.active_main_tab = "📢 AI 편집장 평가" if "📢 AI 편집장 평가" in tab_titles else "🎤 취재 활동"
+                        st.rerun()
+                elif not (st.session_state.current_assignment_data and st.session_state.current_assignment_data.get("article_writing_phase")):
+                    st.info("이번 턴에는 기사 작성이 예정되어 있지 않습니다.")
+                elif st.session_state.actions_taken_this_turn < ACTIONS_PER_TURN_LIMIT:
+                    st.info(f"아직 오늘의 취재 활동이 남았습니다. (남은 활동: {ACTIONS_PER_TURN_LIMIT - st.session_state.actions_taken_this_turn}회)")
+
+
+        if "📢 AI 편집장 평가" in tab_titles:
+            with tabs_ui[tab_titles.index("📢 AI 편집장 평가")]:
+                if st.session_state.desk_feedback_message:
+                    st.subheader(get_text_main("desk_feedback_title"))
+                    st.warning(st.session_state.desk_feedback_message)
+                    st.info("평가를 확인했으면 사이드바에서 '다음 날로' 버튼을 눌러 진행하세요.")
+                else:
+                    st.info("아직 평가된 기사가 없습니다. 기사를 먼저 작성하고 송고해주세요.")
+        
+        st.markdown("---")
+        with st.expander(get_text_main("term_event_log") + " (최근 10개)", expanded=False):
+            log_text = "\n".join(game_state.get('event_log', [])[-10:][::-1]) # 최근 10개만 표시
+            st.text_area("로그 내용", log_text, height=200, disabled=True, key="event_log_area_reporter_main")
     
     elif st.session_state.game_mode != 'scenario_select' and not st.session_state.game_state:
         st.warning("게임 상태 정보가 유실되었습니다. 시나리오 선택 화면으로 돌아갑니다.")
         st.session_state.game_mode = 'scenario_select'
-        keys_to_clear = ['current_scenario_key', 'game_state', 'current_assignment_data', 'actions_taken_this_turn', 'desk_feedback_message']
+        keys_to_clear = ['current_scenario_key', 'game_state', 'current_assignment_data', 'actions_taken_this_turn', 'desk_feedback_message', 'active_main_tab']
         for k_to_clear in keys_to_clear:
             if k_to_clear in st.session_state: del st.session_state[k_to_clear]
-        time.sleep(1) # 메시지 확인 시간
+        time.sleep(1)
         st.rerun()
 
 if __name__ == "__main__":