chore: address feedback

Author: kurtisvg

packages/toolbox-core/src/toolbox_core/client.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 import re
 import types
-from typing import Any, Callable, Optional
+from typing import Any, Callable, Mapping, Optional, Union
 
 from aiohttp import ClientSession
 
@@ -59,7 +59,7 @@ def __parse_tool(
         name: str,
         schema: ToolSchema,
         auth_token_getters: dict[str, Callable[[], str]],
-        all_bound_params: dict[str, Callable[[], str]],
+        all_bound_params: Mapping[str, Union[Callable[[], Any], Any]],
     ) -> ToolboxTool:
         """Internal helper to create a callable tool from its schema."""
         # sort into reg, authn, and bound params
@@ -129,7 +129,7 @@ async def load_tool(
         self,
         name: str,
         auth_token_getters: dict[str, Callable[[], str]] = {},
-        bound_params: dict[str, Callable[[], str]] = {},
+        bound_params: Mapping[str, Union[Callable[[], Any], Any]] = {},
     ) -> ToolboxTool:
         """
         Asynchronously loads a tool from the server.
@@ -142,6 +142,10 @@ async def load_tool(
             name: The unique name or identifier of the tool to load.
             auth_token_getters: A mapping of authentication service names to
                 callables that return the corresponding authentication token.
+            bound_params: A mapping of parameter names to bind to specific values or
+                callables that are called to produce values as needed.
+
+
 
         Returns:
             ToolboxTool: A callable object representing the loaded tool, ready
@@ -170,7 +174,7 @@ async def load_toolset(
         self,
         name: str,
         auth_token_getters: dict[str, Callable[[], str]] = {},
-        bound_params: dict[str, Callable[[], str]] = {},
+        bound_params: Mapping[str, Union[Callable[[], Any], Any]] = {},
     ) -> list[ToolboxTool]:
         """
         Asynchronously fetches a toolset and loads all tools defined within it.
@@ -179,6 +183,8 @@ async def load_toolset(
             name: Name of the toolset to load tools.
             auth_token_getters: A mapping of authentication service names to
                 callables that return the corresponding authentication token.
+            bound_params: A mapping of parameter names to bind to specific values or
+                callables that are called to produce values as needed.
 
 
 

packages/toolbox-core/src/toolbox_core/tool.py

@@ -54,7 +54,7 @@ def __init__(
         params: Sequence[Parameter],
         required_authn_params: Mapping[str, list[str]],
         auth_service_token_getters: Mapping[str, Callable[[], str]],
-        bound_params: Mapping[str, Union[Callable[[], Any], Any]] = {},
+        bound_params: Mapping[str, Union[Callable[[], Any], Any]],
     ):
         """
         Initializes a callable that will trigger the tool invocation through the
@@ -71,6 +71,9 @@ def __init__(
                 of services that provide values for them.
             auth_service_token_getters: A dict of authService -> token (or callables that
                 produce a token)
+            bound_params: A mapping of parameter names to bind to specific values or
+                callables that are called to produce values as needed.
+
         """
 
         # used to invoke the toolbox API
@@ -92,7 +95,7 @@ def __init__(
         self.__required_authn_params = required_authn_params
         # map of authService -> token_getter
         self.__auth_service_token_getters = auth_service_token_getters
-        # map of parameter name to value or Callable
+        # map of parameter name to value (or callable that produces that value)
         self.__bound_parameters = bound_params
 
     def __copy(
@@ -120,6 +123,8 @@ def __copy(
                 a auth_service_token_getter set for them yet.
             auth_service_token_getters: A dict of authService -> token (or callables
                 that produce a token)
+            bound_params: A mapping of parameter names to bind to specific values or
+                callables that are called to produce values as needed.
 
         """
         check = lambda val, default: val if val is not None else default
@@ -235,7 +240,7 @@ def add_auth_token_getters(
         )
 
     def bind_parameters(
-        self, bound_params: Mapping[str, Callable[[], str]]
+        self, bound_params: Mapping[str, Union[Callable[[], Any], Any]]
     ) -> "ToolboxTool":
         """
         Binds parameters to values or callables that produce values.
@@ -247,9 +252,9 @@ def bind_parameters(
          Returns:
              A new ToolboxTool instance with the specified parameters bound.
         """
-        all_params = set(p.name for p in self.__params)
+        param_names = set(p.name for p in self.__params)
         for name in bound_params.keys():
-            if name not in all_params:
+            if name not in param_names:
                 raise Exception(f"unable to bind parameters: no parameter named {name}")
 
         new_params = []
@@ -267,28 +272,28 @@ def identify_required_authn_params(
     req_authn_params: Mapping[str, list[str]], auth_service_names: Iterable[str]
 ) -> dict[str, list[str]]:
     """
-<<<<<<< HEAD
-    Identifies authentication parameters that are still required; or not covered by
-        the provided `auth_service_names`.
-=======
-    Utility function for reducing 'req_authn_params' to a subset of parameters that
-    aren't supplied by a least one service in auth_services.
->>>>>>> 744ade9 (feat: add support for bound parameters)
-
-    Args:
-        req_authn_params: A mapping of parameter names to sets of required
-            authentication services.
-        auth_service_names: An iterable of authentication service names for which
-            token getters are available.
-
-    Returns:
-<<<<<<< HEAD
-        A new dictionary representing the subset of required authentication
-        parameters that are not covered by the provided `auth_service_names`.
-=======
-        A new dictionary representing the subset of required authentication parameters
-        that are not covered by the provided `auth_services`.
->>>>>>> 744ade9 (feat: add support for bound parameters)
+    <<<<<<< HEAD
+        Identifies authentication parameters that are still required; or not covered by
+            the provided `auth_service_names`.
+    =======
+        Utility function for reducing 'req_authn_params' to a subset of parameters that
+        aren't supplied by a least one service in auth_services.
+    >>>>>>> 744ade9 (feat: add support for bound parameters)
+
+        Args:
+            req_authn_params: A mapping of parameter names to sets of required
+                authentication services.
+            auth_service_names: An iterable of authentication service names for which
+                token getters are available.
+
+        Returns:
+    <<<<<<< HEAD
+            A new dictionary representing the subset of required authentication
+            parameters that are not covered by the provided `auth_service_names`.
+    =======
+            A new dictionary representing the subset of required authentication parameters
+            that are not covered by the provided `auth_services`.
+    >>>>>>> 744ade9 (feat: add support for bound parameters)
     """
     required_params = {}  # params that are still required with provided auth_services
     for param, services in req_authn_params.items():