feat: upgrade metagp==0.6.5

app.py

@@ -19,7 +19,7 @@ import openai
 import tenacity
 import uvicorn
 from fastapi import FastAPI, Request
-from fastapi.responses import StreamingResponse, JSONResponse
+from fastapi.responses import JSONResponse, StreamingResponse
 from fastapi.staticfiles import StaticFiles
 from loguru import logger
 from metagpt.config import CONFIG
@@ -28,17 +28,17 @@ from metagpt.schema import Message
 from openai import OpenAI
 
 from data_model import (
-    NewMsg,
+    LLMAPIkeyTest,
     MessageJsonModel,
-    Sentences,
+    NewMsg,
     Sentence,
+    Sentences,
     SentenceType,
     SentenceValue,
     ThinkActPrompt,
-    LLMAPIkeyTest,
     ThinkActStep,
 )
-from message_enum import QueryAnswerType, MessageStatus
+from message_enum import MessageStatus, QueryAnswerType
 from software_company import RoleRun, SoftwareCompany
 
 
@@ -64,8 +64,10 @@ class Service:
                     Sentences(
                         contents=[
                             Sentence(
-                                type=SentenceType.TEXT.value, value=SentenceValue(answer=req_model.query), is_finished=True
-                            )
+                                type=SentenceType.TEXT.value,
+                                value=SentenceValue(answer=req_model.query),
+                                is_finished=True,
+                            ).model_dump()
                         ],
                         status=MessageStatus.COMPLETE.value,
                     )

data_model.py

@@ -4,7 +4,7 @@ from typing import Any, Optional, Union
 
 from metagpt.actions.action import Action
 from metagpt.actions.action_output import ActionOutput
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field, field_validator
 
 from message_enum import SentenceType
 
@@ -19,6 +19,13 @@ class Sentence(BaseModel):
     value: SentenceValue
     is_finished: Optional[bool] = None
 
+    @field_validator("id", mode="before")
+    @classmethod
+    def validate_credits(cls, v):
+        if isinstance(v, str):
+            return v
+        return str(v)
+
 
 class Sentences(BaseModel):
     id: Optional[str] = None
@@ -58,6 +65,13 @@ class ThinkActStep(BaseModel):
     description: str
     content: Sentence = None
 
+    @field_validator("id", mode="before")
+    @classmethod
+    def validate_credits(cls, v):
+        if isinstance(v, str):
+            return v
+        return str(v)
+
 
 class ThinkActPrompt(BaseModel):
     message_id: int = None

requirements.txt

@@ -3,4 +3,4 @@ aiozipstream==0.4
 aioboto3~=11.3.0
 fastapi
 uvicorn
-git+https://github.com/geekan/MetaGPT@6ba1a897c1a8077a86cf6e0da1fea0b53f828e5f
+metagpt==0.6.5

software_company.py

@@ -35,12 +35,16 @@ from zipstream import AioZipStream
 _default_llm_stream_log = partial(print, end="")
 
 
+class PackInfo(BaseModel):
+    url: str
+
+
 class RoleRun(Action):
     role: Role
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        action = self.role._rc.todo
+        action = self.role.rc.todo
         self.desc = f"{self.role.profile} {action.desc or str(action)}"
 
 
@@ -53,9 +57,10 @@ class PackProject(Action):
 
     async def run(self, key: str):
         url = await self.upload(key)
+        info = PackInfo(url=url)
         mdfile = MdUtils(None)
         mdfile.new_line(mdfile.new_inline_link(url, url.rsplit("/", 1)[-1]))
-        return ActionOutput(mdfile.get_md_text(), BaseModel())
+        return ActionOutput(mdfile.get_md_text(), info)
 
     async def upload(self, key: str):
         files = []
@@ -97,7 +102,7 @@ class SoftwareCompany(Role):
         BossRequirement -> WritePRD       -> WriteDesign -> WriteTasks     -> WriteCode ->
         """
         if self.finish:
-            self._rc.todo = None
+            self.rc.todo = None
             return False
 
         if self.git_repo is not None:
@@ -107,16 +112,16 @@ class SoftwareCompany(Role):
         for role in environment.roles.values():
             if await role._observe():
                 await role._think()
-                if isinstance(role._rc.todo, PrepareDocuments):
+                if isinstance(role.rc.todo, PrepareDocuments):
                     self.active_role = role
                     await self.act()
                     self.git_repo = CONFIG.git_repo
                     return await self._think()
 
-                if isinstance(role._rc.todo, SummarizeCode):
+                if isinstance(role.rc.todo, SummarizeCode):
                     return await self._think()
 
-                self._rc.todo = RoleRun(role=role)
+                self.rc.todo = RoleRun(role=role)
                 self.active_role = role
                 return True
 
@@ -129,15 +134,15 @@ class SoftwareCompany(Role):
             CONFIG.src_workspace = CONFIG.git_repo.workdir / CONFIG.git_repo.workdir.name
             CONFIG.max_auto_summarize_code = self.max_auto_summarize_code
 
-        if isinstance(self._rc.todo, PackProject):
+        if isinstance(self.rc.todo, PackProject):
             workdir = CONFIG.git_repo.workdir
             name = workdir.name
             uid = workdir.parent.name
             now = datetime.datetime.now().strftime("%Y%m%d%H%M%S")
             key = f"{uid}/metagpt-{name}-{now}.zip"
-            output = await self._rc.todo.run(key)
+            output = await self.rc.todo.run(key)
             self.finish = True
-            return Message(output.content, role=self.profile, cause_by=type(self._rc.todo))
+            return Message(output.content, role=self.profile, cause_by=type(self.rc.todo))
 
         default_log_stream = CONFIG.get("LLM_STREAM_LOG", _default_llm_stream_log)
 
@@ -344,7 +349,7 @@ class SoftwareCompany(Role):
 
     async def think(self):
         await self._think()
-        return self._rc.todo
+        return self.rc.todo
 
     async def act(self):
         return await self._act()
@@ -353,7 +358,7 @@ class SoftwareCompany(Role):
         stg_path = SERDESER_PATH.joinpath("software_company") if stg_path is None else stg_path
 
         team_info_path = stg_path.joinpath("software_company_info.json")
-        write_json_file(team_info_path, self.dict(exclude={"company": True}))
+        write_json_file(team_info_path, self.model_dump(exclude={"company": True}))
 
         self.company.serialize(stg_path.joinpath("company"))  # save company alone