From ef3563500f9aa409f7a35df89ebed49e014d0185 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8E=98=E6=9D=83=20=E9=A9=AC?= Date: Sun, 7 Apr 2024 13:12:34 +0800 Subject: [PATCH] fixbug: type error --- metagpt/actions/di/detect_intent.py | 24 ++++--------------- metagpt/roles/di/mgx.py | 3 +-- .../metagpt/actions/di/test_detect_intent.py | 3 ++- 3 files changed, 7 insertions(+), 23 deletions(-) diff --git a/metagpt/actions/di/detect_intent.py b/metagpt/actions/di/detect_intent.py index d41317321..ba42660b6 100644 --- a/metagpt/actions/di/detect_intent.py +++ b/metagpt/actions/di/detect_intent.py @@ -1,12 +1,12 @@ from __future__ import annotations -import asyncio from enum import Enum -from typing import Tuple +from typing import List, Tuple from pydantic import BaseModel from metagpt.actions import Action +from metagpt.schema import Message class SOPItemDef(BaseModel): @@ -89,9 +89,8 @@ You should follow the following Standard Operating Procedure: class DetectIntent(Action): - async def run(self, user_requirement: str) -> Tuple[str, str]: - if not isinstance(user_requirement, str): - raise ValueError(f"str type error: {user_requirement}") + async def run(self, user_msgs: List[Message]) -> Tuple[str, str]: + user_requirement = "\n".join([f"> {i.role}: {i.content}" for i in user_msgs]) intentions = "\n".join([f"{si.type_name}: {si.value.description}" for si in SOPItem]) prompt = DETECT_PROMPT.format(user_requirement=user_requirement, intentions=intentions) @@ -105,18 +104,3 @@ class DetectIntent(Action): ) return req_with_sop, sop_type - - -async def main(): - # Example usage of the DetectIntent action - user_requirements = ["Develop a 2048 game.", "Run data analysis on sklearn wine dataset"] - detect_intent = DetectIntent() - - for user_requirement in user_requirements: - req_with_sop, sop_type = await detect_intent.run(user_requirement) - print(req_with_sop) - print(f"Detected SOP Type: {sop_type}") - - -if __name__ == "__main__": - asyncio.run(main()) diff --git a/metagpt/roles/di/mgx.py b/metagpt/roles/di/mgx.py index 33377e5f1..b2caa930b 100644 --- a/metagpt/roles/di/mgx.py +++ b/metagpt/roles/di/mgx.py @@ -16,8 +16,7 @@ class MGX(DataInterpreter): async def _detect_intent(self, user_msgs: List[Message] = None, **kwargs): todo = DetectIntent(context=self.context) - user_requirement = "\n".join([f"> {i.role}: {i.content}" for i in user_msgs]) - request_with_sop, sop_type = await todo.run(user_requirement) + request_with_sop, sop_type = await todo.run(user_msgs) logger.info(f"{sop_type} {request_with_sop}") return request_with_sop diff --git a/tests/metagpt/actions/di/test_detect_intent.py b/tests/metagpt/actions/di/test_detect_intent.py index 7c9cf9eba..dfb25c343 100644 --- a/tests/metagpt/actions/di/test_detect_intent.py +++ b/tests/metagpt/actions/di/test_detect_intent.py @@ -1,6 +1,7 @@ import pytest from metagpt.actions.di.detect_intent import DetectIntent +from metagpt.schema import Message SOFTWARE_DEV_REQ1 = """ I'd like to create a personalized website that features the 'Game of Life' simulation. @@ -51,5 +52,5 @@ git clone 'https://github.com/spec-first/connexion' and format to MetaGPT projec ) async def test_detect_intent(requirement, expected_intent_type): di = DetectIntent() - _, intent_type = await di.run(requirement) + _, intent_type = await di.run([Message(role="user", content=requirement)]) assert intent_type == expected_intent_type