From f9b1cce654e36ac764acd7db0b7d5c74404dc877 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=A3=92=E6=A3=92?= Date: Mon, 15 Jan 2024 22:21:56 +0800 Subject: [PATCH] update code-intepreter by auto aask. --- metagpt/actions/write_analysis_code.py | 2 +- metagpt/provider/openai_api.py | 23 +++++++++++++++++++++++ metagpt/roles/code_interpreter.py | 9 ++++++--- 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/metagpt/actions/write_analysis_code.py b/metagpt/actions/write_analysis_code.py index 76d47ba28..bceb100b1 100644 --- a/metagpt/actions/write_analysis_code.py +++ b/metagpt/actions/write_analysis_code.py @@ -88,7 +88,7 @@ class WriteCodeByGenerate(BaseWriteAnalysisCode): ) -> str: # context.append(Message(content=self.REUSE_CODE_INSTRUCTION, role="user")) prompt = self.process_msg(context, system_msg) - is_only_code = kwargs.pop("only_code", True) + is_only_code = kwargs.pop("only_code", False) code_content = await self.llm.aask_code(prompt, **kwargs) if is_only_code: diff --git a/metagpt/provider/openai_api.py b/metagpt/provider/openai_api.py index 66d215eda..7bdb4bfbe 100644 --- a/metagpt/provider/openai_api.py +++ b/metagpt/provider/openai_api.py @@ -154,7 +154,30 @@ class OpenAILLM(BaseLLM): return self._cons_kwargs(messages=messages, timeout=timeout, **kwargs) + def _process_message(self, messages: Union[str, Message, list[dict], list[Message], list[str]]) -> list[dict]: + """convert messages to list[dict].""" + # 全部转成list + if not isinstance(messages, list): + messages = [messages] + + # 转成list[dict] + processed_messages = [] + for msg in messages: + if isinstance(msg, str): + processed_messages.append({"role": "user", "content": msg}) + elif isinstance(msg, dict): + assert set(msg.keys()) == set(['role', 'content']) + processed_messages.append(msg) + elif isinstance(msg, Message): + processed_messages.append(msg.to_dict()) + else: + raise ValueError( + f"Only support message type are: str, Message, dict, but got {type(messages).__name__}!" + ) + return processed_messages + async def _achat_completion_function(self, messages: list[dict], timeout=3, **chat_configs) -> ChatCompletion: + messages = self._process_message(messages) kwargs = self._func_configs(messages=messages, timeout=timeout, **chat_configs) rsp: ChatCompletion = await self.aclient.chat.completions.create(**kwargs) self._update_costs(rsp.usage) diff --git a/metagpt/roles/code_interpreter.py b/metagpt/roles/code_interpreter.py index 164c7cb12..afd51a575 100644 --- a/metagpt/roles/code_interpreter.py +++ b/metagpt/roles/code_interpreter.py @@ -52,7 +52,7 @@ class CodeInterpreter(Role): async def _act_on_task(self, current_task: Task) -> TaskResult: code, result, is_success = await self._write_and_exec_code() - task_result = TaskResult(code=code, result=result, is_success=is_success) + task_result = TaskResult(code=code['code'], result=result, is_success=is_success) return task_result async def _write_and_exec_code(self, max_retry: int = 3): @@ -63,10 +63,10 @@ class CodeInterpreter(Role): ### write code ### code, cause_by = await self._write_code() - self.working_memory.add(Message(content=code, role="assistant", cause_by=cause_by)) + self.working_memory.add(Message(content=code['code'], role="assistant", cause_by=cause_by)) ### execute code ### - result, success = await self.execute_code.run(code) + result, success = await self.execute_code.run(**code) print(result) self.working_memory.add(Message(content=result, role="user", cause_by=ExecutePyCode)) @@ -91,6 +91,9 @@ class CodeInterpreter(Role): context = self.planner.get_useful_memories() code = await todo.run(context=context, plan=self.planner.plan, temperature=0.0) + # 暂时在这里转换 WriteCodeWithTools 的输出 + if isinstance(code, str): + code = {'code': code, 'language': 'python'} return code, todo