remove Dict, use direct LLMConfig / Browser. / Search. / Mermaid. instead

metagpt/tools/search_engine_googleapi.py

@@ -35,7 +35,7 @@ class GoogleAPIWrapper(BaseModel):
     @field_validator("google_api_key", mode="before")
     @classmethod
     def check_google_api_key(cls, val: str):
-        val = val or config.search["google"].api_key
+        val = val or config.search.api_key
         if not val:
             raise ValueError(
                 "To use, make sure you provide the google_api_key when constructing an object. Alternatively, "
@@ -47,7 +47,7 @@ class GoogleAPIWrapper(BaseModel):
     @field_validator("google_cse_id", mode="before")
     @classmethod
     def check_google_cse_id(cls, val: str):
-        val = val or config.search["google"].cse_id
+        val = val or config.search.cse_id
         if not val:
             raise ValueError(
                 "To use, make sure you provide the google_cse_id when constructing an object. Alternatively, "

metagpt/tools/search_engine_serpapi.py

@@ -32,7 +32,7 @@ class SerpAPIWrapper(BaseModel):
     @field_validator("serpapi_api_key", mode="before")
     @classmethod
     def check_serpapi_api_key(cls, val: str):
-        val = val or config.search["serpapi"].api_key
+        val = val or config.search.api_key
         if not val:
             raise ValueError(
                 "To use, make sure you provide the serpapi_api_key when constructing an object. Alternatively, "

metagpt/tools/search_engine_serper.py

@@ -25,7 +25,7 @@ class SerperWrapper(BaseModel):
     @field_validator("serper_api_key", mode="before")
     @classmethod
     def check_serper_api_key(cls, val: str):
-        val = val or config.search["serper"].api_key
+        val = val or config.search.api_key
         if not val:
             raise ValueError(
                 "To use, make sure you provide the serper_api_key when constructing an object. Alternatively, "

metagpt/tools/ut_writer.py

@@ -282,6 +282,6 @@ class UTGenerator:
         """Choose based on different calling methods"""
         result = ""
         if self.chatgpt_method == "API":
-            result = await GPTAPI(config.get_llm_config()).aask_code(messages=messages)
+            result = await GPTAPI(config.get_openai_llm()).aask_code(messages=messages)
 
         return result

metagpt/tools/web_browser_engine_playwright.py

@@ -28,12 +28,10 @@ class PlaywrightWrapper:
 
     def __init__(
         self,
-        browser_type: Literal["chromium", "firefox", "webkit"] | None = None,
+        browser_type: Literal["chromium", "firefox", "webkit"] | None = "chromium",
         launch_kwargs: dict | None = None,
         **kwargs,
     ) -> None:
-        if browser_type is None:
-            browser_type = config.browser["playwright"].driver
         self.browser_type = browser_type
         launch_kwargs = launch_kwargs or {}
         if config.proxy and "proxy" not in launch_kwargs: