Complete 감정 회복 속도 차등화

npc_social_network/npc/npc_base.py

@@ -138,22 +138,29 @@ class NPC:
         return [m.content for m in self.memory_store.get_all_memories()]
     
     # 특정 감정을 감정 상태에 반영 (카테고리 기반)
-    def update_emotion(self, emotion: str, strength: int = 1):
+    def update_emotion(self, emotion: str, strength: float = 1.0):
         if emotion in self._emotion_buffer:
             self._emotion_buffer[emotion] += strength
+            self._emotion_buffer[emotion] = max(0.0, self._emotion_buffer[emotion]) 
     
     # 시간이 지남에 따라 모든 감정이 서서히 감소
     def decay_emotion(self):
-        for emotion in self._emotion_buffer:
-            rate = self.emotion_decay_rate.get(emotion, 1.0)
-            self._emotion_buffer[emotion] = max(0.0, self._emotion_buffer[emotion] - rate)
+        for emotion_key in self._emotion_buffer:
+            rate = self.emotion_decay_rate.get(emotion_key, 1.0)
+            
+            self._emotion_buffer[emotion_key] -= rate
+            if self._emotion_buffer[emotion_key] < 0:
+                self._emotion_buffer[emotion_key] = 0.0
 
     # 정수 기반 출력용 감정 상태 반환
     def get_current_emotion_state(self):
         display_state = {cat: {} for cat in self.emotion_state}
-        for cat in self.emotion_state:
-            for emo in self.emotion_state[cat]:
-                display_state[cat][emo] = float(self._emotion_buffer[emo])
+        for cat_name, emotions_in_cat in self.emotion_state.items():
+            for emo_name in emotions_in_cat:
+                if emo_name in self._emotion_buffer:
+                    display_state[cat_name][emo_name] = self._emotion_buffer[emo_name]
+                else:
+                    display_state[cat_name][emo_name] = 0.0 
         return display_state
 
     # 현재 가장 강한 감정 반환 (전체 감정 중 최댓값 1개)

test.ipynb

