Merge branch 'main' of github.com:PsiACE/bub

Author: frostming

src/bub/tools/registry.py

@@ -204,8 +204,8 @@ async def execute(
         if descriptor is None:
             raise KeyError(name)
 
-        if descriptor.tool.context:
-            kwargs["context"] = context
+        if "context" in kwargs:
+            raise ValueError("Do not pass 'context' in kwargs; use the 'context=' argument to ToolRegistry.execute().")
         result = descriptor.tool.run(context=context, **kwargs)
         if inspect.isawaitable(result):
             result = await result

tests/test_tool_registry.py

@@ -51,6 +51,19 @@ def handle(*, context: ToolContext, path: str) -> str:
     assert logs.count("tool.call.end name={} duration={:.3f}ms") == 1
 
 
+@pytest.mark.asyncio
+async def test_registry_execute_context_tool_should_work() -> None:
+    registry = ToolRegistry()
+
+    @registry.register(name="ctx.echo", short_description="echo", detail="echo", context=True)
+    def echo(*, context: ToolContext, value: str) -> str:
+        return f"{context.run_id}:{value}"
+
+    ctx = ToolContext(tape="t1", run_id="r1")
+    out = await registry.execute("ctx.echo", kwargs={"value": "hi"}, context=ctx)
+    assert out == "r1:hi"
+
+
 @pytest.mark.asyncio
 async def test_registry_model_tools_use_underscore_names_and_keep_handlers() -> None:
     registry = ToolRegistry()