🐫 CAMEL: The first and the best multi-agent framework. Finding the Scaling Law of Agents. https://www.camel-ai.org
Python agentai-societiesartificial-intelligencecommunicative-aicooperative-aideep-learninglarge-language-modelsmulti-agent-systemsnatural-language-processing
enhance: add _normalize_math_string method (#2089)
Zeyu Zhang15487fdb8d5e
diff --git a/camel/verifiers/math_verifier.py b/camel/verifiers/math_verifier.pyindex fda0b93bf..56dd43f17 100644--- a/camel/verifiers/math_verifier.py+++ b/camel/verifiers/math_verifier.py@@ -29,6 +29,7 @@ class MathVerifier(BaseVerifier):- Supports LaTeX and plain mathematical expressions- Handles complex numbers, matrices, and sets- Configurable precision for floating-point comparisons+ - Optional LaTeX wrapping to ensure proper parsing and rendering- Comprehensive error handling and logging"""@@ -38,6 +39,7 @@ class MathVerifier(BaseVerifier):timeout: Optional[float] = 30.0,float_rounding: int = 6,numeric_precision: int = 15,+ enable_wrapping: Optional[bool] = False,**kwargs,):r"""Initializes the MathVerifier.@@ -51,10 +53,39 @@ class MathVerifier(BaseVerifier):round floating-point numbers. (default: :obj:`6`)numeric_precision (int, optional): The numeric precision forfloating-point comparisons. (default: :obj:`15`)+ enable_wrapping (Optional[bool], optional): Whether to wrap LaTeX+ expressions in math mode delimiters. (default: :obj:`False`)"""super().__init__(extractor=extractor, timeout=timeout, **kwargs)self.float_rounding = float_roundingself.numeric_precision = numeric_precision+ self.enable_wrapping = enable_wrapping++ @staticmethod+ def _latex_wrapping(s: str) -> str:+ r"""Wrap a LaTeX expression in math mode delimiters.++ This function checks whether the input string is already in a LaTeX+ math environment (e.g., $, \[, \begin{}, etc.). If not, it wraps the+ expression in $$...$$ to ensure proper parsing and rendering as a+ mathematical expression.++ Args:+ s (str): The input LaTeX string.++ Returns:+ str: The LaTeX string wrapped in math mode if necessary.+ """+ s_stripped = s.strip()+ if (+ not any(+ s_stripped.startswith(prefix)+ for prefix in ("$", "\\(", "\\[", "\\begin")+ )+ and "\\boxed" not in s_stripped+ ):+ s = f"$$ {s_stripped} $$"+ return sasync def _setup(self, **kwargs) -> None:r"""No special setup needed for math verification."""@@ -92,6 +123,12 @@ class MathVerifier(BaseVerifier):)try:+ # Apply LaTeX wrapping if enabled+ if self.enable_wrapping:+ solution = self._latex_wrapping(solution)+ reference_answer = self._latex_wrapping(reference_answer)+ logger.debug("Applied LaTeX wrapping")+# Parse both expressions with LaTeX and plain expression supportparsed_reference_answer = parse(reference_answer,diff --git a/test/toolkits/test_mcp_toolkit.py b/test/toolkits/test_mcp_toolkit.pyindex 47e3e04a9..392b4a534 100644--- a/test/toolkits/test_mcp_toolkit.py+++ b/test/toolkits/test_mcp_toolkit.py@@ -153,9 +153,9 @@ class TestMCPClient:# Mock exceptionserver._session.list_tools.side_effect = Exception("Test error")- result = await server.list_mcp_tools()- assert isinstance(result, str)- assert "Failed to list MCP tools" in result+ with pytest.raises(Exception) as excinfo:+ await server.list_mcp_tools()+ assert "Test error" in str(excinfo.value)@pytest.mark.asyncioasync def test_generate_function_from_mcp_tool(self):@@ -398,19 +398,12 @@ class TestMCPClient:# Create serverserver = MCPClient("https://example.com/api")- # Mock disconnect to verify it's called on failure- server.disconnect = AsyncMock()-- # Test connect with failure- with patch("camel.toolkits.mcp_toolkit.logger") as mock_logger:+ with pytest.raises(Exception) as excinfo:await server.connect()- # Verify disconnect was called to clean up- server.disconnect.assert_called_once()- mock_logger.error.assert_called_once()+ assert "Connection error" in str(excinfo.value)- # Verify server is not connected- assert server._is_connected is False+ assert server._is_connected is False@pytest.mark.asyncioasync def test_disconnect_explicit(self):@@ -476,24 +469,28 @@ class TestMCPToolkit:with patch("camel.toolkits.mcp_toolkit.logger") as mock_logger:with tempfile.TemporaryDirectory() as temp_dir:non_existent_path = Path(temp_dir) / "non_existent.json"- toolkit = MCPToolkit(config_path=str(non_existent_path))- # Should return an empty toolkit.- assert toolkit.servers == []- mock_logger.warning.assert_called_once()+ with pytest.raises(FileNotFoundError):+ MCPToolkit(config_path=str(non_existent_path))++ # Verify that a warning was logged+ mock_logger.warning.assert_called_once_with(+ f"Config file not found: '{non_existent_path}'"+ )def test_init_config_invalid_json(self):r"""Test from_config with invalid JSON."""- with patch("camel.toolkits.mcp_toolkit.logger") as mock_logger:- with tempfile.TemporaryDirectory() as temp_dir:- config_path = Path(temp_dir) / "invalid.json"- config_path.write_text("{invalid json")+ with tempfile.TemporaryDirectory() as temp_dir:+ config_path = Path(temp_dir) / "invalid.json"+ config_path.write_text("{invalid json")- toolkit = MCPToolkit(config_path=str(config_path))+ with pytest.raises(json.JSONDecodeError) as excinfo:+ MCPToolkit(config_path=str(config_path))- # Should return an empty toolkit- assert toolkit.servers == []- mock_logger.warning.assert_called_once()+ assert (+ "Expecting property name enclosed in double quotes"+ in str(excinfo.value)+ )def test_init_config_valid(self):r"""Test from_config with valid configuration."""@@ -576,25 +573,33 @@ class TestMCPToolkit:@pytest.mark.asyncioasync def test_connection(self):r"""Test connection context manager."""- server1 = MCPClient("test_command1")- server2 = MCPClient("test_command2")- toolkit = MCPToolkit(servers=[server1, server2])+ # Create mock servers with proper setup+ server1 = AsyncMock()+ server2 = AsyncMock()++ # Make connect method return the server itself+ server1.connect = AsyncMock(return_value=server1)+ server2.connect = AsyncMock(return_value=server2)- # Mock the connection context managers of both servers- class MockAsyncContextManager:- async def __aenter__(self):- return AsyncMock()+ # Create a proper async context manager for connection+ async_cm1 = AsyncMock()+ async_cm1.__aenter__.return_value = server1- async def __aexit__(self, exc_type, exc_val, exc_tb):- return None+ async_cm2 = AsyncMock()+ async_cm2.__aenter__.return_value = server2- server1.connection = MagicMock(return_value=MockAsyncContextManager())- server2.connection = MagicMock(return_value=MockAsyncContextManager())+ # Set up the connection method to return our context manager+ server1.connection = MagicMock(return_value=async_cm1)+ server2.connection = MagicMock(return_value=async_cm2)+ toolkit = MCPToolkit(servers=[server1, server2])++ # Test connection context managerasync with toolkit.connection() as connected_toolkit:assert connected_toolkit._connected is Trueassert isinstance(connected_toolkit._exit_stack, AsyncExitStack)+ # Verify context exit cleans up properlyassert toolkit._connected is Falseassert isinstance(toolkit._exit_stack, AsyncExitStack)@@ -674,21 +679,16 @@ class TestMCPToolkit:# Create toolkit with mock serverstoolkit = MCPToolkit(servers=[server1, server2])- # Mock disconnect to verify it's called on failure- toolkit.disconnect = AsyncMock()-- # Test connect with failure- with patch("camel.toolkits.mcp_toolkit.logger") as mock_logger:+ # Test connect with failure - should raise the exception+ with pytest.raises(Exception) as excinfo:await toolkit.connect()- # Verify disconnect was called to clean up- toolkit.disconnect.assert_called_once()- mock_logger.error.assert_called_once()+ assert "Connection error" in str(excinfo.value)- # Verify first server was connected- server1.connect.assert_called_once()- # Verify second server was attempted- server2.connect.assert_called_once()+ # Verify first server was connected+ server1.connect.assert_called_once()+ # Verify second server was attempted+ server2.connect.assert_called_once()@pytest.mark.asyncioasync def test_disconnect(self):