@@ -2754,7 +2754,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 1,
    "id": "ac67ce84",
    "metadata": {},
    "outputs": [
@@ -2762,23 +2762,26 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
+      "[DEBUG] update_emotion: Attempting to update 'anger' by 1.0.\n",
+      "[DEBUG] update_emotion: Attempting to update 'fear' by 1.0.\n",
+      "[DEBUG] update_emotion: Attempting to update 'pride' by 1.0.\n",
       "초기 감정 상태:\n",
-      "{'core_positive': {'joy': 0, 'satisfaction': 0, 'gratitude': 0, 'calm': 0, 'anticipation': 0, 'pride': 0, 'connectedness': 0}, 'core_negative': {'sadness': 0, 'anger': 0, 'anxiety': 0, 'disgust': 0, 'fear': 0, 'regret': 0, 'frustration': 0}, 'social_emotion': {'jealousy': 0, 'shame': 0, 'guilt': 0, 'compassion': 0, 'awe': 0, 'empathy': 0}, 'cognitive_state': {'confusion': 0, 'nervousness': 0, 'apathy': 0, 'excitement': 0, 'immersion': 0, 'skepticism': 0}}\n",
+      "{'core_positive': {'joy': 0.0, 'satisfaction': 0.0, 'gratitude': 0.0, 'calm': 0.0, 'anticipation': 0.0, 'pride': 1.0, 'connectedness': 0.0}, 'core_negative': {'sadness': 0.0, 'anger': 1.0, 'anxiety': 0.0, 'disgust': 0.0, 'fear': 1.0, 'regret': 0.0, 'frustration': 0.0}, 'social_emotion': {'jealousy': 0.0, 'shame': 0.0, 'guilt': 0.0, 'compassion': 0.0, 'awe': 0.0, 'empathy': 0.0}, 'cognitive_state': {'confusion': 0.0, 'nervousness': 0.0, 'apathy': 0.0, 'excitement': 0.0, 'immersion': 0.0, 'skepticism': 0.0}}\n",
       "\n",
       "[1회 decay 후]\n",
-      "{'core_positive': {'joy': 0, 'satisfaction': 0, 'gratitude': 0, 'calm': 0, 'anticipation': 0, 'pride': 0, 'connectedness': 0}, 'core_negative': {'sadness': 0, 'anger': 0, 'anxiety': 0, 'disgust': 0, 'fear': 0, 'regret': 0, 'frustration': 0}, 'social_emotion': {'jealousy': 0, 'shame': 0, 'guilt': 0, 'compassion': 0, 'awe': 0, 'empathy': 0}, 'cognitive_state': {'confusion': 0, 'nervousness': 0, 'apathy': 0, 'excitement': 0, 'immersion': 0, 'skepticism': 0}}\n",
+      "{'core_positive': {'joy': 0.0, 'satisfaction': 0.0, 'gratitude': 0.0, 'calm': 0.0, 'anticipation': 0.0, 'pride': 0.0, 'connectedness': 0.0}, 'core_negative': {'sadness': 0.0, 'anger': 0.5, 'anxiety': 0.0, 'disgust': 0.0, 'fear': 0.4, 'regret': 0.0, 'frustration': 0.0}, 'social_emotion': {'jealousy': 0.0, 'shame': 0.0, 'guilt': 0.0, 'compassion': 0.0, 'awe': 0.0, 'empathy': 0.0}, 'cognitive_state': {'confusion': 0.0, 'nervousness': 0.0, 'apathy': 0.0, 'excitement': 0.0, 'immersion': 0.0, 'skepticism': 0.0}}\n",
       "\n",
       "[2회 decay 후]\n",
-      "{'core_positive': {'joy': 0, 'satisfaction': 0, 'gratitude': 0, 'calm': 0, 'anticipation': 0, 'pride': 0, 'connectedness': 0}, 'core_negative': {'sadness': 0, 'anger': 0, 'anxiety': 0, 'disgust': 0, 'fear': 0, 'regret': 0, 'frustration': 0}, 'social_emotion': {'jealousy': 0, 'shame': 0, 'guilt': 0, 'compassion': 0, 'awe': 0, 'empathy': 0}, 'cognitive_state': {'confusion': 0, 'nervousness': 0, 'apathy': 0, 'excitement': 0, 'immersion': 0, 'skepticism': 0}}\n",
+      "{'core_positive': {'joy': 0.0, 'satisfaction': 0.0, 'gratitude': 0.0, 'calm': 0.0, 'anticipation': 0.0, 'pride': 0.0, 'connectedness': 0.0}, 'core_negative': {'sadness': 0.0, 'anger': 0.0, 'anxiety': 0.0, 'disgust': 0.0, 'fear': 0.0, 'regret': 0.0, 'frustration': 0.0}, 'social_emotion': {'jealousy': 0.0, 'shame': 0.0, 'guilt': 0.0, 'compassion': 0.0, 'awe': 0.0, 'empathy': 0.0}, 'cognitive_state': {'confusion': 0.0, 'nervousness': 0.0, 'apathy': 0.0, 'excitement': 0.0, 'immersion': 0.0, 'skepticism': 0.0}}\n",
       "\n",
       "[3회 decay 후]\n",
-      "{'core_positive': {'joy': 0, 'satisfaction': 0, 'gratitude': 0, 'calm': 0, 'anticipation': 0, 'pride': 0, 'connectedness': 0}, 'core_negative': {'sadness': 0, 'anger': 0, 'anxiety': 0, 'disgust': 0, 'fear': 0, 'regret': 0, 'frustration': 0}, 'social_emotion': {'jealousy': 0, 'shame': 0, 'guilt': 0, 'compassion': 0, 'awe': 0, 'empathy': 0}, 'cognitive_state': {'confusion': 0, 'nervousness': 0, 'apathy': 0, 'excitement': 0, 'immersion': 0, 'skepticism': 0}}\n",
+      "{'core_positive': {'joy': 0.0, 'satisfaction': 0.0, 'gratitude': 0.0, 'calm': 0.0, 'anticipation': 0.0, 'pride': 0.0, 'connectedness': 0.0}, 'core_negative': {'sadness': 0.0, 'anger': 0.0, 'anxiety': 0.0, 'disgust': 0.0, 'fear': 0.0, 'regret': 0.0, 'frustration': 0.0}, 'social_emotion': {'jealousy': 0.0, 'shame': 0.0, 'guilt': 0.0, 'compassion': 0.0, 'awe': 0.0, 'empathy': 0.0}, 'cognitive_state': {'confusion': 0.0, 'nervousness': 0.0, 'apathy': 0.0, 'excitement': 0.0, 'immersion': 0.0, 'skepticism': 0.0}}\n",
       "\n",
       "[4회 decay 후]\n",
-      "{'core_positive': {'joy': 0, 'satisfaction': 0, 'gratitude': 0, 'calm': 0, 'anticipation': 0, 'pride': 0, 'connectedness': 0}, 'core_negative': {'sadness': 0, 'anger': 0, 'anxiety': 0, 'disgust': 0, 'fear': 0, 'regret': 0, 'frustration': 0}, 'social_emotion': {'jealousy': 0, 'shame': 0, 'guilt': 0, 'compassion': 0, 'awe': 0, 'empathy': 0}, 'cognitive_state': {'confusion': 0, 'nervousness': 0, 'apathy': 0, 'excitement': 0, 'immersion': 0, 'skepticism': 0}}\n",
+      "{'core_positive': {'joy': 0.0, 'satisfaction': 0.0, 'gratitude': 0.0, 'calm': 0.0, 'anticipation': 0.0, 'pride': 0.0, 'connectedness': 0.0}, 'core_negative': {'sadness': 0.0, 'anger': 0.0, 'anxiety': 0.0, 'disgust': 0.0, 'fear': 0.0, 'regret': 0.0, 'frustration': 0.0}, 'social_emotion': {'jealousy': 0.0, 'shame': 0.0, 'guilt': 0.0, 'compassion': 0.0, 'awe': 0.0, 'empathy': 0.0}, 'cognitive_state': {'confusion': 0.0, 'nervousness': 0.0, 'apathy': 0.0, 'excitement': 0.0, 'immersion': 0.0, 'skepticism': 0.0}}\n",
       "\n",
       "[5회 decay 후]\n",
-      "{'core_positive': {'joy': 0, 'satisfaction': 0, 'gratitude': 0, 'calm': 0, 'anticipation': 0, 'pride': 0, 'connectedness': 0}, 'core_negative': {'sadness': 0, 'anger': 0, 'anxiety': 0, 'disgust': 0, 'fear': 0, 'regret': 0, 'frustration': 0}, 'social_emotion': {'jealousy': 0, 'shame': 0, 'guilt': 0, 'compassion': 0, 'awe': 0, 'empathy': 0}, 'cognitive_state': {'confusion': 0, 'nervousness': 0, 'apathy': 0, 'excitement': 0, 'immersion': 0, 'skepticism': 0}}\n"
+      "{'core_positive': {'joy': 0.0, 'satisfaction': 0.0, 'gratitude': 0.0, 'calm': 0.0, 'anticipation': 0.0, 'pride': 0.0, 'connectedness': 0.0}, 'core_negative': {'sadness': 0.0, 'anger': 0.0, 'anxiety': 0.0, 'disgust': 0.0, 'fear': 0.0, 'regret': 0.0, 'frustration': 0.0}, 'social_emotion': {'jealousy': 0.0, 'shame': 0.0, 'guilt': 0.0, 'compassion': 0.0, 'awe': 0.0, 'empathy': 0.0}, 'cognitive_state': {'confusion': 0.0, 'nervousness': 0.0, 'apathy': 0.0, 'excitement': 0.0, 'immersion': 0.0, 'skepticism': 0.0}}\n"
      ]
     }
    ],