feat: ChatAgent refactoring
#1142
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Wendong-Fan
changed the title
ChatAgent refactoringChatAgent refactoring (Draft)
2 tasks
Wendong-Fan
changed the title
ChatAgent refactoring (Draft)ChatAgent refactoring
This was
linked to
issues
Nov 17, 2024
raywhoelse
reviewed
Nov 20, 2024
| @@ -172,6 +176,8 @@ def __init__( | |||
| self.role_type: RoleType = ( | |||
| getattr(system_message, 'role_type', None) or RoleType.ASSISTANT | |||
There was a problem hiding this comment.
'Assistant' or 'assistant' all of them is ok?
Comment on lines
+252
to
+276
| def add_tool( | ||
| self, tool: Union[FunctionTool, Callable], is_external: bool = False | ||
| ) -> None: | ||
| r"""Add a tool to the agent, specifying if it's an external tool.""" | ||
| initialized_tool = self._initialize_tools([tool]) | ||
|
|
||
| if is_external: | ||
| self.external_tools = ( | ||
| self.external_tools or [] | ||
| ) + initialized_tool | ||
| self.external_tool_names.extend( | ||
| tool.get_function_name() for tool in initialized_tool | ||
| ) | ||
| else: | ||
| self.tools = (self.tools or []) + initialized_tool | ||
|
|
||
| # Reinitialize func_dict to include all tools | ||
| self.all_tools = (self.tools or []) + (self.external_tools or []) | ||
| self.func_dict = { | ||
| tool.get_function_name(): tool.func for tool in self.all_tools | ||
| } | ||
| self.tool_dict = { | ||
| tool.get_function_name(): tool for tool in self.all_tools | ||
| } | ||
|
|
There was a problem hiding this comment.
def add_tool(
self, tool: Union[FunctionTool, Callable], is_external: bool = False
) -> None:
"""
Add a tool to the agent, specifying if it's an external tool.
Args:
tool: The tool to be added, either a FunctionTool instance or a callable.
is_external: Flag indicating if the tool is external.
"""
# Initialize the tool
initialized_tool = self._initialize_tools([tool])
# Helper function to merge tools
def merge_tools(existing_tools: List, new_tools: List) -> List:
return (existing_tools or []) + new_tools
# Update tools or external tools based on is_external flag
if is_external:
self.external_tools = merge_tools(self.external_tools, initialized_tool)
self.external_tool_names.extend(
tool.get_function_name() for tool in initialized_tool
)
else:
self.tools = merge_tools(self.tools, initialized_tool)
# Rebuild all_tools, func_dict, and tool_dict
self.all_tools = merge_tools(self.tools, self.external_tools)
self.func_dict = {tool.get_function_name(): tool.func for tool in self.all_tools}
self.tool_dict = {tool.get_function_name(): tool for tool in self.all_tools}
There was a problem hiding this comment.
code is ok, but it's not easy to read
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Refactor
ChatAgentstepmethod to make it more modularMotivation and Context
Types of changes
What types of changes does your code introduce? Put an
xin all the boxes that apply:Implemented Tasks
Checklist
Go over all the following points, and put an
xin all the boxes that apply.If you are unsure about any of these, don't hesitate to ask. We are here to help!