Properly working output handlers for Langchain & LlamaIndex agents #54
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
added 8 commits
June 21, 2024 13:46
whimo
reviewed
Jun 25, 2024
motleycrew/agents/crewai/crewai.py
Outdated
Comment on lines
113
to
118
| create_agent_executor = ModelField( | ||
| name="create_agent_executor", type_=Callable, class_validators={}, model_config=BaseConfig | ||
| ) | ||
| self._agent.__fields__["create_agent_executor"] = create_agent_executor | ||
| self._agent.create_agent_executor = self._create_agent_executor_decorator()( | ||
| self._agent.create_agent_executor) |
There was a problem hiding this comment.
Suggested change
| create_agent_executor = ModelField( | |
| name="create_agent_executor", type_=Callable, class_validators={}, model_config=BaseConfig | |
| ) | |
| self._agent.__fields__["create_agent_executor"] = create_agent_executor | |
| self._agent.create_agent_executor = self._create_agent_executor_decorator()( | |
| self._agent.create_agent_executor) | |
| object.__setattr__( | |
| self._agent, | |
| "create_agent_executor", | |
| self._create_agent_executor_decorator()(self._agent.create_agent_executor) | |
| ) |
whimo
reviewed
Jun 25, 2024
motleycrew/agents/mixins.py
Outdated
|
|
||
| class LangchainOutputHandlerMixin: | ||
|
|
||
| def agent_plane_decorator(self): |
There was a problem hiding this comment.
Suggested change
| def agent_plane_decorator(self): | |
| def agent_plan_decorator(self): |
whimo
reviewed
Jul 1, 2024
Comment on lines
17
to
41
| def _run_tool_direct_decorator(func: Callable): | ||
| """Decorator of the tool's _run method, for intercepting a DirectOutput exception""" | ||
|
|
||
| def wrapper(*args, **kwargs): | ||
| try: | ||
| result = func(*args, **kwargs) | ||
| except DirectOutput as direct_exc: | ||
| return direct_exc | ||
| return result | ||
|
|
||
| class LangchainMotleyAgent(MotleyAgentParent): | ||
| return wrapper | ||
|
|
||
|
|
||
| def run_tool_direct_decorator(func: Callable): | ||
| """Decorator of the tool's run method, for intercepting a DirectOutput exception""" | ||
|
|
||
| def wrapper(*args, **kwargs): | ||
| result = func(*args, **kwargs) | ||
| if isinstance(result, DirectOutput): | ||
| raise result | ||
| return result | ||
|
|
||
| return wrapper | ||
|
|
||
| class LangchainMotleyAgent(MotleyAgentParent, LangchainOutputHandlingAgentMixin): |
There was a problem hiding this comment.
Let's put these into LangchainOutputHandlingAgentMixin
whimo
reviewed
Jul 1, 2024
| object.__setattr__( | ||
| self._agent, | ||
| "_take_next_step", | ||
| self.take_next_step_decorator()(self._agent._take_next_step), |
There was a problem hiding this comment.
Let's make it self.take_next_step_decorator(self._agent._take_next_step), no need for another function layer here.
whimo
reviewed
Jul 1, 2024
| "Agent is not a Runnable, cannot patch it to force output via output handler" | ||
| ) | ||
| object.__setattr__( | ||
| self._agent.agent, "plan", self.agent_plan_decorator()(self._agent.agent.plan) |
whimo
reviewed
Jul 1, 2024
|
|
||
| prepared_output_handler = None | ||
| for tool in self.agent.tools: | ||
| if tool.name == "output_handler": |
There was a problem hiding this comment.
Suggested change
| if tool.name == "output_handler": | |
| if tool.name == self.output_handler.name: |
whimo
reviewed
Jul 1, 2024
motleycrew/agents/parent.py
Outdated
There was a problem hiding this comment.
No need for _run_and_catch_output here anymore, let's remove it
whimo
reviewed
Jul 1, 2024
motleycrew/agents/mixins.py
Outdated
| return AgentAction( | ||
| tool=self._agent_finish_blocker_tool.name, | ||
| tool_input=step.return_values, | ||
| log="\nUse tool: {}".format(self._agent_finish_blocker_tool.name), |
There was a problem hiding this comment.
Suggested change
| log="\nUse tool: {}".format(self._agent_finish_blocker_tool.name), | |
| log="\nDetected AgentFinish, blocking it to force output via output handler.\n", |
whimo
changed the title
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.
No description provided.