Fix error in agent when use_memory is False

src/agentscope/agents/dialog_agent.py

@@ -15,8 +15,8 @@ class DialogAgent(AgentBase):
     def __init__(
         self,
         name: str,
-        sys_prompt: Optional[str] = None,
-        model_config_name: str = None,
+        sys_prompt: str,
+        model_config_name: str,
         use_memory: bool = True,
         memory_config: Optional[dict] = None,
         prompt_type: Optional[PromptType] = PromptType.LIST,
@@ -29,7 +29,7 @@ def __init__(
             sys_prompt (`Optional[str]`):
                 The system prompt of the agent, which can be passed by args
                 or hard-coded in the agent.
-            model_config_name (`str`, defaults to None):
+            model_config_name (`str`):
                 The name of the model config, which is used to load model from
                 configuration.
             use_memory (`bool`, defaults to `True`):
@@ -68,13 +68,13 @@ def reply(self, x: dict = None) -> dict:
             response to the user's input.
         """
         # record the input if needed
-        if x is not None:
+        if not self.memory:
             self.memory.add(x)
 
         # prepare prompt
         prompt = self.engine.join(
             self.sys_prompt,
-            self.memory.get_memory(),
+            self.memory and self.memory.get_memory(),
         )
 
         # call llm and generate response
@@ -85,6 +85,7 @@ def reply(self, x: dict = None) -> dict:
         self.speak(msg)
 
         # Record the message in memory
-        self.memory.add(msg)
+        if not self.memory:
+            self.memory.add(msg)
 
         return msg

src/agentscope/agents/dict_dialog_agent.py

@@ -47,8 +47,8 @@ class DictDialogAgent(AgentBase):
     def __init__(
         self,
         name: str,
-        sys_prompt: Optional[str] = None,
-        model_config_name: str = None,
+        sys_prompt: str,
+        model_config_name: str,
         use_memory: bool = True,
         memory_config: Optional[dict] = None,
         parse_func: Optional[Callable[..., Any]] = parse_dict,
@@ -127,13 +127,13 @@ def reply(self, x: dict = None) -> dict:
                 it defaults to treating the response as plain text.
         """
         # record the input if needed
-        if x is not None:
+        if not self.memory:
             self.memory.add(x)
 
         # prepare prompt
         prompt = self.engine.join(
             self.sys_prompt,
-            self.memory.get_memory(),
+            self.memory and self.memory.get_memory(),
         )
 
         # call llm
@@ -158,6 +158,7 @@ def reply(self, x: dict = None) -> dict:
         self.speak(msg)
 
         # record to memory
-        self.memory.add(msg)
+        if not self.memory:
+            self.memory.add(msg)
 
         return msg

src/agentscope/agents/text_to_image_agent.py

@@ -14,8 +14,8 @@ class TextToImageAgent(AgentBase):
     def __init__(
         self,
         name: str,
-        sys_prompt: Optional[str] = None,
-        model_config_name: str = None,
+        sys_prompt: str,
+        model_config_name: str,
         use_memory: bool = True,
         memory_config: Optional[dict] = None,
     ) -> None:
@@ -44,8 +44,9 @@ def __init__(
         )
 
     def reply(self, x: dict = None) -> dict:
-        if x is not None:
+        if not self.memory and x is not None:
             self.memory.add(x)
+
         image_urls = self.model(x.content).image_urls
         # TODO: optimize the construction of content
         msg = Msg(
@@ -54,5 +55,8 @@ def reply(self, x: dict = None) -> dict:
             url=image_urls,
         )
         logger.chat(msg)
-        self.memory.add(msg)
+
+        if not self.memory:
+            self.memory.add(msg)
+
         return msg

src/agentscope/agents/user_agent.py

@@ -61,7 +61,7 @@ def reply(
             the user's input and any additional details. This is also
             stored in the object's memory.
         """
-        if x is not None:
+        if not self.memory and x is not None:
             self.memory.add(x)
 
         # TODO: To avoid order confusion, because `input` print much quicker
@@ -91,6 +91,7 @@ def reply(
         )
 
         # Add to memory
-        self.memory.add(msg)
+        if not self.memory:
+            self.memory.add(msg)
 
         return msg

src/agentscope/memory/memory.py

@@ -48,7 +48,7 @@ def get_memory(
         """
 
     @abstractmethod
-    def add(self, memories: Union[list[dict], dict]) -> None:
+    def add(self, memories: Union[list[dict], dict, None]) -> None:
         """
         Adding new memory fragment, depending on how the memory are stored
         """

src/agentscope/memory/temporary_memory.py

@@ -40,9 +40,12 @@ def __init__(
 
     def add(
         self,
-        memories: Union[Sequence[dict], dict],
+        memories: Union[Sequence[dict], dict, None],
         embed: bool = False,
     ) -> None:
+        if memories is None:
+            return
+
         if not isinstance(memories, list):
             record_memories = [memories]
         else:

src/agentscope/prompt.py

@@ -108,6 +108,10 @@ def join(
         converted to `Msg` from `system`.
         """
         # TODO: achieve the summarize function
+
+        # Filter `None`
+        args = [_ for _ in args if _ is not None]
+
         if self.prompt_type == PromptType.STRING:
             return self.join_to_str(*args, format_map=format_map)
         elif self.prompt_type == PromptType.LIST: