Update app.py

app.py

@@ -53,12 +53,14 @@ class SimpleDB:
     def save_reflection(self, name, reflection, sentiment, timestamp=None):
         if timestamp is None:
             timestamp = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+        
         reflection_data = {
+            "timestamp": timestamp,
             "name": name,
             "reflection": reflection,
-            "sentiment": sentiment,
-            "timestamp": timestamp
+            "sentiment": sentiment
         }
+        
         self.reflections.append(reflection_data)
         self._save_json(self.reflections_path, self.reflections)
         return True
@@ -86,7 +88,7 @@ class SimpleDB:
             return False
 
     def get_all_reflections(self):
-        return self.reflections
+        return sorted(self.reflections, key=lambda x: x["timestamp"], reverse=True)
 
     def get_all_wishes(self):
         return self.wishes
@@ -392,7 +394,7 @@ def create_interface():
         with gr.Tabs(selected=0) as tabs:
             # 입장 탭 (축원 포함)
             with gr.TabItem("입장") as tab_entrance:
-                # 첫 화면
+                # 1단계: 첫 화면
                 welcome_section = gr.Column(visible=True)
                 with welcome_section:
                     gr.Markdown(WELCOME_MESSAGE)
@@ -401,17 +403,18 @@ def create_interface():
                         placeholder="이름을 입력해주세요",
                         interactive=True
                     )
-                
-                # 온천천 이야기
+                    name_submit_btn = gr.Button("굿판 시작하기", variant="primary")
+            
+                # 2단계: 세계관 설명
                 story_section = gr.Column(visible=False)
                 with story_section:
                     gr.Markdown(ONCHEON_STORY)
-                    start_btn = gr.Button("여정 시작하기", variant="primary")
-                
-                # 축원 섹션
+                    continue_btn = gr.Button("준비하기", variant="primary")
+            
+                # 3단계: 축원 의식
                 blessing_section = gr.Column(visible=False)
                 with blessing_section:
-                    gr.Markdown("### 축원의 문장을 평온한 마음으로 읽어주세요")
+                    gr.Markdown("### 축원의식을 시작하겠습니다")
                     gr.Markdown("'명짐 복짐 짊어지고 안가태평하시기를 비도발원 축원 드립니다'")
                     baseline_audio = gr.Audio(
                         label="축원 문장 녹음하기",
@@ -419,9 +422,21 @@ def create_interface():
                         type="numpy",
                         streaming=False
                     )
-                    set_baseline_btn = gr.Button("기준점 설정 완료", variant="primary")
+                    set_baseline_btn = gr.Button("축원 마치기", variant="primary")
                     baseline_status = gr.Markdown("")
 
+    # 4단계: 굿판 입장 안내
+    entry_guide_section = gr.Column(visible=False)
+    with entry_guide_section:
+        gr.Markdown("## 굿판으로 입장하기")
+        gr.Markdown("""
+        * 청신 탭으로 이동해 주세요.
+        * 부산광역시 동래구 온천장역에서 시작하면 더욱 깊은 경험을 시작할 수 있습니다.
+        * (본격적인 경험을 시작하기에 앞서 이동을 권장드립니다)
+        """)
+        enter_btn = gr.Button("청신 의식 시작하기", variant="primary")
+
+
             # 청신 탭
             with gr.TabItem("청신") as tab_listen:
                 gr.Markdown("## 청신 - 소리로 정화하기")
@@ -451,9 +466,10 @@ def create_interface():
                         reflections_display = gr.Dataframe(
                             headers=["시간", "감상", "감정 분석"],
                             label="기록된 감상들",
-                            value=[],
+                            value=[],  # 초기값은 빈 리스트
                             interactive=False,
-                            wrap=True
+                            wrap=True,
+                            row_count=(5, "dynamic")  # 동적으로 행 수 조정
                         )
 
             # 기원 탭
@@ -519,10 +535,49 @@ def create_interface():
                 )
 
         # 이벤트 핸들러들
-        def handle_name_input(name):
+        def handle_name_submit(name, state):
             if not name.strip():
-                return gr.update(visible=True), gr.update(visible=False), gr.update(visible=False)
-            return gr.update(visible=False), gr.update(visible=True), gr.update(visible=False)
+                return (
+                    gr.update(visible=True),
+                    gr.update(visible=False),
+                    gr.update(visible=False),
+                    gr.update(visible=False),
+                    state
+                )
+            state = safe_state_update(state, {"user_name": name})
+            return (
+                gr.update(visible=False),
+                gr.update(visible=True),
+                gr.update(visible=False),
+                gr.update(visible=False),
+                state
+            )
+        
+        def handle_continue():
+            return (
+                gr.update(visible=False),
+                gr.update(visible=False),
+                gr.update(visible=True),
+                gr.update(visible=False)
+            )
+        
+        def handle_blessing_complete(audio, state):
+            if audio is None:
+                return state, "음성을 먼저 녹음해주세요.", gr.update(visible=True), gr.update(visible=False)
+            
+            try:
+                # ... (기존 음성 처리 코드)
+                return (
+                    state,
+                    "축원이 완료되었습니다.",
+                    gr.update(visible=False),
+                    gr.update(visible=True)
+                )
+            except Exception as e:
+                return state, f"오류가 발생했습니다: {str(e)}", gr.update(visible=True), gr.update(visible=False)
+        
+        def handle_enter():
+            return gr.update(selected=1)  # 청신 탭으로 이동
 
         def handle_start():
             return gr.update(visible=False), gr.update(visible=True)
@@ -570,6 +625,43 @@ def create_interface():
                 print(f"Error saving reflection: {e}")
                 return state, state.get("reflections", [])
 
+        def save_reflection_fixed(text, state):
+            if not text.strip():
+                return state, []
+            
+            try:
+                current_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+                name = state.get("user_name", "익명")
+                
+                if text_analyzer:
+                    sentiment = text_analyzer(text)[0]
+                    sentiment_text = f"{sentiment['label']} ({sentiment['score']:.2f})"
+                else:
+                    sentiment_text = "분석 불가"
+        
+                # DB에 저장
+                db.save_reflection(name, text, sentiment_text)
+                
+                # 화면에 표시할 데이터 형식으로 변환
+                display_data = []
+                all_reflections = db.get_all_reflections()
+                for ref in all_reflections:
+                    display_data.append([
+                        ref["timestamp"],
+                        ref["reflection"],
+                        ref["sentiment"]
+                    ])
+        
+                # 상태 업데이트
+                state = safe_state_update(state, {"reflections": display_data})
+                
+                return state, display_data
+        
+            except Exception as e:
+                print(f"Error saving reflection: {e}")
+                return state, []
+
+
         def handle_save_wish(text, state):
             if not text.strip():
                 return "소원을 입력해주세요.", []
@@ -637,7 +729,27 @@ def create_interface():
             inputs=[final_reflection, state],
             outputs=[baseline_status, wishes_display]
         )
-
+        name_submit_btn.click(
+            fn=handle_name_submit,
+            inputs=[name_input, state],
+            outputs=[welcome_section, story_section, blessing_section, entry_guide_section, state]
+        )
+        
+        continue_btn.click(
+            fn=handle_continue,
+            outputs=[story_section, welcome_section, blessing_section, entry_guide_section]
+        )
+        
+        set_baseline_btn.click(
+            fn=handle_blessing_complete,
+            inputs=[baseline_audio, state],
+            outputs=[state, baseline_status, blessing_section, entry_guide_section]
+        )
+        
+        enter_btn.click(
+            fn=handle_enter,
+            outputs=[tabs]
+        )
     return app
 
 if __name__ == "__main__":