From d07f2f7c330b75dff7e50487982f244a2897d94c Mon Sep 17 00:00:00 2001
From: Twisha Bansal <58483338+twishabansal@users.noreply.github.com>
Date: Mon, 7 Apr 2025 12:21:09 +0530
Subject: [PATCH 1/4] feat: Allow loading default toolset

---
 packages/toolbox-core/src/toolbox_core/client.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/toolbox-core/src/toolbox_core/client.py b/packages/toolbox-core/src/toolbox_core/client.py
index 08182743..eb718b16 100644
--- a/packages/toolbox-core/src/toolbox_core/client.py
+++ b/packages/toolbox-core/src/toolbox_core/client.py
@@ -171,7 +171,7 @@ async def load_tool(
 
     async def load_toolset(
         self,
-        name: str,
+        name: Optional[str] = None,
         auth_token_getters: dict[str, Callable[[], str]] = {},
         bound_params: Mapping[str, Union[Callable[[], Any], Any]] = {},
     ) -> list[ToolboxTool]:
@@ -192,7 +192,7 @@ async def load_toolset(
             in the toolset.
         """
         # Request the definition of the tool from the server
-        url = f"{self.__base_url}/api/toolset/{name}"
+        url = f"{self.__url}/api/toolset/{toolset_name or ''}"
         async with self.__session.get(url) as response:
             json = await response.json()
         manifest: ManifestSchema = ManifestSchema(**json)

From bd50f181d07a120ef39bfdf06539e9eb55514b83 Mon Sep 17 00:00:00 2001
From: Twisha Bansal <twishabansal@google.com>
Date: Mon, 7 Apr 2025 12:23:21 +0530
Subject: [PATCH 2/4] variable name fix

---
 packages/toolbox-core/src/toolbox_core/client.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/toolbox-core/src/toolbox_core/client.py b/packages/toolbox-core/src/toolbox_core/client.py
index eb718b16..64497b80 100644
--- a/packages/toolbox-core/src/toolbox_core/client.py
+++ b/packages/toolbox-core/src/toolbox_core/client.py
@@ -192,7 +192,7 @@ async def load_toolset(
             in the toolset.
         """
         # Request the definition of the tool from the server
-        url = f"{self.__url}/api/toolset/{toolset_name or ''}"
+        url = f"{self.__base_url}/api/toolset/{name or ''}"
         async with self.__session.get(url) as response:
             json = await response.json()
         manifest: ManifestSchema = ManifestSchema(**json)

From 74b88bb0dadd018b2395bbebab942fd5e7c5d47c Mon Sep 17 00:00:00 2001
From: Twisha Bansal <twishabansal@google.com>
Date: Mon, 7 Apr 2025 16:32:43 +0530
Subject: [PATCH 3/4] add tests

---
 packages/toolbox-core/tests/test_e2e.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/packages/toolbox-core/tests/test_e2e.py b/packages/toolbox-core/tests/test_e2e.py
index 5e744ae1..14250830 100644
--- a/packages/toolbox-core/tests/test_e2e.py
+++ b/packages/toolbox-core/tests/test_e2e.py
@@ -61,6 +61,20 @@ async def test_load_toolset_specific(
         tool_names = {tool.__name__ for tool in toolset}
         assert tool_names == set(expected_tools)
 
+    async def test_load_toolset_default(self, toolbox: ToolboxClient):
+        """Load the default toolset, i.e. all tools."""
+        toolset = await toolbox.load_toolset()
+        assert len(toolset) == "5"
+        tool_names = {tool.__name__ for tool in toolset}
+        expected_tools = [
+            "get-row-by-content-auth",
+            "get-row-by-email-auth",
+            "get-row-by-id-auth",
+            "get-row-by-id",
+            "get-n-rows",
+        ]
+        assert tool_names == set(expected_tools)
+
     async def test_run_tool(self, get_n_rows_tool: ToolboxTool):
         """Invoke a tool."""
         response = await get_n_rows_tool(num_rows="2")

From 196eb8208c8aff55c73bb1432814d7e54b412ce7 Mon Sep 17 00:00:00 2001
From: Twisha Bansal <twishabansal@google.com>
Date: Mon, 7 Apr 2025 16:34:40 +0530
Subject: [PATCH 4/4] test fix

---
 packages/toolbox-core/tests/test_e2e.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/toolbox-core/tests/test_e2e.py b/packages/toolbox-core/tests/test_e2e.py
index 14250830..68fffa75 100644
--- a/packages/toolbox-core/tests/test_e2e.py
+++ b/packages/toolbox-core/tests/test_e2e.py
@@ -64,7 +64,7 @@ async def test_load_toolset_specific(
     async def test_load_toolset_default(self, toolbox: ToolboxClient):
         """Load the default toolset, i.e. all tools."""
         toolset = await toolbox.load_toolset()
-        assert len(toolset) == "5"
+        assert len(toolset) == 5
         tool_names = {tool.__name__ for tool in toolset}
         expected_tools = [
             "get-row-by-content-auth",