feat: add agent lifecycle hook trigger mechanism
This commit is contained in:
1 parent
64f408ba71
commit
e0e7487409
5 files changed
+169
-67
No files matched your search
+10
-4
@@ -1,6 +1,8 @@
|
||||
import json, re, os
|
||||
from dataclasses import dataclass
|
||||
from typing import Any, Optional
|
||||
try: from plugins.hooks import trigger as _hook
|
||||
except ImportError: _hook = lambda *a, **k: None
|
||||
@dataclass
|
||||
class StepOutcome:
|
||||
data: Any
|
||||
@@ -12,16 +14,14 @@ def try_call_generator(func, *args, **kwargs):
|
||||
return ret
|
||||
|
||||
class BaseHandler:
|
||||
def tool_before_callback(self, tool_name, args, response): pass
|
||||
def tool_after_callback(self, tool_name, args, response, ret): pass
|
||||
def turn_end_callback(self, response, tool_calls, tool_results, turn, next_prompt, exit_reason): return next_prompt
|
||||
def dispatch(self, tool_name, args, response, index=0, tool_num=1):
|
||||
method_name = f"do_{tool_name}"
|
||||
if hasattr(self, method_name):
|
||||
args['_index'] = index; args['_tool_num'] = tool_num
|
||||
prer = yield from try_call_generator(self.tool_before_callback, tool_name, args, response)
|
||||
_hook('tool_before', locals())
|
||||
ret = yield from try_call_generator(getattr(self, method_name), args, response)
|
||||
_ = yield from try_call_generator(self.tool_after_callback, tool_name, args, response, ret)
|
||||
_hook('tool_after', locals())
|
||||
return ret
|
||||
elif tool_name == 'bad_json': return StepOutcome(None, next_prompt=args.get('msg', 'bad_json'), should_exit=False)
|
||||
else:
|
||||
@@ -46,6 +46,7 @@ def agent_runner_loop(client, system_prompt, user_input, handler, tools_schema,
|
||||
{"role": "user", "content": initial_user_content if initial_user_content is not None else user_input}
|
||||
]
|
||||
turn = 0; handler.max_turns = max_turns
|
||||
_hook('agent_before', locals())
|
||||
while turn < handler.max_turns:
|
||||
turn += 1; turnstr = f'LLM Running (Turn {turn}) ...'
|
||||
if handler.parent.task_dir: turnstr = f'Turn {turn} ...'
|
||||
@@ -53,6 +54,8 @@ def agent_runner_loop(client, system_prompt, user_input, handler, tools_schema,
|
||||
if yield_info: yield {'turn': turn}
|
||||
yield f"\n\n{turnstr}\n\n"
|
||||
if turn%10 == 0: client.last_tools = '' # 每10轮重置一次工具描述
|
||||
_hook('turn_before', locals())
|
||||
_hook('llm_before', locals())
|
||||
response_gen = client.chat(messages=messages, tools=tools_schema)
|
||||
if verbose:
|
||||
response = yield from response_gen
|
||||
@@ -61,6 +64,7 @@ def agent_runner_loop(client, system_prompt, user_input, handler, tools_schema,
|
||||
response = exhaust(response_gen)
|
||||
cleaned = _clean_content(response.content)
|
||||
if cleaned: yield cleaned + '\n'
|
||||
_hook('llm_after', locals())
|
||||
|
||||
if not response.tool_calls: tool_calls = [{'tool_name': 'no_tool', 'args': {}}]
|
||||
else: tool_calls = [{'tool_name': tc.function.name, 'args': json.loads(tc.function.arguments), 'id': tc.id}
|
||||
@@ -96,8 +100,10 @@ def agent_runner_loop(client, system_prompt, user_input, handler, tools_schema,
|
||||
if len(handler._done_hooks) == 0 or exit_reason.get('result', '') == 'EXITED': break
|
||||
next_prompts.add(handler._done_hooks.pop(0))
|
||||
next_prompt = handler.turn_end_callback(response, tool_calls, tool_results, turn, '\n'.join(next_prompts), exit_reason)
|
||||
_hook('turn_after', locals())
|
||||
messages = [{"role": "user", "content": next_prompt, "tool_results": tool_results}] # just new message, history is kept in *Session
|
||||
if exit_reason: handler.turn_end_callback(response, tool_calls, tool_results, turn, '', exit_reason)
|
||||
_hook('agent_after', locals())
|
||||
return exit_reason or {'result': 'MAX_TURNS_EXCEEDED'}
|
||||
|
||||
def _clean_content(text):
|
||||
|
||||
Reference in new issue
Block a user