A programming framework for agentic AI
Fix some type annotations and edge cases (#572)
spored3401599bd4c
diff --git a/autogen/agentchat/assistant_agent.py b/autogen/agentchat/assistant_agent.pyindex 4a0200fb6..b39b5f75f 100644--- a/autogen/agentchat/assistant_agent.py+++ b/autogen/agentchat/assistant_agent.py@@ -1,5 +1,5 @@from .conversable_agent import ConversableAgent-from typing import Callable, Dict, Optional, Union+from typing import Callable, Dict, Literal, Optional, Unionclass AssistantAgent(ConversableAgent):@@ -30,11 +30,11 @@ Reply "TERMINATE" in the end when everything is done.self,name: str,system_message: Optional[str] = DEFAULT_SYSTEM_MESSAGE,- llm_config: Optional[Union[Dict, bool]] = None,+ llm_config: Optional[Union[Dict, Literal[False]]] = None,is_termination_msg: Optional[Callable[[Dict], bool]] = None,max_consecutive_auto_reply: Optional[int] = None,human_input_mode: Optional[str] = "NEVER",- code_execution_config: Optional[Union[Dict, bool]] = False,+ code_execution_config: Optional[Union[Dict, Literal[False]]] = False,**kwargs,):"""diff --git a/autogen/agentchat/conversable_agent.py b/autogen/agentchat/conversable_agent.pyindex eec164ce8..ab222662e 100644--- a/autogen/agentchat/conversable_agent.py+++ b/autogen/agentchat/conversable_agent.py@@ -3,7 +3,7 @@ from collections import defaultdictimport copyimport jsonimport logging-from typing import Any, Callable, Dict, List, Optional, Tuple, Type, Union+from typing import Any, Callable, Dict, List, Literal, Optional, Tuple, Type, Unionfrom autogen import OpenAIWrapperfrom .agent import Agentfrom autogen.code_utils import (@@ -45,6 +45,8 @@ class ConversableAgent(Agent):}MAX_CONSECUTIVE_AUTO_REPLY = 100 # maximum number of consecutive auto replies (subject to future change)+ llm_config: Union[Dict, Literal[False]]+def __init__(self,name: str,@@ -53,8 +55,8 @@ class ConversableAgent(Agent):max_consecutive_auto_reply: Optional[int] = None,human_input_mode: Optional[str] = "TERMINATE",function_map: Optional[Dict[str, Callable]] = None,- code_execution_config: Optional[Union[Dict, bool]] = None,- llm_config: Optional[Union[Dict, bool]] = None,+ code_execution_config: Optional[Union[Dict, Literal[False]]] = None,+ llm_config: Optional[Union[Dict, Literal[False]]] = None,default_auto_reply: Optional[Union[str, Dict, None]] = "",):"""@@ -114,7 +116,9 @@ class ConversableAgent(Agent):self.llm_config.update(llm_config)self.client = OpenAIWrapper(**self.llm_config)- self._code_execution_config = {} if code_execution_config is None else code_execution_config+ self._code_execution_config: Union[Dict, Literal[False]] = (+ {} if code_execution_config is None else code_execution_config+ )self.human_input_mode = human_input_modeself._max_consecutive_auto_reply = (max_consecutive_auto_reply if max_consecutive_auto_reply is not None else self.MAX_CONSECUTIVE_AUTO_REPLY@@ -135,7 +139,7 @@ class ConversableAgent(Agent):self,trigger: Union[Type[Agent], str, Agent, Callable[[Agent], bool], List],reply_func: Callable,- position: Optional[int] = 0,+ position: int = 0,config: Optional[Any] = None,reset_config: Optional[Callable] = None,):@@ -162,7 +166,7 @@ class ConversableAgent(Agent):messages: Optional[List[Dict]] = None,sender: Optional[Agent] = None,config: Optional[Any] = None,- ) -> Union[str, Dict, None]:+ ) -> Tuple[bool, Union[str, Dict, None]]:```position (int): the position of the reply function in the reply function list.The function registered later will be checked earlier by default.@@ -221,7 +225,7 @@ class ConversableAgent(Agent):"""A dictionary of conversations from agent to list of messages."""return self._oai_messages- def last_message(self, agent: Optional[Agent] = None) -> Dict:+ def last_message(self, agent: Optional[Agent] = None) -> Optional[Dict]:"""The last message exchanged with the agent.Args:@@ -304,7 +308,7 @@ class ConversableAgent(Agent):recipient: Agent,request_reply: Optional[bool] = None,silent: Optional[bool] = False,- ) -> bool:+ ):"""Send a message to another agent.Args:@@ -353,7 +357,7 @@ class ConversableAgent(Agent):recipient: Agent,request_reply: Optional[bool] = None,silent: Optional[bool] = False,- ) -> bool:+ ):"""(async) Send a message to another agent.Args:@@ -399,6 +403,8 @@ class ConversableAgent(Agent):def _print_received_message(self, message: Union[Dict, str], sender: Agent):# print the message receivedprint(colored(sender.name, "yellow"), "(to", f"{self.name}):\n", flush=True)+ message = self._message_to_dict(message)+if message.get("role") == "function":func_print = f"***** Response from calling function \"{message['name']}\" *****"print(colored(func_print, "green"), flush=True)@@ -606,7 +612,7 @@ class ConversableAgent(Agent):self,messages: Optional[List[Dict]] = None,sender: Optional[Agent] = None,- config: Optional[Any] = None,+ config: Optional[OpenAIWrapper] = None,) -> Tuple[bool, Union[str, Dict, None]]:"""Generate a reply using autogen.oai."""client = self.client if config is None else config@@ -625,7 +631,7 @@ class ConversableAgent(Agent):self,messages: Optional[List[Dict]] = None,sender: Optional[Agent] = None,- config: Optional[Any] = None,+ config: Optional[Union[Dict, Literal[False]]] = None,):"""Generate a reply using code execution."""code_execution_config = config if config is not None else self._code_execution_configdiff --git a/autogen/agentchat/groupchat.py b/autogen/agentchat/groupchat.pyindex 604eb5c20..e5a66438d 100644--- a/autogen/agentchat/groupchat.py+++ b/autogen/agentchat/groupchat.py@@ -1,9 +1,10 @@-from dataclasses import dataclass+import loggingimport sys+from dataclasses import dataclassfrom typing import Dict, List, Optional, Union+from .agent import Agentfrom .conversable_agent import ConversableAgent-import logginglogger = logging.getLogger(__name__)diff --git a/autogen/agentchat/user_proxy_agent.py b/autogen/agentchat/user_proxy_agent.pyindex d72c2bdce..8a218b1fe 100644--- a/autogen/agentchat/user_proxy_agent.py+++ b/autogen/agentchat/user_proxy_agent.py@@ -1,5 +1,5 @@from .conversable_agent import ConversableAgent-from typing import Callable, Dict, Optional, Union+from typing import Callable, Dict, Literal, Optional, Unionclass UserProxyAgent(ConversableAgent):@@ -22,9 +22,9 @@ class UserProxyAgent(ConversableAgent):max_consecutive_auto_reply: Optional[int] = None,human_input_mode: Optional[str] = "ALWAYS",function_map: Optional[Dict[str, Callable]] = None,- code_execution_config: Optional[Union[Dict, bool]] = None,+ code_execution_config: Optional[Union[Dict, Literal[False]]] = None,default_auto_reply: Optional[Union[str, Dict, None]] = "",- llm_config: Optional[Union[Dict, bool]] = False,+ llm_config: Optional[Union[Dict, Literal[False]]] = False,system_message: Optional[str] = "",):"""