gyt/opendan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
Liu Zhicong
2023-09-28 22:35:51 -07:00
parent ef36bc050b
commit b6a06c4150
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/aios_kernel/agent.py
+9 -7
View File
@@ -8,6 +8,7 @@ import time
import json import json
import shlex import shlex
import datetime import datetime
import copy
from .agent_message import AgentMsg, AgentMsgStatus, AgentMsgType,FunctionItem,LLMResult from .agent_message import AgentMsg, AgentMsgStatus, AgentMsgType,FunctionItem,LLMResult
from .chatsession import AIChatSession from .chatsession import AIChatSession
@@ -48,7 +49,7 @@ class AgentPrompt:
if prompt.system_message is not None: if prompt.system_message is not None:
if self.system_message is None: if self.system_message is None:
self.system_message = prompt.system_message self.system_message = copy.deepcopy(prompt.system_message)
else: else:
self.system_message["content"] += prompt.system_message.get("content") self.system_message["content"] += prompt.system_message.get("content")
@@ -105,7 +106,7 @@ class AIAgentTemplete:
class AIAgent: class AIAgent:
def __init__(self) -> None: def __init__(self) -> None:
self.prompt:AgentPrompt = None self.agent_prompt:AgentPrompt = None
self.llm_model_name:str = None self.llm_model_name:str = None
self.max_token_size:int = 3600 self.max_token_size:int = 3600
self.agent_id:str = None self.agent_id:str = None
@@ -136,7 +137,7 @@ class AIAgent:
result_agent.agent_id = "agent#" + uuid.uuid4().hex result_agent.agent_id = "agent#" + uuid.uuid4().hex
result_agent.fullname = fullname result_agent.fullname = fullname
result_agent.powerby = templete.author result_agent.powerby = templete.author
result_agent.prompt = templete.prompt result_agent.agent_prompt = templete.prompt
return result_agent return result_agent
def load_from_config(self,config:dict) -> bool: def load_from_config(self,config:dict) -> bool:
@@ -151,8 +152,8 @@ class AIAgent:
self.fullname = config["fullname"] self.fullname = config["fullname"]
if config.get("prompt") is not None: if config.get("prompt") is not None:
self.prompt = AgentPrompt() self.agent_prompt = AgentPrompt()
self.prompt.load_from_config(config["prompt"]) self.agent_prompt.load_from_config(config["prompt"])
if config.get("guest_prompt") is not None: if config.get("guest_prompt") is not None:
self.guest_prompt_str = config["guest_prompt"] self.guest_prompt_str = config["guest_prompt"]
@@ -350,7 +351,7 @@ class AIAgent:
return task_result.result_str,0 return task_result.result_str,0
async def _get_agent_prompt(self) -> AgentPrompt: async def _get_agent_prompt(self) -> AgentPrompt:
return self.prompt return self.agent_prompt
def _format_msg_by_env_value(self,prompt:AgentPrompt): def _format_msg_by_env_value(self,prompt:AgentPrompt):
if self.owner_env is None: if self.owner_env is None:
@@ -403,7 +404,8 @@ class AIAgent:
inner_func_call_node = result_message.get("function_call") inner_func_call_node = result_message.get("function_call")
if inner_func_call_node: if inner_func_call_node:
#TODO to save more token ,can i use msg_prompt? #TODO to save more token ,can i use msg_prompt?
final_result,error_code = await self._execute_func(inner_func_call_node,prompt,msg) call_prompt : AgentPrompt = copy.deepcopy(prompt)
final_result,error_code = await self._execute_func(inner_func_call_node,call_prompt,msg)
if error_code != 0: if error_code != 0:
error_resp = msg.create_error_resp(final_result) error_resp = msg.create_error_resp(final_result)
return error_resp return error_resp