refine code

metagpt/actions/write_code_an_draft.py

@@ -5,7 +5,7 @@
 @File    : write_review.py
 """
 import asyncio
-from typing import List
+from typing import List, Literal
 
 from metagpt.actions import Action
 from metagpt.actions.action_node import ActionNode
@@ -21,16 +21,15 @@ REVIEW = ActionNode(
     ],
 )
 
-LGTM = ActionNode(
-    key="LGTM",
-    expected_type=str,
-    instruction="LGTM/LBTM. If the code is fully implemented, "
-    "give a LGTM (Looks Good To Me), otherwise provide a LBTM (Looks Bad To Me).",
+REVIEW_RESULT = ActionNode(
+    key="ReviewResult",
+    expected_type=Literal["LGTM", "LBTM"],
+    instruction="LGTM/LBTM. If the code is fully implemented, " "give a LGTM, otherwise provide a LBTM.",
     example="LBTM",
 )
 
-ACTIONS = ActionNode(
-    key="Actions",
+NEXT_STEPS = ActionNode(
+    key="NextSteps",
     expected_type=str,
     instruction="Based on the code review outcome, suggest actionable steps. This can include code changes, "
     "refactoring suggestions, or any follow-up tasks.",
@@ -69,7 +68,7 @@ WRITE_DRAFT = ActionNode(
 )
 
 
-WRITE_MOVE_FUNCTION = ActionNode(
+WRITE_FUNCTION = ActionNode(
     key="WriteFunction",
     expected_type=str,
     instruction="write code for the function not implemented.",
@@ -555,8 +554,8 @@ LBTM
 """
 
 
-WRITE_CODE_NODE = ActionNode.from_children("WRITE_REVIEW_NODE", [REVIEW, LGTM, ACTIONS])
-WRITE_MOVE_NODE = ActionNode.from_children("WRITE_MOVE_NODE", [WRITE_DRAFT, WRITE_MOVE_FUNCTION])
+WRITE_CODE_NODE = ActionNode.from_children("WRITE_REVIEW_NODE", [REVIEW, REVIEW_RESULT, NEXT_STEPS])
+WRITE_MOVE_NODE = ActionNode.from_children("WRITE_MOVE_NODE", [WRITE_DRAFT, WRITE_FUNCTION])
 
 
 CR_FOR_MOVE_FUNCTION_BY_3 = """
@@ -579,8 +578,7 @@ class WriteCodeAN(Action):
 
     async def run(self, context):
         self.llm.system_prompt = "You are an outstanding engineer and can implement any code"
-        return await WRITE_MOVE_FUNCTION.fill(context=context, llm=self.llm, schema="json")
-        # return await WRITE_CODE_NODE.fill(context=context, llm=self.llm, schema="markdown")
+        return await WRITE_MOVE_NODE.fill(context=context, llm=self.llm, schema="json")
 
 
 async def main():

metagpt/config2.py

@@ -84,7 +84,7 @@ class Config(CLIParams, YamlModel):
     @classmethod
     def from_home(cls, path):
         """Load config from ~/.metagpt/config.yaml"""
-        return Config.model_validate_yaml(CONFIG_ROOT / path)
+        return Config.from_yaml_file(CONFIG_ROOT / path)
 
     @classmethod
     def default(cls):

metagpt/utils/yaml_model.py

@@ -23,10 +23,10 @@ class YamlModel(BaseModel):
             return yaml.safe_load(file)
 
     @classmethod
-    def model_validate_yaml(cls, file_path: Path) -> "YamlModel":
+    def from_yaml_file(cls, file_path: Path) -> "YamlModel":
         return cls(**cls.read_yaml(file_path))
 
-    def model_dump_yaml(self, file_path: Path) -> None:
+    def to_yaml_file(self, file_path: Path) -> None:
         with open(file_path, "w") as file:
             yaml.dump(self.model_dump(), file)