Update app.py

app.py

@@ -708,16 +708,16 @@ def create_interface():
                         return (
                             state,                          
                             "음성을 먼저 녹음해주세요.",
-                            gr.update(visible=False),     
-                            gr.update(visible=False),     
-                            gr.update(visible=False),     
-                            gr.update(visible=False),     
-                            gr.update(visible=True),      
-                            gr.update(visible=False)      
+                            gr.update(visible=False),     # loading_icon
+                            gr.update(visible=False),     # voice_features
+                            gr.update(visible=False),     # text_sentiment
+                            gr.update(visible=False),     # analysis_result
+                            gr.update(visible=False),     # next_button
+                            gr.update(visible=True),      # blessing_section
+                            gr.update(visible=False)      # entry_guide_section
                         )
                     
                     try:
-                        # 1. 음성 특성 분석
                         features = calculate_baseline_features(audio)
                         if features is None:
                             return (
@@ -727,14 +727,13 @@ def create_interface():
                                 gr.update(visible=False),
                                 gr.update(visible=False),
                                 gr.update(visible=False),
+                                gr.update(visible=False),
                                 gr.update(visible=True),
                                 gr.update(visible=False)
                             )
                         
-                        # 2. 감정 분석
                         baseline_emotion = map_acoustic_to_emotion(features)
                         
-                        # 3. 분석 결과 생성
                         voice_features_text = f"""
                         🎭 음성 특성 분석:
                         
@@ -754,26 +753,25 @@ def create_interface():
                         
                         analysis_text = """
                         ✨ 기준 음성 분석이 완료되었습니다.
-                        청신 단계에서 마음을 정화하신 후 기원을 진행해주세요.
+                        결과를 확인하신 후 아래의 '다음 단계로' 버튼을 눌러주세요.
                         """
                         
-                        # 4. 상태 업데이트
                         new_state = safe_state_update(state, {
                             "baseline_features": features,
                             "baseline_emotion": baseline_emotion,
                             "analysis_complete": True
                         })
                         
-                        # 5. 최종 결과 반환 - 여기서 entry_guide_section을 보이게 설정
                         return (
                             new_state,
                             "✅ 축원이 완료되었습니다.",
-                            gr.update(visible=False),  # loading_icon
+                            gr.update(visible=False),                    # loading_icon
                             gr.update(value=voice_features_text, visible=True),  # voice_features
-                            gr.update(value=sentiment_text, visible=True),  # text_sentiment
-                            gr.update(value=analysis_text, visible=True),  # analysis_result
-                            gr.update(visible=False),  # blessing_section
-                            gr.update(visible=True)    # entry_guide_section - 중요: 다음 단계로 진행
+                            gr.update(value=sentiment_text, visible=True),       # text_sentiment
+                            gr.update(value=analysis_text, visible=True),        # analysis_result
+                            gr.update(visible=True),                     # next_button
+                            gr.update(visible=True),                     # blessing_section
+                            gr.update(visible=False)                     # entry_guide_section
                         )
                         
                     except Exception as e:
@@ -785,9 +783,56 @@ def create_interface():
                             gr.update(visible=False),
                             gr.update(visible=False),
                             gr.update(visible=False),
+                            gr.update(visible=False),
                             gr.update(visible=True),
                             gr.update(visible=False)
                         )
+                
+                def next_section():
+                    return (
+                        gr.update(visible=False),  # blessing_section
+                        gr.update(visible=True)    # entry_guide_section
+                    )
+                
+                # UI 구성
+                blessing_section = gr.Column(visible=False)
+                with blessing_section:
+                    gr.Markdown("### 축원의식을 시작하겠습니다")
+                    gr.Markdown("'명짐 복짐 짊어지고 안가태평하시기를 비도발원 축원 드립니다'")
+                    with gr.Column() as recording_section:
+                        baseline_audio = gr.Audio(
+                            label="축원 문장 녹음하기",
+                            sources=["microphone"],
+                            type="numpy",
+                            streaming=False
+                        )
+                    
+                    with gr.Column() as action_section:
+                        set_baseline_btn = gr.Button("축원 마치기", variant="primary")
+                        
+                        # 분석 상태와 결과를 보여주는 섹션
+                        analysis_status = gr.Markdown("")
+                        loading_icon = gr.HTML("""
+                            <div style="display:flex;justify-content:center;align-items:center;height:50px;overflow:hidden;">
+                                <div class="loader" style="width:30px;height:30px;"></div>
+                            </div>
+                        """)
+                        voice_features = gr.Textbox(
+                            label="음성 특성 분석",
+                            interactive=False,
+                            visible=False
+                        )
+                        text_sentiment = gr.Textbox(
+                            label="기본 감정 상태",
+                            interactive=False,
+                            visible=False
+                        )
+                        analysis_result = gr.Markdown(visible=False)
+                        next_button = gr.Button(
+                            "다음 단계로",
+                            variant="primary",
+                            visible=False  # 초기에는 숨김
+                        )
                                         
                 # 4단계: 굿판 입장 안내
                 entry_guide_section = gr.Column(visible=False)
@@ -1056,7 +1101,21 @@ def create_interface():
                 blessing_section,   # 축원 섹션
                 entry_guide_section # 가이드 섹션
             ]
+        ).then(  # 분석 완료 후 '다음으로' 버튼 표시
+            lambda: gr.update(visible=True),
+            None,
+            [next_step_btn]
         )
+        
+        # 새로운 버튼에 대한 이벤트 연결
+        next_step_btn.click(
+            fn=proceed_to_next_step,
+            outputs=[
+                blessing_section,
+                entry_guide_section
+            ]
+        )
+
         enter_btn.click(
             fn=handle_enter,
             outputs=[tabs]