From 853f5fc40072f4c180d77022716fe25adce3423a Mon Sep 17 00:00:00 2001 From: zhanglei Date: Fri, 28 Jun 2024 15:36:57 +0800 Subject: [PATCH] =?UTF-8?q?update:=20=E5=A2=9E=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- metagpt/roles/di/data_analyst.py | 3 +++ metagpt/tools/tool_recommend.py | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/metagpt/roles/di/data_analyst.py b/metagpt/roles/di/data_analyst.py index 1f8bd0862..22afca1a6 100644 --- a/metagpt/roles/di/data_analyst.py +++ b/metagpt/roles/di/data_analyst.py @@ -86,6 +86,8 @@ class DataAnalyst(DataInterpreter): async with ThoughtReporter(enable_llm_stream=True): rsp = await self.llm.aask(context) + # 临时方案，待role zero的版本完成可将本注释内的代码直接替换掉 + # -------------开始--------------- try: commands = CodeParser.parse_code(block=None, lang="json", text=rsp) commands = json.loads(repair_llm_raw_output(output=commands, req_keys=[None], repair_type=RepairType.JSON)) @@ -99,6 +101,7 @@ class DataAnalyst(DataInterpreter): # 为了对LLM不按格式生成进行容错 if isinstance(commands, dict): commands = commands["commands"] if "commands" in commands else [commands] + # -------------结束--------------- self.rc.working_memory.add(Message(content=rsp, role="assistant")) await run_commands(self, commands, self.rc.working_memory) diff --git a/metagpt/tools/tool_recommend.py b/metagpt/tools/tool_recommend.py index 1e86b5d89..e92ae4bb5 100644 --- a/metagpt/tools/tool_recommend.py +++ b/metagpt/tools/tool_recommend.py @@ -136,6 +136,8 @@ class ToolRecommender(BaseModel): ) rsp = await LLM().aask(prompt, stream=False) + # 临时方案，待role zero的版本完成可将本注释内的代码直接替换掉 + # -------------开始--------------- try: ranked_tools = CodeParser.parse_code(block=None, lang="json", text=rsp) ranked_tools = json.loads(repair_llm_raw_output(output=ranked_tools, req_keys=[None], repair_type=RepairType.JSON)) @@ -149,6 +151,8 @@ class ToolRecommender(BaseModel): # 为了对LLM不按格式生成进行容错 if isinstance(ranked_tools, dict): ranked_tools = list(ranked_tools.values())[0] + # -------------结束--------------- + valid_tools = validate_tool_names(ranked_tools) return list(valid_tools.values())[:topk]