fix: throw tool errors correctly. (#35)

* fix: throw tool errors correctly.

* fix tests

* fix tests

Author: twishabansal

src/toolbox_llamaindex/async_tools.py

@@ -179,16 +179,25 @@ async def acall(self, **kwargs: Any) -> ToolOutput:  # type: ignore
 
         # Merge bound parameters with the provided arguments
         kwargs.update(evaluated_params)
-        response = await _invoke_tool(
-            self.__url, self.__session, self.__name, kwargs, self.__auth_tokens
-        )
-        return ToolOutput(
-            content=str(response),
-            tool_name=self.__name,
-            raw_input=kwargs,
-            raw_output=response,
-            is_error=False,
-        )
+        try:
+            response = await _invoke_tool(
+                self.__url, self.__session, self.__name, kwargs, self.__auth_tokens
+            )
+            return ToolOutput(
+                content=str(response),
+                tool_name=self.__name,
+                raw_input=kwargs,
+                raw_output=response,
+                is_error=False,
+            )
+        except ClientResponseError as e:
+            return ToolOutput(
+                content="Encountered error: " + str(e),
+                tool_name=self.__name,
+                raw_input=kwargs,
+                raw_output=str(e),
+                is_error=True,
+            )
 
     def __validate_auth(self, strict: bool = True) -> None:
         """

tests/test_e2e.py

@@ -127,17 +127,21 @@ async def test_run_tool_no_auth(self, toolbox):
         tool = await toolbox.aload_tool(
             "get-row-by-id-auth",
         )
-        with pytest.raises(ClientResponseError, match="401, message='Unauthorized'"):
-            await tool.acall(id="2")
+        response = await tool.acall(id="2")
+        assert response.is_error == True
+        assert "401, message='Unauthorized'" in response.content
+        assert isinstance(response.raw_output, str)
 
     async def test_run_tool_wrong_auth(self, toolbox, auth_token2):
         """Tests running a tool with incorrect auth."""
         tool = await toolbox.aload_tool(
             "get-row-by-id-auth",
         )
         auth_tool = tool.add_auth_token("my-test-auth", lambda: auth_token2)
-        with pytest.raises(ClientResponseError, match="401, message='Unauthorized'"):
-            await auth_tool.acall(id="2")
+        response = await auth_tool.acall(id="2")
+        assert response.is_error == True
+        assert "401, message='Unauthorized'" in response.content
+        assert isinstance(response.raw_output, str)
 
     async def test_run_tool_auth(self, toolbox, auth_token1):
         """Tests running a tool with correct auth."""
@@ -173,8 +177,10 @@ async def test_run_tool_param_auth_no_field(self, toolbox, auth_token1):
         tool = await toolbox.aload_tool(
             "get-row-by-content-auth", auth_tokens={"my-test-auth": lambda: auth_token1}
         )
-        with pytest.raises(ClientResponseError, match="400, message='Bad Request'"):
-            await tool.acall()
+        response = await tool.acall()
+        assert response.is_error == True
+        assert "400, message='Bad Request'" in response.content
+        assert isinstance(response.raw_output, str)
 
 
 @pytest.mark.usefixtures("toolbox_server")
@@ -261,18 +267,21 @@ def test_run_tool_no_auth(self, toolbox):
         tool = toolbox.load_tool(
             "get-row-by-id-auth",
         )
-        with pytest.raises(ClientResponseError, match="401, message='Unauthorized'"):
-            tool.call(id="2")
+        response = tool.call(id="2")
+        assert response.is_error == True
+        assert "401, message='Unauthorized'" in response.content
+        assert isinstance(response.raw_output, str)
 
     def test_run_tool_wrong_auth(self, toolbox, auth_token2):
         """Tests running a tool with incorrect auth."""
         tool = toolbox.load_tool(
             "get-row-by-id-auth",
         )
         auth_tool = tool.add_auth_token("my-test-auth", lambda: auth_token2)
-
-        with pytest.raises(ClientResponseError, match="401, message='Unauthorized'"):
-            auth_tool.call(id="2")
+        response = auth_tool.call(id="2")
+        assert response.is_error == True
+        assert "401, message='Unauthorized'" in response.content
+        assert isinstance(response.raw_output, str)
 
     def test_run_tool_auth(self, toolbox, auth_token1):
         """Tests running a tool with correct auth."""
@@ -308,5 +317,7 @@ def test_run_tool_param_auth_no_field(self, toolbox, auth_token1):
         tool = toolbox.load_tool(
             "get-row-by-content-auth", auth_tokens={"my-test-auth": lambda: auth_token1}
         )
-        with pytest.raises(ClientResponseError, match="400, message='Bad Request'"):
-            tool.call(id="2")
+        response = tool.call()
+        assert response.is_error == True
+        assert "400, message='Bad Request'" in response.content
+        assert isinstance(response.raw_output, str)