Update app.py

app.py

@@ -1452,34 +1452,30 @@ def main():
         st.session_state["user_input_rendered"] = True
 
     if user_input:
-        # 2) mode 탐지
-        _, _, mode = detect_location_filter(user_input)
-        top_emotions, emotion_groups = analyze_emotion(user_input)
+        # 1) 저비용 단계: 위치/의도 먼저
+        country_filter, city_filter, loc_mode = detect_location_filter(user_input)
         intent, intent_score = detect_intent(user_input)
-        country_filter, city_filter, _ = detect_location_filter(user_input)
-        candidate_themes = extract_themes(
-            emotion_groups,
-            intent,
-            force_mode=(intent_score >= 0.70)
-        )
-        if intent_score >= 0.70:
+    
+        # 사이드바에서 임계값을 쓸 수 있게 했다면, 없으면 0.70 기본
+        threshold = st.session_state.get("intent_threshold", 0.70)
+    
+        # 2) 모드 결정: 지역 확정 → intent 확정 → unknown → (그 외) emotion
+        if loc_mode == "region":
+            mode = "region"
+            top_emotions, emotion_groups = [], []
+        elif intent_score >= threshold:
             mode = "intent"
-
-        # 🌟 DEBUG ────────────────────────────────
-        # with st.expander("🔍 DEBUG - 모드 판정", expanded=True):
-        #     st.markdown(f"""
-        #     **입력 문장**: `{user_input}`  
-        #     **detect_location_filter** 👉  
-        #     • country → `{country_filter}`  
-        #     • city     → `{city_filter}`  
-        #     • mode  → `{mode}`  
-
-        #     **intent_score**: `{intent_score:.3f}`  
-        #     **top_emotions**: `{top_emotions}`  
-        #     """)
-        # ────────────────────────────────────────
-
-        # 3) 모드별 분기
+            top_emotions, emotion_groups = [], []
+        elif loc_mode == "unknown":
+            mode = "unknown"
+            top_emotions, emotion_groups = [], []
+        else:
+            mode = "emotion"
+            # 3) 고비용 단계: 정말 필요할 때만 감성(BERT) 실행
+            # with st.spinner("감정 분석 중..."):  # UX 원하시면 스피너 추가
+            top_emotions, emotion_groups = analyze_emotion(user_input)
+    
+        # 4) 모드별 분기 (필요한 계산만 수행)
         if mode == "region":
             region_ui(
                 travel_df,
@@ -1493,30 +1489,38 @@ def main():
                 log_and_render
             )
             return
-
+    
         elif mode == "intent":
             intent_ui(
-                travel_df, 
-                external_score_df, 
-                festival_df, 
-                weather_df, 
+                travel_df,
+                external_score_df,
+                festival_df,
+                weather_df,
                 package_df,
-                country_filter, 
-                city_filter, 
-                chat_container, 
-                intent, 
-                log_and_render)
+                country_filter,
+                city_filter,
+                chat_container,
+                intent,
+                log_and_render
+            )
             return
-        
-        elif mode == "unknown": 
+    
+        elif mode == "unknown":
             unknown_ui(
-                country_filter, 
-                city_filter, 
-                chat_container, 
-                log_and_render)
+                country_filter,
+                city_filter,
+                chat_container,
+                log_and_render
+            )
             return
-        
-        else:
+    
+        else:  # emotion
+            # emotion 모드에서만 테마 추출 (불필요한 계산 방지)
+            candidate_themes = extract_themes(
+                emotion_groups,
+                intent,
+                force_mode=False  # intent 확정 케이스가 아니라면 False
+            )
             emotion_ui(
                 travel_df,
                 external_score_df,
@@ -1527,9 +1531,9 @@ def main():
                 city_filter,
                 chat_container,
                 candidate_themes,
-                intent,   
-                emotion_groups,   
-                top_emotions,      
+                intent,
+                emotion_groups,
+                top_emotions,
                 log_and_render
             )