[Hot fix]Fix bug when dialog agent self.memory is None (modelscope#157)

ZiTao-Li · Apr 16, 2024 · f94560b · f94560b
1 parent 2eb7892
commit f94560b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/agentscope/agents/dialog_agent.py b/src/agentscope/agents/dialog_agent.py
@@ -56,6 +56,7 @@ def __init__(
                 "will be removed in the future.",
             )
 
+    # TODO change typing from dict to MSG
     def reply(self, x: dict = None) -> dict:
         """Reply function of the agent. Processes the input data,
         generates a prompt using the current dialogue memory and system
@@ -78,7 +79,9 @@ def reply(self, x: dict = None) -> dict:
         # prepare prompt
         prompt = self.model.format(
             Msg("system", self.sys_prompt, role="system"),
-            self.memory and self.memory.get_memory(),  # type: ignore[arg-type]
+            self.memory
+            and self.memory.get_memory()
+            or x,  # type: ignore[arg-type]
         )
 
         # call llm and generate response

diff --git a/src/agentscope/agents/dict_dialog_agent.py b/src/agentscope/agents/dict_dialog_agent.py
@@ -121,6 +121,7 @@ def __init__(
                 "will be removed in the future.",
             )
 
+    # TODO change typing from dict to MSG
     def reply(self, x: dict = None) -> dict:
         """Reply function of the agent.
         Processes the input data, generates a prompt using the current
@@ -150,7 +151,9 @@ def reply(self, x: dict = None) -> dict:
         # prepare prompt
         prompt = self.model.format(
             Msg("system", self.sys_prompt, role="system"),
-            self.memory and self.memory.get_memory(),  # type: ignore[arg-type]
+            self.memory
+            and self.memory.get_memory()
+            or x,  # type: ignore[arg-type]
         )
 
         # call llm