Merge branch 'main' into main

Author: Wendong-Fan

README.md

@@ -151,7 +151,7 @@ Employs a team of specialized AI agents that collaborate to solve complex tasks.
 Eigent pre-defined the following agent workers:
 
 - **Developer Agent:** Writes and executes code, runs terminal commands.
-- **Search Agent:** Searches the web and extracts content.
+- **Browser Agent:** Searches the web and extracts content.
 - **Document Agent:** Creates and manages documents.
 - **Multi-Modal Agent:** Processes images and audio.
 

README_JA.md

@@ -149,7 +149,7 @@ Eigentの強力な機能で卓越した生産性の可能性を最大限に引
 Eigentは以下のエージェントワーカーを事前定義しています：
 
 - **Developer Agent:** コードを書いて実行し、ターミナルコマンドを実行します。
-- **Search Agent:** ウェブを検索し、コンテンツを抽出します。
+- **Browser Agent:** ウェブを検索し、コンテンツを抽出します。
 - **Document Agent:** ドキュメントを作成・管理します。
 - **Multi-Modal Agent:** 画像と音声を処理します。
 

backend/app/controller/model_controller.py

@@ -1,6 +1,7 @@
 from fastapi import APIRouter, HTTPException
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field, field_validator
 from app.component.model_validation import create_agent
+from app.model.chat import PLATFORM_MAPPING
 from camel.types import ModelType
 from app.component.error_format import normalize_error_to_openai_format
 from utils import traceroot_wrapper as traceroot
@@ -19,6 +20,11 @@ class ValidateModelRequest(BaseModel):
     model_config_dict: dict | None = Field(None, description="Model config dict")
     extra_params: dict | None = Field(None, description="Extra model parameters")
 
+    @field_validator("model_platform")
+    @classmethod
+    def map_model_platform(cls, v: str) -> str:
+        return PLATFORM_MAPPING.get(v, v)
+
 
 class ValidateModelResponse(BaseModel):
     is_valid: bool = Field(..., description="Is valid")

backend/app/model/chat.py

@@ -34,6 +34,9 @@ class QuestionAnalysisResult(BaseModel):
 
 McpServers = dict[Literal["mcpServers"], dict[str, dict]]
 
+PLATFORM_MAPPING = {
+    "Z.ai": "openai-compatible-model",
+}
 
 class Chat(BaseModel):
     task_id: str
@@ -65,6 +68,11 @@ class Chat(BaseModel):
     extra_params: dict | None = None  # For provider-specific parameters like Azure
     search_config: dict[str, str] | None = None  # User-specific search engine configurations (e.g., GOOGLE_API_KEY, SEARCH_ENGINE_ID)
 
+    @field_validator("model_platform")
+    @classmethod
+    def map_model_platform(cls, v: str) -> str:
+        return PLATFORM_MAPPING.get(v, v)
+
     @field_validator("model_type")
     @classmethod
     def check_model_type(cls, model_type: str):

backend/app/service/chat_service.py

@@ -35,7 +35,7 @@
     developer_agent,
     document_agent,
     multi_modal_agent,
-    search_agent,
+    browser_agent,
     social_medium_agent,
     task_summary_agent,
     question_confirm_agent,
@@ -1332,13 +1332,13 @@ async def construct_workforce(options: Chat) -> tuple[Workforce, ListenChatAgent
     )
     # msg_toolkit = AgentCommunicationToolkit(max_message_history=100)
 
-    searcher = search_agent(options)
+    searcher = browser_agent(options)
     developer = await developer_agent(options)
     documenter = await document_agent(options)
     multi_modaler = multi_modal_agent(options)
 
     # msg_toolkit.register_agent("Worker", new_worker_agent)
-    # msg_toolkit.register_agent("Search_Agent", searcher)
+    # msg_toolkit.register_agent("Browser_Agent", searcher)
     # msg_toolkit.register_agent("Developer_Agent", developer)
     # msg_toolkit.register_agent("Document_Agent", documenter)
     # msg_toolkit.register_agent("Multi_Modal_Agent", multi_modaler)
