Demo

app.py

@@ -1064,37 +1064,12 @@ async def websocket_endpoint_with_jwt(
                             if transcription:
                                 logger.info(f"🤖 處理即時轉錄結果: {transcription}")
 
-                                # 音頻情緒辨識（新增）
+                                # 音頻情緒辨識已禁用（改用文字情緒偵測）
                                 audio_emotion = None
+                                # 清理音頻緩衝
                                 if audio_buffer:
-                                    try:
-                                        from services.audio_emotion_service import audio_emotion_service
-                                        logger.info(f"🎭 開始音頻情緒辨識，音頻大小: {len(audio_buffer)} bytes")
-                                        audio_emotion = await audio_emotion_service.predict_from_bytes(audio_buffer)
-                                        
-                                        if audio_emotion.get("success"):
-                                            emotion_label = audio_emotion.get("emotion")
-                                            confidence = audio_emotion.get("confidence", 0.0)
-                                            logger.info(f"✅ 音頻情緒: {emotion_label} (置信度: {confidence:.4f})")
-                                            
-                                            # 發送音頻情緒給前端
-                                            await websocket.send_json({
-                                                "type": "audio_emotion_detected",
-                                                "emotion": emotion_label,
-                                                "confidence": confidence,
-                                                "all_emotions": audio_emotion.get("all_emotions", {}),
-                                                "source": "audio"
-                                            })
-                                        else:
-                                            logger.warning(f"⚠️ 音頻情緒辨識失敗: {audio_emotion.get('error')}")
-                                            audio_emotion = None
-                                    except Exception as e:
-                                        logger.error(f"❌ 音頻情緒辨識異常: {e}")
-                                        audio_emotion = None
-                                    finally:
-                                        # 清理音頻緩衝
-                                        client_info.pop("audio_buffer", None)
-                                        manager.set_client_info(user_id, client_info)
+                                    client_info.pop("audio_buffer", None)
+                                    manager.set_client_info(user_id, client_info)
 
                                 # 通知前端開始思考
                                 await websocket.send_json({"type": "typing", "message": "thinking"})
@@ -1346,17 +1321,22 @@ async def handle_message(user_message, user_id, chat_id, messages, request_id: s
     # 提取情緒與關懷模式資訊（新增）
     emotion = res.meta.get('emotion') if res.meta else None
     care_mode = res.meta.get('care_mode', False) if res.meta else False
+    
+    logger.info(f"🎭 handle_message 情緒: emotion={emotion}, care_mode={care_mode}, meta={res.meta}")
 
     # 立即返回完整結果（包含工具信息與情緒）
+    # 注意：即使 emotion 是 "neutral" 也要返回 dict，確保前端收到情緒資訊
     if tool_name or tool_data or emotion or care_mode:
+        logger.info(f"📤 返回 dict 格式: emotion={emotion}")
         return {
             'message': res.text,
             'tool_name': tool_name,
             'tool_data': tool_data,
-            'emotion': emotion,  # 新增情緒欄位
-            'care_mode': care_mode  # 新增關懷模式標記
+            'emotion': emotion,
+            'care_mode': care_mode
         }
     else:
+        logger.info(f"📤 返回純文字格式（無情緒資訊）")
         return res.text
 
 

core/emotion_care_manager.py

@@ -17,20 +17,37 @@ class EmotionCareManager:
 
     # 極端情緒定義（需要進入關懷模式的情緒）
     EXTREME_EMOTIONS = {"sad", "angry", "fear"}
+    
+    # 正面情緒定義（可以解除關懷模式的情緒）
+    POSITIVE_EMOTIONS = {"neutral", "happy", "surprise"}
 
     # 模式存活與冷卻（避免反覆觸發）
-    CARE_TTL_SECONDS = 20 * 60  # 20 分鐘自動失效
-    COOLDOWN_SECONDS = 10 * 60  # 10 分鐘內不重入
+    CARE_TTL_SECONDS = 10 * 60  # 10 分鐘自動失效（從 20 分鐘縮短）
+    COOLDOWN_SECONDS = 5 * 60   # 5 分鐘內不重入（從 10 分鐘縮短）
 
     # 解除關懷模式的關鍵字
     RELEASE_KEYWORDS = [
-        # 繁體
+        # 繁體中文
         "我沒事了", "我好了", "沒事了", "好多了", "好一點了",
         "我好些了", "沒關係了", "我ok了", "我可以了",
-        "不用擔心", "別擔心我",
-        # 簡體
+        "不用擔心", "別擔心我", "謝謝關心", "感謝你",
+        "我很好", "心情好多了", "開心", "快樂", "高興",
+        "沒問題", "放心", "安心了", "舒服多了",
+        # 簡體中文
         "我没事了", "没事了", "好一点了", "没关系了",
-        "不用担心", "别担心我",
+        "不用担心", "别担心我", "谢谢关心", "感谢你",
+        "我很好", "心情好多了", "开心", "快乐", "高兴",
+        "没问题", "放心", "安心了", "舒服多了",
+        # 英文
+        "i'm fine", "i am fine", "i'm ok", "i am ok", "i'm okay", "i am okay",
+        "i feel better", "feeling better", "much better", "all good",
+        "don't worry", "no worries", "thank you", "thanks",
+        # 日文
+        "大丈夫", "元気", "ありがとう", "心配しないで",
+        # 印尼文
+        "saya baik", "tidak apa-apa", "terima kasih",
+        # 越南文
+        "tôi ổn", "không sao", "cảm ơn",
     ]
 
     # 用戶關懷狀態
@@ -107,15 +124,15 @@ class EmotionCareManager:
         if not state or not state.get("in_care_mode", False):
             return False
 
-        # 優先檢查情緒：如果偵測到 neutral，立即解除關懷模式
-        if emotion and emotion.lower() == "neutral":
+        # 優先檢查情緒：如果偵測到正面情緒（neutral, happy, surprise），立即解除關懷模式
+        if emotion and emotion.lower() in cls.POSITIVE_EMOTIONS:
             original_emotion = state.get("emotion", "unknown")
             duration = time.time() - state.get("start_time", 0)
 
             state["in_care_mode"] = False
             state["last_exit_time"] = time.time()
 
-            logger.info(f"✅ 用戶 {user_id}（chat={chat_id or 'default'}）情緒恢復為 neutral（{original_emotion} → neutral），解除關懷模式（持續 {duration:.1f}秒）")
+            logger.info(f"✅ 用戶 {user_id}（chat={chat_id or 'default'}）情緒恢復為 {emotion}（{original_emotion} → {emotion}），解除關懷模式（持續 {duration:.1f}秒）")
             return True
 
         # 檢查是否包含解除關鍵字