chore: Reorder tests in matching classes.

This will improve maintainability.

Author: anubhav756

packages/toolbox-core/tests/test_client.py

@@ -131,6 +131,60 @@ async def test_load_toolset_success(aioresponses, test_tool_str, test_tool_int_b
         assert {t.__name__ for t in tools} == manifest.tools.keys()
 
 
+@pytest.mark.asyncio
+async def test_invoke_tool_server_error(aioresponses, test_tool_str):
+    """Tests that invoking a tool raises an Exception when the server returns an
+    error status."""
+    TOOL_NAME = "server_error_tool"
+    ERROR_MESSAGE = "Simulated Server Error"
+    manifest = ManifestSchema(serverVersion="0.0.0", tools={TOOL_NAME: test_tool_str})
+
+    aioresponses.get(
+        f"{TEST_BASE_URL}/api/tool/{TOOL_NAME}",
+        payload=manifest.model_dump(),
+        status=200,
+    )
+    aioresponses.post(
+        f"{TEST_BASE_URL}/api/tool/{TOOL_NAME}/invoke",
+        payload={"error": ERROR_MESSAGE},
+        status=500,
+    )
+
+    async with ToolboxClient(TEST_BASE_URL) as client:
+        loaded_tool = await client.load_tool(TOOL_NAME)
+
+        with pytest.raises(Exception, match=ERROR_MESSAGE):
+            await loaded_tool(param1="some input")
+
+
+@pytest.mark.asyncio
+async def test_load_tool_not_found_in_manifest(aioresponses, test_tool_str):
+    """
+    Tests that load_tool raises an Exception when the requested tool name
+    is not found in the manifest returned by the server, using existing fixtures.
+    """
+    ACTUAL_TOOL_IN_MANIFEST = "actual_tool_abc"
+    REQUESTED_TOOL_NAME = "non_existent_tool_xyz"
+
+    manifest = ManifestSchema(
+        serverVersion="0.0.0", tools={ACTUAL_TOOL_IN_MANIFEST: test_tool_str}
+    )
+
+    aioresponses.get(
+        f"{TEST_BASE_URL}/api/tool/{REQUESTED_TOOL_NAME}",
+        payload=manifest.model_dump(),
+        status=200,
+    )
+
+    async with ToolboxClient(TEST_BASE_URL) as client:
+        with pytest.raises(Exception, match=f"Tool '{REQUESTED_TOOL_NAME}' not found!"):
+            await client.load_tool(REQUESTED_TOOL_NAME)
+
+    aioresponses.assert_called_once_with(
+        f"{TEST_BASE_URL}/api/tool/{REQUESTED_TOOL_NAME}", method="GET"
+    )
+
+
 class TestAuth:
 
     @pytest.fixture
@@ -183,7 +237,7 @@ def token_handler():
         tool = await client.load_tool(
             tool_name, auth_token_getters={"my-auth-service": token_handler}
         )
-        res = await tool(5)
+        await tool(5)
 
     @pytest.mark.asyncio
     async def test_auth_with_add_token_success(
@@ -196,20 +250,35 @@ def token_handler():
 
         tool = await client.load_tool(tool_name)
         tool = tool.add_auth_token_getters({"my-auth-service": token_handler})
-        res = await tool(5)
+        await tool(5)
 
     @pytest.mark.asyncio
     async def test_auth_with_load_tool_fail_no_token(
         self, tool_name, expected_header, client
     ):
         """Tests 'load_tool' with auth token is specified."""
 
-        def token_handler():
-            return expected_header
-
         tool = await client.load_tool(tool_name)
         with pytest.raises(Exception):
-            res = await tool(5)
+            await tool(5)
+
+    @pytest.mark.asyncio
+    async def test_add_auth_token_getters_duplicate_fail(self, tool_name, client):
+        """
+        Tests that adding a duplicate auth token getter raises ValueError.
+        """
+        AUTH_SERVICE = "my-auth-service"
+
+        tool = await client.load_tool(tool_name)
+
+        authed_tool = tool.add_auth_token_getters({AUTH_SERVICE: {}})
+        assert AUTH_SERVICE in authed_tool._ToolboxTool__auth_service_token_getters
+
+        with pytest.raises(
+            ValueError,
+            match=f"Authentication source\\(s\\) `{AUTH_SERVICE}` already registered in tool `{tool_name}`.",
+        ):
+            authed_tool.add_auth_token_getters({AUTH_SERVICE: {}})
 
 
 class TestBoundParameter:
@@ -319,62 +388,15 @@ async def test_bind_param_fail(self, tool_name, client):
         with pytest.raises(Exception):
             tool = tool.bind_parameters({"argC": lambda: 5})
 
+    @pytest.mark.asyncio
+    async def test_bind_param_static_value_success(self, tool_name, client):
+        """
+        Tests bind_parameters method with a static value.
+        """
 
-@pytest.mark.asyncio
-async def test_invoke_tool_server_error(aioresponses, test_tool_str):
-    """Tests that invoking a tool raises an Exception when the server returns an
-    error status."""
-    TOOL_NAME = "server_error_tool"
-    ERROR_MESSAGE = "Simulated Server Error"
-    manifest = ManifestSchema(serverVersion="0.0.0", tools={TOOL_NAME: test_tool_str})
-
-    aioresponses.get(
-        f"{TEST_BASE_URL}/api/tool/{TOOL_NAME}",
-        payload=manifest.model_dump(),
-        status=200,
-    )
-    aioresponses.post(
-        f"{TEST_BASE_URL}/api/tool/{TOOL_NAME}/invoke",
-        payload={"error": ERROR_MESSAGE},
-        status=500,
-    )
-
-    async with ToolboxClient(TEST_BASE_URL) as client:
-        loaded_tool = await client.load_tool(TOOL_NAME)
-
-        with pytest.raises(Exception, match=ERROR_MESSAGE):
-            await loaded_tool(param1="some input")
-
-
-@pytest.mark.asyncio
-async def test_bind_param_static_value_success(aioresponses, test_tool_int_bool):
-    """
-    Tests bind_parameters method with a static value.
-    """
-    TOOL_NAME = "async_bind_tool"
-    manifest = ManifestSchema(
-        serverVersion="0.0.0", tools={TOOL_NAME: test_tool_int_bool}
-    )
-
-    aioresponses.get(
-        f"{TEST_BASE_URL}/api/tool/{TOOL_NAME}",
-        payload=manifest.model_dump(),
-        status=200,
-    )
-
-    def reflect_parameters(url, **kwargs):
-        received_params = kwargs.get("json", {})
-        return CallbackResult(status=200, payload={"result": received_params})
-
-    aioresponses.post(
-        f"{TEST_BASE_URL}/api/tool/{TOOL_NAME}/invoke",
-        callback=reflect_parameters,
-    )
-
-    bound_value = "Test value"
+        bound_value = "Test value"
 
-    async with ToolboxClient(TEST_BASE_URL) as client:
-        tool = await client.load_tool(TOOL_NAME)
+        tool = await client.load_tool(tool_name)
         bound_tool = tool.bind_parameters({"argB": bound_value})
 
         assert bound_tool is not tool
@@ -386,37 +408,16 @@ def reflect_parameters(url, **kwargs):
 
         assert res_payload == {"argA": passed_value_a, "argB": bound_value}
 
+    @pytest.mark.asyncio
+    async def test_bind_param_sync_callable_value_success(self, tool_name, client):
+        """
+        Tests bind_parameters method with a sync callable value.
+        """
 
-@pytest.mark.asyncio
-async def test_bind_param_sync_callable_value_success(aioresponses, test_tool_int_bool):
-    """
-    Tests bind_parameters method with a sync callable value.
-    """
-    TOOL_NAME = "async_bind_tool"
-    manifest = ManifestSchema(
-        serverVersion="0.0.0", tools={TOOL_NAME: test_tool_int_bool}
-    )
-
-    aioresponses.get(
-        f"{TEST_BASE_URL}/api/tool/{TOOL_NAME}",
-        payload=manifest.model_dump(),
-        status=200,
-    )
-
-    def reflect_parameters(url, **kwargs):
-        received_params = kwargs.get("json", {})
-        return CallbackResult(status=200, payload={"result": received_params})
-
-    aioresponses.post(
-        f"{TEST_BASE_URL}/api/tool/{TOOL_NAME}/invoke",
-        callback=reflect_parameters,
-    )
-
-    bound_value_result = True
-    bound_sync_callable = Mock(return_value=bound_value_result)
+        bound_value_result = True
+        bound_sync_callable = Mock(return_value=bound_value_result)
 
-    async with ToolboxClient(TEST_BASE_URL) as client:
-        tool = await client.load_tool(TOOL_NAME)
+        tool = await client.load_tool(tool_name)
         bound_tool = tool.bind_parameters({"argB": bound_sync_callable})
 
         assert bound_tool is not tool
@@ -429,39 +430,16 @@ def reflect_parameters(url, **kwargs):
         assert res_payload == {"argA": passed_value_a, "argB": bound_value_result}
         bound_sync_callable.assert_called_once()
 
+    @pytest.mark.asyncio
+    async def test_bind_param_async_callable_value_success(self, tool_name, client):
+        """
+        Tests bind_parameters method with an async callable value.
+        """
 
-@pytest.mark.asyncio
-async def test_bind_param_async_callable_value_success(
-    aioresponses, test_tool_int_bool
-):
-    """
-    Tests bind_parameters method with an async callable value.
-    """
-    TOOL_NAME = "async_bind_tool"
-    manifest = ManifestSchema(
-        serverVersion="0.0.0", tools={TOOL_NAME: test_tool_int_bool}
-    )
-
-    aioresponses.get(
-        f"{TEST_BASE_URL}/api/tool/{TOOL_NAME}",
-        payload=manifest.model_dump(),
-        status=200,
-    )
-
-    def reflect_parameters(url, **kwargs):
-        received_params = kwargs.get("json", {})
-        return CallbackResult(status=200, payload={"result": received_params})
-
-    aioresponses.post(
-        f"{TEST_BASE_URL}/api/tool/{TOOL_NAME}/invoke",
-        callback=reflect_parameters,
-    )
-
-    bound_value_result = True
-    bound_async_callable = AsyncMock(return_value=bound_value_result)
+        bound_value_result = True
+        bound_async_callable = AsyncMock(return_value=bound_value_result)
 
-    async with ToolboxClient(TEST_BASE_URL) as client:
-        tool = await client.load_tool(TOOL_NAME)
+        tool = await client.load_tool(tool_name)
         bound_tool = tool.bind_parameters({"argB": bound_async_callable})
 
         assert bound_tool is not tool
@@ -473,59 +451,3 @@ def reflect_parameters(url, **kwargs):
 
         assert res_payload == {"argA": passed_value_a, "argB": bound_value_result}
         bound_async_callable.assert_awaited_once()
-
-
-@pytest.mark.asyncio
-async def test_add_auth_token_getters_duplicate_fail(aioresponses, test_tool_auth):
-    """
-    Tests that adding a duplicate auth token getter raises ValueError.
-    """
-    TOOL_NAME = "duplicate_auth_tool"
-    AUTH_SERVICE = "my-auth-service"
-    manifest = ManifestSchema(serverVersion="0.0.0", tools={TOOL_NAME: test_tool_auth})
-
-    aioresponses.get(
-        f"{TEST_BASE_URL}/api/tool/{TOOL_NAME}",
-        payload=manifest.model_dump(),
-        status=200,
-    )
-
-    async with ToolboxClient(TEST_BASE_URL) as client:
-        tool = await client.load_tool(TOOL_NAME)
-
-        authed_tool = tool.add_auth_token_getters({AUTH_SERVICE: {}})
-        assert AUTH_SERVICE in authed_tool._ToolboxTool__auth_service_token_getters
-
-        with pytest.raises(
-            ValueError,
-            match=f"Authentication source\\(s\\) `{AUTH_SERVICE}` already registered in tool `{TOOL_NAME}`.",
-        ):
-            authed_tool.add_auth_token_getters({AUTH_SERVICE: {}})
-
-
-@pytest.mark.asyncio
-async def test_load_tool_not_found_in_manifest(aioresponses, test_tool_str):
-    """
-    Tests that load_tool raises an Exception when the requested tool name
-    is not found in the manifest returned by the server, using existing fixtures.
-    """
-    ACTUAL_TOOL_IN_MANIFEST = "actual_tool_abc"
-    REQUESTED_TOOL_NAME = "non_existent_tool_xyz"
-
-    manifest = ManifestSchema(
-        serverVersion="0.0.0", tools={ACTUAL_TOOL_IN_MANIFEST: test_tool_str}
-    )
-
-    aioresponses.get(
-        f"{TEST_BASE_URL}/api/tool/{REQUESTED_TOOL_NAME}",
-        payload=manifest.model_dump(),
-        status=200,
-    )
-
-    async with ToolboxClient(TEST_BASE_URL) as client:
-        with pytest.raises(Exception, match=f"Tool '{REQUESTED_TOOL_NAME}' not found!"):
-            await client.load_tool(REQUESTED_TOOL_NAME)
-
-    aioresponses.assert_called_once_with(
-        f"{TEST_BASE_URL}/api/tool/{REQUESTED_TOOL_NAME}", method="GET"
-    )