@@ -1368,7 +1368,7 @@ async def construct_workforce(options: Chat) -> tuple[Workforce, ListenChatAgent
         developer,
     )
     workforce.add_single_agent_worker(
-        "Search Agent: Can search the web, extract webpage content, "
+        "Browser Agent: Can search the web, extract webpage content, "
         "simulate browser actions, and provide relevant information to "
         "solve the given task.",
         searcher,

backend/app/service/task.py

@@ -250,7 +250,7 @@ class Agents(str, Enum):
     coordinator_agent = "coordinator_agent"
     new_worker_agent = "new_worker_agent"
     developer_agent = "developer_agent"
-    search_agent = "search_agent"
+    browser_agent = "browser_agent"
     document_agent = "document_agent"
     multi_modal_agent = "multi_modal_agent"
     social_medium_agent = "social_medium_agent"

backend/app/utils/agent.py

@@ -844,11 +844,11 @@ async def developer_agent(options: Chat):
 
 
 @traceroot.trace()
-def search_agent(options: Chat):
+def browser_agent(options: Chat):
     working_directory = get_working_directory(options)
-    traceroot_logger.info(f"Creating search agent for project: {options.project_id} in directory: {working_directory}")
+    traceroot_logger.info(f"Creating browser agent for project: {options.project_id} in directory: {working_directory}")
     message_integration = ToolkitMessageIntegration(
-        message_handler=HumanToolkit(options.project_id, Agents.search_agent).send_message_to_user
+        message_handler=HumanToolkit(options.project_id, Agents.browser_agent).send_message_to_user
     )
 
     web_toolkit_custom = HybridBrowserToolkit(
@@ -878,10 +878,10 @@ def search_agent(options: Chat):
     # Save reference before registering for toolkits_to_register_agent
     web_toolkit_for_agent_registration = web_toolkit_custom
     web_toolkit_custom = message_integration.register_toolkits(web_toolkit_custom)
-    terminal_toolkit = TerminalToolkit(options.project_id, Agents.search_agent, safe_mode=True, clone_current_env=False)
+    terminal_toolkit = TerminalToolkit(options.project_id, Agents.browser_agent, safe_mode=True, clone_current_env=False)
     terminal_toolkit = message_integration.register_functions([terminal_toolkit.shell_exec])
 
-    note_toolkit = NoteTakingToolkit(options.project_id, Agents.search_agent, working_directory=working_directory)
+    note_toolkit = NoteTakingToolkit(options.project_id, Agents.browser_agent, working_directory=working_directory)
     note_toolkit = message_integration.register_toolkits(note_toolkit)
     search_tools = SearchToolkit.get_can_use_tools(options.project_id)
     # Only register search tools if any are available
@@ -891,7 +891,7 @@ def search_agent(options: Chat):
         search_tools = []
 
     tools = [
-        *HumanToolkit.get_can_use_tools(options.project_id, Agents.search_agent),
+        *HumanToolkit.get_can_use_tools(options.project_id, Agents.browser_agent),
         *web_toolkit_custom.get_tools(),
         *terminal_toolkit,
         *note_toolkit.get_tools(),
@@ -1011,9 +1011,9 @@ def search_agent(options: Chat):
     """
 
     return agent_model(
-        Agents.search_agent,
+        Agents.browser_agent,
         BaseMessage.make_assistant_message(
-            role_name="Search Agent",
+            role_name="Browser Agent",
             content=system_message,
         ),
         options,
@@ -1493,7 +1493,7 @@ async def social_medium_agent(options: Chat):
    - Communicate with other agents using messaging tools when collaboration
    is needed. Use `list_available_agents` to see available team members and
    `send_message` to coordinate with them, especially when you need content
-   from document agents or research from search agents.
+   from document agents or research from browser agents.
 
 9. File System Access:
    - You can use terminal tools to interact with the local file system in

backend/app/utils/toolkit/craw4ai_toolkit.py

@@ -7,7 +7,7 @@
 
 @auto_listen_toolkit(BaseCrawl4AIToolkit)
 class Crawl4AIToolkit(BaseCrawl4AIToolkit, AbstractToolkit):
-    agent_name: str = Agents.search_agent
+    agent_name: str = Agents.browser_agent
 
     def __init__(self, api_task_id: str, timeout: float | None = None):
         self.api_task_id = api_task_id

backend/app/utils/toolkit/hybrid_browser_python_toolkit.py

@@ -128,7 +128,7 @@ async def get_new_tab(self):
 
 @auto_listen_toolkit(BaseHybridBrowserToolkit)
 class HybridBrowserPythonToolkit(BaseHybridBrowserToolkit, AbstractToolkit):
-    agent_name: str = Agents.search_agent
+    agent_name: str = Agents.browser_agent
 
     def __init__(
         self,

backend/app/utils/toolkit/hybrid_browser_toolkit.py

@@ -215,7 +215,7 @@ async def close_all(self):
 
 @auto_listen_toolkit(BaseHybridBrowserToolkit)
 class HybridBrowserToolkit(BaseHybridBrowserToolkit, AbstractToolkit):
-    agent_name: str = Agents.search_agent
+    agent_name: str = Agents.browser_agent
 
     def __init__(
         self,