From 43e35fe929d165f6f5c36b8f683d85825fa78684 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8E=98=E6=9D=83=20=E9=A9=AC?= <mashenquan@fuzhi.ai>
Date: Mon, 18 Dec 2023 16:13:21 +0800
Subject: [PATCH] fixbug: recursive user requirement dead loop

---
 metagpt/roles/role.py      | 23 ++++++-----------------
 metagpt/schema.py          |  4 ----
 tests/metagpt/test_role.py |  6 +++---
 3 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/metagpt/roles/role.py b/metagpt/roles/role.py
index 1e7ebf711..48688ad5f 100644
--- a/metagpt/roles/role.py
+++ b/metagpt/roles/role.py
@@ -25,9 +25,8 @@ from typing import Iterable, Set, Type
 
 from pydantic import BaseModel, Field
 
-from metagpt.actions import Action, ActionOutput
+from metagpt.actions import Action, ActionOutput, UserRequirement
 from metagpt.actions.action_node import ActionNode
-from metagpt.actions.add_requirement import UserRequirement
 from metagpt.llm import LLM, HumanProvider
 from metagpt.logs import logger
 from metagpt.memory import Memory
@@ -127,17 +126,7 @@ class RoleContext(BaseModel):
         return self.memory.get()
 
 
-class _RoleInjector(type):
-    def __call__(cls, *args, **kwargs):
-        instance = super().__call__(*args, **kwargs)
-
-        if not instance._rc.watch:
-            instance._watch([UserRequirement])
-
-        return instance
-
-
-class Role(metaclass=_RoleInjector):
+class Role:
     """Role/Agent"""
 
     def __init__(self, name="", profile="", goal="", constraints="", desc="", is_human=False):
@@ -149,10 +138,9 @@ class Role(metaclass=_RoleInjector):
         self._states = []
         self._actions = []
         self._role_id = str(self._setting)
-        self._rc = RoleContext()
+        self._rc = RoleContext(watch={any_to_str(UserRequirement)})
         self._subscription = {any_to_str(self), name} if name else {any_to_str(self)}
 
-
     def _reset(self):
         self._states = []
         self._actions = []
@@ -203,8 +191,7 @@ class Role(metaclass=_RoleInjector):
         """Watch Actions of interest. Role will select Messages caused by these Actions from its personal message
         buffer during _observe.
         """
-        tags = {any_to_str(t) for t in actions}
-        self._rc.watch.update(tags)
+        self._rc.watch = {any_to_str(t) for t in actions}
         # check RoleContext after adding watch actions
         self._rc.check(self._role_id)
 
@@ -401,6 +388,8 @@ class Role(metaclass=_RoleInjector):
                 msg = with_message
             elif isinstance(with_message, list):
                 msg = Message("\n".join(with_message))
+            if not msg.cause_by:
+                msg.cause_by = UserRequirement
             self.put_message(msg)
 
         if not await self._observe():
diff --git a/metagpt/schema.py b/metagpt/schema.py
index 5aec378e4..758149efa 100644
--- a/metagpt/schema.py
+++ b/metagpt/schema.py
@@ -121,10 +121,6 @@ class Message(BaseModel):
         :param send_to: Specifies the target recipient or consumer for message delivery in the environment.
         :param role: Message meta info tells who sent this message.
         """
-        if not cause_by:
-            from metagpt.actions import UserRequirement
-            cause_by = UserRequirement
-
         super().__init__(
             id=uuid.uuid4().hex,
             content=content,
diff --git a/tests/metagpt/test_role.py b/tests/metagpt/test_role.py
index 8fac2503c..611d321fc 100644
--- a/tests/metagpt/test_role.py
+++ b/tests/metagpt/test_role.py
@@ -14,11 +14,11 @@ import uuid
 import pytest
 from pydantic import BaseModel
 
-from metagpt.actions import Action, ActionOutput
+from metagpt.actions import Action, ActionOutput, UserRequirement
 from metagpt.environment import Environment
 from metagpt.roles import Role
 from metagpt.schema import Message
-from metagpt.utils.common import get_class_name
+from metagpt.utils.common import any_to_str, get_class_name
 
 
 class MockAction(Action):
@@ -60,7 +60,7 @@ async def test_react():
             name=seed.name, profile=seed.profile, goal=seed.goal, constraints=seed.constraints, desc=seed.desc
         )
         role.subscribe({seed.subscription})
-        assert role._rc.watch == set({})
+        assert role._rc.watch == {any_to_str(UserRequirement)}
         assert role.name == seed.name
         assert role.profile == seed.profile
         assert role._setting.goal == seed.goal