Merge branch 'mgx_ops' of gitlab.deepwisdomai.com:pub/MetaGPT into mgx_ops

metagpt/tools/libs/browser.py

@@ -12,6 +12,7 @@ from playwright.async_api import (
     Request,
     async_playwright,
 )
+from pydantic import BaseModel, ConfigDict, Field
 
 from metagpt.tools.tool_registry import register_tool
 from metagpt.utils.a11y_tree import (
@@ -43,7 +44,7 @@ from metagpt.utils.report import BrowserReporter
         "type",
     ],
 )
-class Browser:
+class Browser(BaseModel):
     """A tool for browsing the web. Don't initialize a new instance of this class if one already exists.
 
     Note: If you plan to use the browser to assist you in completing tasks, then using the browser should be a standalone
@@ -66,16 +67,17 @@ class Browser:
     >>> await browser.close_tab()
     """
 
-    def __init__(self):
-        self.playwright: Optional[Playwright] = None
-        self.browser_instance: Optional[Browser_] = None
-        self.browser_ctx: Optional[BrowserContext] = None
-        self.page: Optional[Page] = None
-        self.accessibility_tree: list = []
-        self.headless: bool = True
-        self.proxy = get_proxy_from_env()
-        self.is_empty_page = True
-        self.reporter = BrowserReporter()
+    model_config = ConfigDict(arbitrary_types_allowed=True)
+
+    playwright: Optional[Playwright] = None
+    browser_instance: Optional[Browser_] = None
+    browser_ctx: Optional[BrowserContext] = None
+    page: Optional[Page] = None
+    accessibility_tree: list = Field(default_factory=list)
+    headless: bool = True
+    proxy: Optional[str] = Field(default_factory=get_proxy_from_env)
+    is_empty_page: bool = True
+    reporter: BrowserReporter = Field(default_factory=BrowserReporter)
 
     async def start(self) -> None:
         """Starts Playwright and launches a browser"""

metagpt/tools/libs/editor.py

@@ -5,9 +5,8 @@ import subprocess
 from pathlib import Path
 from typing import List, Optional, Union
 
-from pydantic import BaseModel
+from pydantic import BaseModel, ConfigDict
 
-from metagpt.const import DEFAULT_WORKSPACE_ROOT
 from metagpt.logs import logger
 from metagpt.tools.tool_registry import register_tool
 from metagpt.utils import read_docx
@@ -24,12 +23,12 @@ class FileBlock(BaseModel):
 
 
 @register_tool()
-class Editor:
+class Editor(BaseModel):
     """A tool for reading, understanding, writing, and editing files"""
 
-    def __init__(self) -> None:
-        print(f"Editor initialized with root path at: {DEFAULT_WORKSPACE_ROOT}")
-        self.resource = EditorReporter()
+    model_config = ConfigDict(arbitrary_types_allowed=True)
+
+    resource: EditorReporter = EditorReporter()
 
     def write(self, path: str, content: str):
         """Write the whole content to a file. When used, make sure content arg contains the full content of the file."""

metagpt/tools/tool_recommend.py

@@ -64,6 +64,10 @@ class ToolRecommender(BaseModel):
     @field_validator("tools", mode="before")
     @classmethod
     def validate_tools(cls, v: list[str]) -> dict[str, Tool]:
+        # If `v` is already a dictionary (e.g., during deserialization), return it as is.
+        if isinstance(v, dict):
+            return v
+
         # One can use special symbol ["<all>"] to indicate use of all registered tools
         if v == ["<all>"]:
             return TOOL_REGISTRY.get_all_tools()