[Core] [Tool Call] adjust conversable agent to support tool_calls

autogen/agentchat/groupchat.py

@@ -155,11 +155,21 @@ def _prepare_and_select_agents(self, last_speaker: Agent) -> Tuple[Optional[Agen
                 "Or, use direct communication instead."
             )
 
-        if self.func_call_filter and self.messages and "function_call" in self.messages[-1]:
+        if (
+            self.func_call_filter
+            and self.messages
+            and ("function_call" in self.messages[-1] or "tool_calls" in self.messages[-1])
+        ):
+            funcs = []
+            if "function_call" in self.messages[-1]:
+                funcs += [self.messages[-1]["function_call"]["name"]]
+            if "tool_calls" in self.messages[-1]:
+                funcs += [
+                    tool["function"]["name"] for tool in self.messages[-1]["tool_calls"] if tool["type"] == "function"
+                ]
+
             # find agents with the right function_map which contains the function name
-            agents = [
-                agent for agent in self.agents if agent.can_execute_function(self.messages[-1]["function_call"]["name"])
-            ]
+            agents = [agent for agent in self.agents if agent.can_execute_function(funcs)]
             if len(agents) == 1:
                 # only one agent can execute the function
                 return agents[0], agents
@@ -170,7 +180,7 @@ def _prepare_and_select_agents(self, last_speaker: Agent) -> Tuple[Optional[Agen
                     return agents[0], agents
                 elif not agents:
                     raise ValueError(
-                        f"No agent can execute the function {self.messages[-1]['function_call']['name']}. "
+                        f"No agent can execute the function {', '.join(funcs)}. "
                         "Please check the function_map of the agents."
                     )
         # remove the last speaker from the list to avoid selecting the same speaker if allow_repeat_speaker is False
@@ -193,7 +203,14 @@ def select_speaker(self, last_speaker: Agent, selector: ConversableAgent):
             return selected_agent
         # auto speaker selection
         selector.update_system_message(self.select_speaker_msg(agents))
-        context = self.messages + [{"role": "system", "content": self.select_speaker_prompt(agents)}]
+
+        # If last message is a tool call or function call, blank the call so the api doesn't throw
+        messages = self.messages.copy()
+        if messages[-1].get("function_call", False):
+            messages[-1] = dict(messages[-1], function_call=None)
+        if messages[-1].get("tool_calls", False):
+            messages[-1] = dict(messages[-1], tool_calls=None)
+        context = messages + [{"role": "system", "content": self.select_speaker_prompt(agents)}]
         final, name = selector.generate_oai_reply(context)
 
         if not final:
@@ -275,6 +292,8 @@ def _mentioned_agents(self, message_content: Union[str, List], agents: List[Agen
             Dict: a counter for mentioned agents.
         """
         # Cast message content to str
+        if isinstance(message_content, dict):
+            message_content = message_content["content"]
         message_content = content_str(message_content)
 
         mentions = dict()

autogen/function_utils.py

@@ -103,6 +103,13 @@ class Function(BaseModel):
     parameters: Annotated[Parameters, Field(description="Parameters of the function")]
 
 
+class ToolFunction(BaseModel):
+    """A function under tool as defined by the OpenAI API."""
+
+    type: Literal["function"] = "function"
+    function: Annotated[Function, Field(description="Function under tool")]
+
+
 def get_parameter_json_schema(
     k: str, v: Union[Annotated[Type, str], Type], default_values: Dict[str, Any]
 ) -> JsonSchemaValue:
@@ -260,10 +267,12 @@ def f(a: Annotated[str, "Parameter a"], b: int = 2, c: Annotated[float, "Paramet
 
     parameters = get_parameters(required, param_annotations, default_values=default_values)
 
-    function = Function(
-        description=description,
-        name=fname,
-        parameters=parameters,
+    function = ToolFunction(
+        function=Function(
+            description=description,
+            name=fname,
+            parameters=parameters,
+        )
     )
 
     return model_dump(function)

autogen/oai/client.py

@@ -287,9 +287,9 @@ def yes_or_no_filter(context, response):
 
     def _completions_create(self, client, params):
         completions = client.chat.completions if "messages" in params else client.completions
-        # If streaming is enabled, has messages, and does not have functions, then
+        # If streaming is enabled, has messages, and does not have functions or tools, then
         # iterate over the chunks of the response
-        if params.get("stream", False) and "messages" in params and "functions" not in params:
+        if params.get("stream", False) and "messages" in params and "functions" not in params and "tools" not in params:
             response_contents = [""] * params.get("n", 1)
             finish_reasons = [""] * params.get("n", 1)
             completion_tokens = 0
@@ -352,8 +352,8 @@ def _completions_create(self, client, params):
 
                 response.choices.append(choice)
         else:
-            # If streaming is not enabled or using functions, send a regular chat completion request
-            # Functions are not supported, so ensure streaming is disabled
+            # If streaming is not enabled, using functions, or tools, send a regular chat completion request
+            # Functions and Tools are not supported, so ensure streaming is disabled
             params = params.copy()
             params["stream"] = False
             response = completions.create(**params)

notebook/agentchat_function_call_currency_calculator.ipynb

@@ -185,20 +185,21 @@
     {
      "data": {
       "text/plain": [
-       "[{'description': 'Currency exchange calculator.',\n",
-       "  'name': 'currency_calculator',\n",
-       "  'parameters': {'type': 'object',\n",
-       "   'properties': {'base_amount': {'type': 'number',\n",
-       "     'description': 'Amount of currency in base_currency'},\n",
-       "    'base_currency': {'enum': ['USD', 'EUR'],\n",
-       "     'type': 'string',\n",
-       "     'default': 'USD',\n",
-       "     'description': 'Base currency'},\n",
-       "    'quote_currency': {'enum': ['USD', 'EUR'],\n",
-       "     'type': 'string',\n",
-       "     'default': 'EUR',\n",
-       "     'description': 'Quote currency'}},\n",
-       "   'required': ['base_amount']}}]"
+       "[{'type': 'function',\n",
+       "  'function': {'description': 'Currency exchange calculator.',\n",
+       "   'name': 'currency_calculator',\n",
+       "   'parameters': {'type': 'object',\n",
+       "    'properties': {'base_amount': {'type': 'number',\n",
+       "      'description': 'Amount of currency in base_currency'},\n",
+       "     'base_currency': {'enum': ['USD', 'EUR'],\n",
+       "      'type': 'string',\n",
+       "      'default': 'USD',\n",
+       "      'description': 'Base currency'},\n",
+       "     'quote_currency': {'enum': ['USD', 'EUR'],\n",
+       "      'type': 'string',\n",
+       "      'default': 'EUR',\n",
+       "      'description': 'Quote currency'}},\n",
+       "    'required': ['base_amount']}}}]"
       ]
      },
      "execution_count": 4,
@@ -207,7 +208,7 @@
     }
    ],
    "source": [
-    "chatbot.llm_config[\"functions\"]"
+    "chatbot.llm_config[\"tools\"]"
    ]
   },
   {
@@ -259,10 +260,14 @@
       "--------------------------------------------------------------------------------\n",
       "\u001b[33mchatbot\u001b[0m (to user_proxy):\n",
       "\n",
-      "\u001b[32m***** Suggested function Call: currency_calculator *****\u001b[0m\n",
+      "\u001b[32m***** Suggested tool Call (call_2mZCDF9fe8WJh6SveIwdGGEy): currency_calculator *****\u001b[0m\n",
       "Arguments: \n",
-      "{\"base_amount\":123.45,\"base_currency\":\"USD\",\"quote_currency\":\"EUR\"}\n",
-      "\u001b[32m********************************************************\u001b[0m\n",
+      "{\n",
+      "  \"base_amount\": 123.45,\n",
+      "  \"base_currency\": \"USD\",\n",
+      "  \"quote_currency\": \"EUR\"\n",
+      "}\n",
+      "\u001b[32m************************************************************************************\u001b[0m\n",
       "\n",
       "--------------------------------------------------------------------------------\n",
       "\u001b[35m\n",
@@ -276,7 +281,7 @@
       "--------------------------------------------------------------------------------\n",
       "\u001b[33mchatbot\u001b[0m (to user_proxy):\n",
       "\n",
-      "123.45 USD is equivalent to approximately 112.23 EUR.\n",
+      "123.45 USD is approximately 112.23 EUR.\n",
       "\n",
       "--------------------------------------------------------------------------------\n",
       "\u001b[33muser_proxy\u001b[0m (to chatbot):\n",
@@ -370,27 +375,28 @@
     {
      "data": {
       "text/plain": [
-       "[{'description': 'Currency exchange calculator.',\n",
-       "  'name': 'currency_calculator',\n",
-       "  'parameters': {'type': 'object',\n",
-       "   'properties': {'base': {'properties': {'currency': {'description': 'Currency symbol',\n",
-       "       'enum': ['USD', 'EUR'],\n",
-       "       'title': 'Currency',\n",
-       "       'type': 'string'},\n",
-       "      'amount': {'default': 0,\n",
-       "       'description': 'Amount of currency',\n",
-       "       'minimum': 0.0,\n",
-       "       'title': 'Amount',\n",
-       "       'type': 'number'}},\n",
-       "     'required': ['currency'],\n",
-       "     'title': 'Currency',\n",
-       "     'type': 'object',\n",
-       "     'description': 'Base currency: amount and currency symbol'},\n",
-       "    'quote_currency': {'enum': ['USD', 'EUR'],\n",
-       "     'type': 'string',\n",
-       "     'default': 'USD',\n",
-       "     'description': 'Quote currency symbol'}},\n",
-       "   'required': ['base']}}]"
+       "[{'type': 'function',\n",
+       "  'function': {'description': 'Currency exchange calculator.',\n",
+       "   'name': 'currency_calculator',\n",
+       "   'parameters': {'type': 'object',\n",
+       "    'properties': {'base': {'properties': {'currency': {'description': 'Currency symbol',\n",
+       "        'enum': ['USD', 'EUR'],\n",
+       "        'title': 'Currency',\n",
+       "        'type': 'string'},\n",
+       "       'amount': {'default': 0,\n",
+       "        'description': 'Amount of currency',\n",
+       "        'minimum': 0.0,\n",
+       "        'title': 'Amount',\n",
+       "        'type': 'number'}},\n",
+       "      'required': ['currency'],\n",
+       "      'title': 'Currency',\n",
+       "      'type': 'object',\n",
+       "      'description': 'Base currency: amount and currency symbol'},\n",
+       "     'quote_currency': {'enum': ['USD', 'EUR'],\n",
+       "      'type': 'string',\n",
+       "      'default': 'USD',\n",
+       "      'description': 'Quote currency symbol'}},\n",
+       "    'required': ['base']}}}]"
       ]
      },
      "execution_count": 8,
@@ -399,7 +405,7 @@
     }
    ],
    "source": [
-    "chatbot.llm_config[\"functions\"]"
+    "chatbot.llm_config[\"tools\"]"
    ]
   },
   {
@@ -419,10 +425,16 @@
       "--------------------------------------------------------------------------------\n",
       "\u001b[33mchatbot\u001b[0m (to user_proxy):\n",
       "\n",
-      "\u001b[32m***** Suggested function Call: currency_calculator *****\u001b[0m\n",
+      "\u001b[32m***** Suggested tool Call (call_MLtsPcVJXhdpvDPNNxfTB3OB): currency_calculator *****\u001b[0m\n",
       "Arguments: \n",
-      "{\"base\":{\"currency\":\"EUR\",\"amount\":112.23},\"quote_currency\":\"USD\"}\n",
-      "\u001b[32m********************************************************\u001b[0m\n",
+      "{\n",
+      "  \"base\": {\n",
+      "    \"currency\": \"EUR\",\n",
+      "    \"amount\": 112.23\n",
+      "  },\n",
+      "  \"quote_currency\": \"USD\"\n",
+      "}\n",
+      "\u001b[32m************************************************************************************\u001b[0m\n",
       "\n",
       "--------------------------------------------------------------------------------\n",
       "\u001b[35m\n",
@@ -436,7 +448,7 @@
       "--------------------------------------------------------------------------------\n",
       "\u001b[33mchatbot\u001b[0m (to user_proxy):\n",
       "\n",
-      "112.23 Euros is equivalent to approximately 123.45 US Dollars.\n",
+      "112.23 Euros is approximately 123.45 US Dollars.\n",
       "\n",
       "--------------------------------------------------------------------------------\n",
       "\u001b[33muser_proxy\u001b[0m (to chatbot):\n",
@@ -477,10 +489,16 @@
       "--------------------------------------------------------------------------------\n",
       "\u001b[33mchatbot\u001b[0m (to user_proxy):\n",
       "\n",
-      "\u001b[32m***** Suggested function Call: currency_calculator *****\u001b[0m\n",
+      "\u001b[32m***** Suggested tool Call (call_WrBjnoLeXilBPuj9nTJLM5wh): currency_calculator *****\u001b[0m\n",
       "Arguments: \n",
-      "{\"base\":{\"currency\":\"USD\",\"amount\":123.45},\"quote_currency\":\"EUR\"}\n",
-      "\u001b[32m********************************************************\u001b[0m\n",
+      "{\n",
+      "  \"base\": {\n",
+      "    \"currency\": \"USD\",\n",
+      "    \"amount\": 123.45\n",
+      "  },\n",
+      "  \"quote_currency\": \"EUR\"\n",
+      "}\n",
+      "\u001b[32m************************************************************************************\u001b[0m\n",
       "\n",
       "--------------------------------------------------------------------------------\n",
       "\u001b[35m\n",
@@ -543,7 +561,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.13"
+   "version": "3.11.6"
   }
  },
  "nbformat": 4,