fix: Integration test errors

Author: anubhav756

packages/toolbox-langchain/tests/test_e2e.py

@@ -114,11 +114,13 @@ async def test_run_tool_wrong_param_type(self, get_n_rows_tool):
     @pytest.mark.asyncio
     async def test_run_tool_unauth_with_auth(self, toolbox, auth_token2):
         """Tests running a tool that doesn't require auth, with auth provided."""
-        tool = await toolbox.aload_tool(
-            "get-row-by-id", auth_token_getters={"my-test-auth": lambda: auth_token2}
-        )
-        response = await tool.ainvoke({"id": "2"})
-        assert "row2" in response
+        with pytest.raises(
+            ValueError,
+            match="Validation failed for tool 'get-row-by-id': unused auth tokens: my-test-auth.",
+        ):
+            await toolbox.aload_tool(
+                "get-row-by-id", auth_token_getters={"my-test-auth": lambda: auth_token2}
+            )
 
     async def test_run_tool_no_auth(self, toolbox):
         """Tests running a tool requiring auth without providing auth."""
@@ -127,7 +129,7 @@ async def test_run_tool_no_auth(self, toolbox):
         )
         with pytest.raises(
             PermissionError,
-            match="Tool get-row-by-id-auth requires authentication, but no valid authentication sources are registered. Please register the required sources before use.",
+            match="One or more of the following authn services are required to invoke this tool: my-test-auth",
         ):
             await tool.ainvoke({"id": "2"})
 
@@ -138,8 +140,8 @@ async def test_run_tool_wrong_auth(self, toolbox, auth_token2):
         )
         auth_tool = tool.add_auth_token_getter("my-test-auth", lambda: auth_token2)
         with pytest.raises(
-            ToolException,
-            match="{'status': 'Unauthorized', 'error': 'tool invocation not authorized. Please make sure your specify correct auth headers'}",
+            Exception,
+            match="tool invocation not authorized. Please make sure your specify correct auth headers",
         ):
             await auth_tool.ainvoke({"id": "2"})
 
@@ -157,7 +159,7 @@ async def test_run_tool_param_auth_no_auth(self, toolbox):
         tool = await toolbox.aload_tool("get-row-by-email-auth")
         with pytest.raises(
             PermissionError,
-            match="Parameter\(s\) `email` of tool get-row-by-email-auth require authentication\, but no valid authentication sources are registered\. Please register the required sources before use\.",
+            match="One or more of the following authn services are required to invoke this tool: my-test-auth",
         ):
             await tool.ainvoke({"email": ""})
 
@@ -179,12 +181,11 @@ async def test_run_tool_param_auth_no_field(self, toolbox, auth_token1):
             auth_token_getters={"my-test-auth": lambda: auth_token1},
         )
         with pytest.raises(
-            ToolException,
-            match="{'status': 'Bad Request', 'error': 'provided parameters were invalid: error parsing authenticated parameter \"data\": no field named row_data in claims'}",
+            Exception,
+            match="provided parameters were invalid: error parsing authenticated parameter \"data\": no field named row_data in claims"
         ):
             await tool.ainvoke({})
 
-
 @pytest.mark.usefixtures("toolbox_server")
 class TestE2EClientSync:
     @pytest.fixture(scope="session")
@@ -213,7 +214,7 @@ def test_load_toolset_specific(
         toolset = toolbox.load_toolset(toolset_name)
         assert len(toolset) == expected_length
         for tool in toolset:
-            name = tool._ToolboxTool__async_tool._AsyncToolboxTool__name
+            name = tool._ToolboxTool__core_sync_tool.__name__
             assert name in expected_tools
 
     def test_aload_toolset_all(self, toolbox):
@@ -227,7 +228,7 @@ def test_aload_toolset_all(self, toolbox):
             "get-row-by-content-auth",
         ]
         for tool in toolset:
-            name = tool._ToolboxTool__async_tool._AsyncToolboxTool__name
+            name = tool._ToolboxTool__core_sync_tool.__name__
             assert name in tool_names
 
     @pytest.mark.asyncio
@@ -256,11 +257,13 @@ def test_run_tool_wrong_param_type(self, get_n_rows_tool):
     #### Auth tests
     def test_run_tool_unauth_with_auth(self, toolbox, auth_token2):
         """Tests running a tool that doesn't require auth, with auth provided."""
-        tool = toolbox.load_tool(
-            "get-row-by-id", auth_token_getters={"my-test-auth": lambda: auth_token2}
-        )
-        response = tool.invoke({"id": "2"})
-        assert "row2" in response
+        with pytest.raises(
+            ValueError,
+            match="Validation failed for tool 'get-row-by-id': unused auth tokens: my-test-auth.",
+        ):
+            toolbox.load_tool(
+                "get-row-by-id", auth_token_getters={"my-test-auth": lambda: auth_token2}
+            )
 
     def test_run_tool_no_auth(self, toolbox):
         """Tests running a tool requiring auth without providing auth."""
@@ -269,7 +272,7 @@ def test_run_tool_no_auth(self, toolbox):
         )
         with pytest.raises(
             PermissionError,
-            match="Tool get-row-by-id-auth requires authentication, but no valid authentication sources are registered. Please register the required sources before use.",
+            match="One or more of the following authn services are required to invoke this tool: my-test-auth",
         ):
             tool.invoke({"id": "2"})
 
@@ -281,7 +284,7 @@ def test_run_tool_wrong_auth(self, toolbox, auth_token2):
         auth_tool = tool.add_auth_token_getter("my-test-auth", lambda: auth_token2)
         with pytest.raises(
             ToolException,
-            match="{'status': 'Unauthorized', 'error': 'tool invocation not authorized. Please make sure your specify correct auth headers'}",
+            match="tool invocation not authorized. Please make sure your specify correct auth headers",
         ):
             auth_tool.invoke({"id": "2"})
 
@@ -299,7 +302,7 @@ def test_run_tool_param_auth_no_auth(self, toolbox):
         tool = toolbox.load_tool("get-row-by-email-auth")
         with pytest.raises(
             PermissionError,
-            match="Parameter\(s\) `email` of tool get-row-by-email-auth require authentication\, but no valid authentication sources are registered\. Please register the required sources before use\.",
+            match="One or more of the following authn services are required to invoke this tool: my-test-auth",
         ):
             tool.invoke({"email": ""})
 
@@ -322,6 +325,6 @@ def test_run_tool_param_auth_no_field(self, toolbox, auth_token1):
         )
         with pytest.raises(
             ToolException,
-            match="{'status': 'Bad Request', 'error': 'provided parameters were invalid: error parsing authenticated parameter \"data\": no field named row_data in claims'}",
+            match="provided parameters were invalid: error parsing authenticated parameter \"data\": no field named row_data in claims",
         ):
             tool.invoke({})