meshagent-tools 0.25.1__py3-none-any.whl → 0.25.2__py3-none-any.whl

meshagent/tools/tests/tool_decorator_test.py

@@ -36,6 +36,31 @@ async def test_decorated_tool_executes_with_toolkit():
     assert result.json == {"name": "alpha", "count": 2, "flag": True}
 
 
+class Greeter:
+    def __init__(self, prefix: str) -> None:
+        self._prefix = prefix
+
+    @tool(name="greet")
+    def greet(self, *, name: str) -> str:
+        return f"{self._prefix}{name}"
+
+
+@pytest.mark.asyncio
+async def test_decorated_method_executes_with_toolkit():
+    greeter = Greeter("hello ")
+    toolkit = Toolkit(name="test", tools=[greeter.greet])
+    context = ToolContext(room=object(), caller=object())
+
+    result = await toolkit.execute(
+        context=context,
+        name="greet",
+        arguments={"name": "mesh"},
+    )
+
+    assert isinstance(result, JsonResponse)
+    assert result.json == "hello mesh"
+
+
 def test_decorator_schema_is_strict():
     schema = make_payload.input_schema
 

meshagent/tools/tool.py

@@ -147,7 +147,16 @@ def tool(
         supports_context = False
         fields: dict[str, tuple[Any, Any]] = {}
 
-        for param_name, param in signature.parameters.items():
+        parameters = list(signature.parameters.items())
+        bound_param_name = None
+        if parameters:
+            first_param_name, _first_param = parameters[0]
+            if first_param_name in ("self", "cls"):
+                bound_param_name = first_param_name
+
+        for param_name, param in parameters:
+            if bound_param_name == param_name:
+                continue
             annotation = hints.get(param_name, Any)
             if annotation is ToolContext:
                 supports_context = True
@@ -167,7 +176,7 @@ def tool(
         )
 
         class FunctionTool(Tool):
-            def __init__(self):
+            def __init__(self, bound_instance: Optional[object] = None):
                 super().__init__(
                     name=tool_name,
                     title=tool_title,
@@ -178,6 +187,20 @@ def tool(
                     supports_context=supports_context,
                 )
                 self.strict = True
+                self._bound_instance = bound_instance
+
+            def __get__(self, instance, owner):
+                if instance is None:
+                    if bound_param_name == "cls" and owner is not None:
+                        if self._bound_instance is owner:
+                            return self
+                        return FunctionTool(bound_instance=owner)
+                    return self
+
+                if self._bound_instance is instance:
+                    return self
+
+                return FunctionTool(bound_instance=instance)
 
             async def invoke(
                 self,
@@ -188,10 +211,18 @@ def tool(
                 data = InputModel.model_validate(arguments)
                 parsed_args = {field: getattr(data, field) for field in fields}
 
+                bound_instance = self._bound_instance
+
                 if supports_context:
-                    result = fn(context, **parsed_args)
+                    if bound_instance is not None:
+                        result = fn(bound_instance, context, **parsed_args)
+                    else:
+                        result = fn(context, **parsed_args)
                 else:
-                    result = fn(**parsed_args)
+                    if bound_instance is not None:
+                        result = fn(bound_instance, **parsed_args)
+                    else:
+                        result = fn(**parsed_args)
 
                 if inspect.isawaitable(result):
                     result = await result

meshagent/tools/version.py

@@ -1 +1 @@
-__version__ = "0.25.1"
+__version__ = "0.25.2"

{meshagent_tools-0.25.1.dist-info → meshagent_tools-0.25.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshagent-tools
-Version: 0.25.1
+Version: 0.25.2
 Summary: Tools for Meshagent
 License-Expression: Apache-2.0
 Project-URL: Documentation, https://docs.meshagent.com
@@ -12,7 +12,7 @@ License-File: LICENSE
 Requires-Dist: pyjwt~=2.10
 Requires-Dist: pytest~=8.4
 Requires-Dist: pytest-asyncio~=0.26
-Requires-Dist: meshagent-api~=0.25.1
+Requires-Dist: meshagent-api~=0.25.2
 Requires-Dist: html-to-markdown~=2.24.3
 Requires-Dist: aiohttp[speedups]~=3.13.0
 Requires-Dist: opentelemetry-distro~=0.54b1

{meshagent_tools-0.25.1.dist-info → meshagent_tools-0.25.2.dist-info}/RECORD

@@ -12,14 +12,14 @@ meshagent/tools/pydantic.py,sha256=n-MD0gC-oRtHSTUDD5IV2dP-xIk-zjcDgHfgjqMgiqM,1
 meshagent/tools/script.py,sha256=eyQiufoc2ZkTUBTO58VQURnkkQA2lboED5s0-BvAvgM,11811
 meshagent/tools/storage.py,sha256=NVpi9CZKSZUh8PTxxCdJhJy7Gzmdp55-zo2yHYGod_E,23340
 meshagent/tools/strict_schema.py,sha256=IytdAANa6lsfrsg5FsJuqYrxH9D_fayl-Lc9EwgLJSM,6277
-meshagent/tools/tool.py,sha256=HgvlOlz2wMrmD5aaV49fRpnGyXJwnVcH9j4wKaaPbWo,5935
+meshagent/tools/tool.py,sha256=eokq9Sh6aGao7w2PlExx1WJcfy4OovfMaQUluwsulnA,7221
 meshagent/tools/toolkit.py,sha256=iVcCvhwWqmahDow9FN-VRWGo9MEj669Vw7TAB7Mx9Ww,4066
 meshagent/tools/uuid.py,sha256=mzRwDmXy39U5lHhd9wqV4r-ZdS8jPfDTTs4UfW4KHJQ,1342
-meshagent/tools/version.py,sha256=ACu2Z3Q3TFgYpAno_eu9ssJ1QULjNXvjGvyqDSHrQ_o,23
+meshagent/tools/version.py,sha256=NMzPG-AisbqV0qHNDcM-oIMtdXA6rLhjzeATPyNq6Nw,23
 meshagent/tools/web_toolkit.py,sha256=Seju8gpdUoPku7Yfar_s-cVOnlweFzKj-bFqrQVup8o,4603
-meshagent/tools/tests/tool_decorator_test.py,sha256=Fd4uvoefU8hpdSWaiYen15tqnlwoY092G6hjYafaMGE,1190
-meshagent_tools-0.25.1.dist-info/licenses/LICENSE,sha256=eTt0SPW-sVNdkZe9PS_S8WfCIyLjRXRl7sUBWdlteFg,10254
-meshagent_tools-0.25.1.dist-info/METADATA,sha256=I_DrA3zW7uRwNXwllW8OSipjUKQimC_BgOP4_8xoDBI,2930
-meshagent_tools-0.25.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-meshagent_tools-0.25.1.dist-info/top_level.txt,sha256=GlcXnHtRP6m7zlG3Df04M35OsHtNXy_DY09oFwWrH74,10
-meshagent_tools-0.25.1.dist-info/RECORD,,
+meshagent/tools/tests/tool_decorator_test.py,sha256=8o9JwhOU6rdbJJdyCYfT4B8m9JgmMSAkU8QTpo4OmGg,1826
+meshagent_tools-0.25.2.dist-info/licenses/LICENSE,sha256=eTt0SPW-sVNdkZe9PS_S8WfCIyLjRXRl7sUBWdlteFg,10254
+meshagent_tools-0.25.2.dist-info/METADATA,sha256=X2n1kOJ-WFqsT45x1EcKcDsY3PqCiZkKwW0Y2g-V3o8,2930
+meshagent_tools-0.25.2.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+meshagent_tools-0.25.2.dist-info/top_level.txt,sha256=GlcXnHtRP6m7zlG3Df04M35OsHtNXy_DY09oFwWrH74,10
+meshagent_tools-0.25.2.dist-info/RECORD,,