update

microsoft · Oct 2, 2023 · 7388920 · 7388920
1 parent 709789d
commit 7388920
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/autogen/agentchat/conversable_agent.py b/autogen/agentchat/conversable_agent.py
@@ -259,6 +259,7 @@ def _append_oai_message(self, message: Union[Dict, str], role, conversation_id:
         If the message received is a string, it will be put in the "content" field of the new dictionary.
         If the message received is a dictionary but does not have any of the two fields "content" or "function_call",
             this message is not a valid ChatCompletion message.
+        If only "function_call" is provided, "content" will be set to None if not provided, and the role of the message will be forced "assistant".
 
         Args:
             message (dict or str): message to be appended to the ChatCompletion conversation.
@@ -271,8 +272,11 @@ def _append_oai_message(self, message: Union[Dict, str], role, conversation_id:
         message = self._message_to_dict(message)
         # create oai message to be appended to the oai conversation that can be passed to oai directly.
         oai_message = {k: message[k] for k in ("content", "function_call", "name", "context") if k in message}
-        if "content" not in oai_message and "function_call" not in oai_message:
-            return False
+        if "content" not in oai_message:
+            if "function_call" in oai_message:
+                oai_message["content"] = None  # if only function_call is provided, content will be set to None.
+            else:
+                return False
 
         oai_message["role"] = "function" if message.get("role") == "function" else role
         if "function_call" in oai_message:
@@ -291,8 +295,8 @@ def send(
 
         Args:
             message (dict or str): message to be sent.
-                The message could contain the following fields (either content or function_call must be provided):
-                - content (str): the content of the message.
+                The message could contain the following fields:
+                - content (str): Required, the content of the message. (Can be None)
                 - function_call (str): the name of the function to be called.
                 - name (str): the name of the function to be called.
                 - role (str): the role of the message, any role that is not "function"
@@ -340,8 +344,8 @@ async def a_send(
 
         Args:
             message (dict or str): message to be sent.
-                The message could contain the following fields (either content or function_call must be provided):
-                - content (str): the content of the message.
+                The message could contain the following fields:
+                - content (str): Required, the content of the message. (Can be None)
                 - function_call (str): the name of the function to be called.
                 - name (str): the name of the function to be called.
                 - role (str): the role of the message, any role that is not "function"

diff --git a/test/test_with_openai.py b/test/test_with_openai.py
@@ -36,23 +36,22 @@ def get_random_number():
                 "parameters": {
                     "type": "object",
                     "properties": {},
-                    "required": [],
                 },
             },
         ],
     }
     user_proxy = autogen.UserProxyAgent(
         name="User_proxy",
-        system_message="A human admin that will execute code.",
+        system_message="A human admin that will execute function_calls.",
         function_map={"get_random_number": get_random_number},
         human_input_mode="NEVER",
     )
     coder = autogen.AssistantAgent(
         name="Player",
-        system_message="You will can function 'get_random_number' to get a random number. Reply 'TERMINATE' when you get at least 1 even number and 1 odd number.",
+        system_message="You will can function `get_random_number` to get a random number. Stop only when you get at least 1 even number and 1 odd number. Reply TERMINATE to stop.",
         llm_config=llm_config,
     )
-    groupchat = autogen.GroupChat(agents=[user_proxy, coder], messages=[], max_round=10)
+    groupchat = autogen.GroupChat(agents=[user_proxy, coder], messages=[], max_round=7)
     manager = autogen.GroupChatManager(groupchat=groupchat, llm_config=llm_config)
 
     user_proxy.initiate_chat(manager, message="Let's start the game!")