try fix test errors

Author: twishabansal

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

@@ -75,7 +75,7 @@ def __parse_tool(
             else:  # regular parameter
                 params.append(p)
 
-        authn_params = filter_required_authn_params(authn_params, auth_sources)
+        authn_params = filter_required_authn_params(authn_params, auth_token_getters.keys())
 
         tool = ToolboxTool(
             session=self.__session,

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

@@ -21,6 +21,7 @@
     Any,
     Callable,
     DefaultDict,
+    TypeVar,
     Iterable,
     Mapping,
     Optional,
@@ -31,6 +32,8 @@
 from aiohttp import ClientSession
 from pytest import Session
 
+T = TypeVar('T')
+
 
 class ToolboxTool:
     """
@@ -122,16 +125,20 @@ def __copy(
                 that produce a token)
 
         """
+
+        def _resolve_value(override_value: Optional[T], default_value: T) -> T:
+            """Returns the override_value if it's not None, otherwise the default_value."""
+            return override_value if override_value is not None else default_value
+
         return ToolboxTool(
-            session=session or self.__session,
-            base_url=base_url or self.__base_url,
-            name=name or self.__name__,
-            desc=desc or self.__desc,
-            params=params or self.__params,
-            required_authn_params=required_authn_params or self.__required_authn_params,
-            auth_service_token_getters=auth_service_token_getters
-            or self.__auth_service_token_getters,
-            bound_params=bound_params or self.__bound_parameters,
+            session=_resolve_value(session, self.__session),
+            base_url=_resolve_value(base_url, self.__base_url),
+            name=_resolve_value(name, self.__name__),
+            desc=_resolve_value(desc, self.__desc),
+            params=_resolve_value(params, self.__params),
+            required_authn_params=_resolve_value(required_authn_params, self.__required_authn_params),
+            auth_service_token_getters=_resolve_value(auth_service_token_getters, self.__auth_service_token_getters),
+            bound_params=_resolve_value(bound_params, self.__bound_parameters),
         )
 
     async def __call__(self, *args: Any, **kwargs: Any) -> str:

packages/toolbox-core/tests/test_e2e.py

@@ -159,15 +159,14 @@ async def test_run_tool_param_auth_no_auth(self, toolbox):
         ):
             await tool()
 
-    # TODO: Uncomment after fix
-    # async def test_run_tool_param_auth_no_service(self, toolbox):
-    #     """Tests running a tool with a param requiring auth, without a registered auth service."""
-    #     tool = await toolbox.load_tool("get-row-by-email-auth-wrong-auth-source")
-    #     with pytest.raises(
-    #         Exception,
-    #         match="One of more of the following authn services are required to invoke this tool: my-test-auth3",
-    #     ):
-    #         await tool()
+    async def test_run_tool_param_auth_no_service(self, toolbox):
+        """Tests running a tool with a param requiring auth, without a registered auth service."""
+        tool = await toolbox.load_tool("get-row-by-email-auth-wrong-auth-source")
+        with pytest.raises(
+            Exception,
+            match="One of more of the following authn services are required to invoke this tool: my-test-auth3",
+        ):
+            await tool()
 
     async def test_run_tool_param_auth(self, toolbox, auth_token1):
         """Tests running a tool with a param requiring auth, with correct auth."""