meshagent-tools 0.25.0__tar.gz → 0.25.2__tar.gz

{meshagent_tools-0.25.0 → meshagent_tools-0.25.2}/CHANGELOG.md

@@ -1,3 +1,18 @@
+## [0.25.2]
+- BREAKING: Agent metadata field renamed from labels to annotations across Python agents and examples.
+- Thread history now limits appended messages to a context window and exposes search/count/range tools for conversation history outside that window.
+- Tool decorator now supports bound instance/class methods as tools.
+- Anthropic adapters omit null/unset fields in serialized payloads and log tool call errors for easier diagnostics.
+- Schema document grep now requires keyword arguments for options like ignore_case.
+
+## [0.25.1]
+- Added Anthropic web search and web fetch toolkits, including beta header injection and request middleware support.
+- Added a container-based shell tool to run commands in persistent containers with configurable image, mounts, and environment.
+- Expanded the web fetch tool to return text, JSON, or file responses with HTML-to-Markdown conversion and content-type handling.
+- Breaking: CLI commands now reject OpenAI-only tool flags when using Claude models (image generation, local shell, apply patch, computer use).
+- CLI MCP bridge adds streamable HTTP connections plus custom headers and secret-backed headers; OAuth2 secret set now accepts text/base64 input and identity-scoped secrets.
+- Dependency updates: mcp to ~1.26.0; html-to-markdown to ~2.24.3.
+
 ## [0.25.0]
 - Added SQL column-schema parsing and CLI support for SQL-like `--columns` when creating tables or adding columns.
 - Breaking: SQL query requests now use a single `params` map for typed bindings instead of `parameters`/`param_values`.

{meshagent_tools-0.25.0/meshagent_tools.egg-info → meshagent_tools-0.25.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshagent-tools
-Version: 0.25.0
+Version: 0.25.2
 Summary: Tools for Meshagent
 License-Expression: Apache-2.0
 Project-URL: Documentation, https://docs.meshagent.com
@@ -12,7 +12,8 @@ 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.0
+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
 Dynamic: license-file

{meshagent_tools-0.25.0 → meshagent_tools-0.25.2}/meshagent/tools/__init__.py

@@ -31,6 +31,19 @@ from .hosting import (
 )
 from .multi_tool import MultiTool, MultiToolkit
 from .version import __version__
+from .web_toolkit import (
+    WebFetchConfig,
+    WebFetchTool,
+    WebFetchToolkitBuilder,
+    WebToolkit,
+)
+from .container_shell import (
+    ContainerShellToolConfig,
+    ContainerShellToolkitBuilder,
+    ContainerShellTool,
+)
+
+from .script import ScriptTool, ScriptToolConfig, ScriptToolkitBuilder
 
 from meshagent.api import websocket_protocol, RoomClient, ParticipantToken
 from meshagent.api.websocket_protocol import WebSocketClientProtocol
@@ -66,5 +79,15 @@ __all__ = [
     make_toolkits,
     ToolkitConfig,
     get_bytes_from_url,
+    WebFetchConfig,
+    WebFetchTool,
+    WebFetchToolkitBuilder,
+    WebToolkit,
+    ContainerShellToolConfig,
+    ContainerShellToolkitBuilder,
+    ContainerShellTool,
+    ScriptTool,
+    ScriptToolConfig,
+    ScriptToolkitBuilder,
     __version__,
 ]

meshagent_tools-0.25.2/meshagent/tools/container_shell.py

@@ -0,0 +1,226 @@
+from meshagent.api import RoomClient
+from .tool import ToolContext, Tool
+from .toolkit import Toolkit, ToolkitBuilder
+
+from meshagent.api.specs.service import ContainerMountSpec, RoomStorageMountSpec
+from typing import Literal, Optional
+import os
+
+import logging
+import asyncio
+from pydantic import BaseModel
+
+logger = logging.getLogger("container_shell_tool")
+
+
+DEFAULT_CONTAINER_MOUNT_SPEC = ContainerMountSpec(
+    room=[RoomStorageMountSpec(path="/data")]
+)
+
+
+class ContainerShellToolConfig(BaseModel):
+    name: Literal["container_shell"] = "container_shell"
+
+
+class ContainerShellToolkitBuilder(ToolkitBuilder):
+    def __init__(
+        self,
+        *,
+        name: str = "container_shell",
+        working_directory: Optional[str] = None,
+        image: Optional[str] = "python:3.13",
+        mounts: Optional[ContainerMountSpec] = DEFAULT_CONTAINER_MOUNT_SPEC,
+        env: Optional[dict[str, str]] = None,
+    ):
+        super().__init__(name=name, type=ContainerShellToolConfig)
+
+        self.working_directory = working_directory
+        self.image = image
+        self.mounts = mounts
+        self.env = env
+
+    async def make(
+        self, *, room: RoomClient, model: str, config: ContainerShellToolConfig
+    ) -> Toolkit:
+        return Toolkit(
+            name=self.name,
+            tools=[
+                ContainerShellTool(
+                    name=self.name,
+                    working_directory=self.working_directory,
+                    image=self.image,
+                    mounts=self.mounts,
+                    env=self.env,
+                )
+            ],
+        )
+
+
+class ContainerShellTool(Tool):
+    def __init__(
+        self,
+        *,
+        name: str = "container_shell",
+        description: Optional[str] = None,
+        title: Optional[str] = None,
+        working_directory: Optional[str] = None,
+        image: Optional[str] = "python:3.13",
+        mounts: Optional[ContainerMountSpec] = DEFAULT_CONTAINER_MOUNT_SPEC,
+        env: Optional[dict[str, str]] = None,
+    ):
+        self.working_directory = working_directory
+        self.image = image
+        self.mounts = mounts
+        self._container_id = None
+        self.env = env
+
+        super().__init__(
+            name=name,
+            description=description
+            or "execute shell commands in a container and return the result",
+            title=title,
+            input_schema={
+                "type": "object",
+                "required": ["commands"],
+                "additionalProperties": False,
+                "properties": {
+                    "commands": {"type": "array", "items": {"type": "string"}},
+                    "max_output_length": {"type": "integer"},
+                    "timeout_ms": {"type": "integer"},
+                },
+            },
+        )
+
+    async def execute(
+        self,
+        context: ToolContext,
+        **kwargs,
+    ):
+        commands = kwargs.get("commands") or []
+        max_output_length = kwargs.get("max_output_length")
+        timeout_ms = kwargs.get("timeout_ms")
+
+        if not commands:
+            raise Exception("commands is required")
+
+        if self.image is None:
+            raise Exception("container_shell requires an image")
+
+        results = []
+        encoding = os.device_encoding(1) or "utf-8"
+
+        left = max_output_length
+
+        def limit(s: str):
+            nonlocal left
+            if left is not None:
+                s = s[0:left]
+                left -= len(s)
+                return s
+            else:
+                return s
+
+        timeout = float(timeout_ms) / 1000.0 if timeout_ms else 20 * 1000.0
+
+        running = False
+
+        if self._container_id:
+            for c in await context.room.containers.list():
+                if c.id == self._container_id:
+                    running = True
+
+        if not running:
+            self._container_id = await context.room.containers.run(
+                command="sleep infinity",
+                image=self.image,
+                mounts=self.mounts,
+                writable_root_fs=True,
+                env=self.env,
+            )
+
+        container_id = self._container_id
+
+        try:
+            logger.info(
+                "executing shell commands in container %s with timeout %s: %s",
+                container_id,
+                timeout,
+                commands,
+            )
+            import shlex
+
+            for command in commands:
+                command_to_run = command
+                if self.working_directory:
+                    command_to_run = (
+                        f"cd {shlex.quote(self.working_directory)} && {command}"
+                    )
+                exec = await context.room.containers.exec(
+                    container_id=container_id,
+                    command=shlex.join(["bash", "-lc", command_to_run]),
+                    tty=False,
+                )
+
+                stdout = bytearray()
+                stderr = bytearray()
+
+                try:
+                    async with asyncio.timeout(timeout):
+                        async for se in exec.stderr():
+                            stderr.extend(se)
+
+                        async for so in exec.stdout():
+                            stdout.extend(so)
+
+                        exit_code = await exec.result
+
+                        results.append(
+                            {
+                                "outcome": {
+                                    "type": "exit",
+                                    "exit_code": exit_code,
+                                },
+                                "stdout": stdout.decode(),
+                                "stderr": stderr.decode(),
+                            }
+                        )
+
+                except asyncio.TimeoutError:
+                    logger.info("The command timed out after %ss", timeout)
+                    await exec.kill()
+
+                    results.append(
+                        {
+                            "outcome": {"type": "timeout"},
+                            "stdout": limit(stdout.decode(encoding, errors="replace")),
+                            "stderr": limit(stderr.decode(encoding, errors="replace")),
+                        }
+                    )
+                    break
+
+                except Exception as ex:
+                    results.append(
+                        {
+                            "outcome": {
+                                "type": "exit",
+                                "exit_code": 1,
+                            },
+                            "stdout": "",
+                            "stderr": f"{ex}",
+                        }
+                    )
+                    break
+
+        except Exception as ex:
+            results.append(
+                {
+                    "outcome": {
+                        "type": "exit",
+                        "exit_code": 1,
+                    },
+                    "stdout": "",
+                    "stderr": f"{ex}",
+                }
+            )
+
+        return {"results": results}

{meshagent_tools-0.25.0 → meshagent_tools-0.25.2}/meshagent/tools/script.py

@@ -1,9 +1,7 @@
 from meshagent.api import RoomClient
-from meshagent.tools import Toolkit, ToolContext, Tool
+from meshagent.tools.tool import Tool, ToolContext
+from meshagent.tools.toolkit import Toolkit, ToolkitBuilder
 
-from meshagent.agents.adapter import (
-    ToolkitBuilder,
-)
 
 from meshagent.api.specs.service import ContainerMountSpec, RoomStorageMountSpec
 from typing import Literal

{meshagent_tools-0.25.0 → meshagent_tools-0.25.2}/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-0.25.0 → meshagent_tools-0.25.2}/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-0.25.2/meshagent/tools/version.py

@@ -0,0 +1 @@
+__version__ = "0.25.2"

meshagent_tools-0.25.2/meshagent/tools/web_toolkit.py

@@ -0,0 +1,135 @@
+from __future__ import annotations
+
+import json
+import mimetypes
+import os
+from urllib.parse import urlparse
+
+from meshagent.api.http import new_client_session
+from meshagent.api.messaging import FileResponse, JsonResponse, Response, TextResponse
+from meshagent.tools.config import ToolkitConfig
+from meshagent.tools.tool import Tool, ToolContext
+from meshagent.tools.toolkit import Toolkit, ToolkitBuilder
+from meshagent.api.room_server_client import RoomClient
+
+
+class WebToolkit(Toolkit):
+    def __init__(self):
+        super().__init__(name="web_fetch", tools=[WebFetchTool()])
+
+
+class WebFetchTool(Tool):
+    def __init__(self):
+        super().__init__(
+            name="web_fetch",
+            title="web fetch",
+            description="fetches a url and returns text, json, or file content",
+            input_schema={
+                "type": "object",
+                "properties": {
+                    "url": {
+                        "type": "string",
+                        "description": "the url of the web page (always start it with a proper scheme like https://)",
+                    }
+                },
+                "required": ["url"],
+                "additionalProperties": False,
+            },
+        )
+
+    async def execute(self, context: ToolContext, **kwargs: object) -> Response:
+        url = str(kwargs.get("url", ""))
+        if not url:
+            raise ValueError("url is required")
+        async with new_client_session() as session:
+            async with session.get(url) as resp:
+                if resp.status >= 400:
+                    raise Exception(f"web fetch failed with status {resp.status}")
+
+                content_type = (resp.content_type or "").lower()
+                data = await resp.read()
+
+                if _is_json_content_type(content_type):
+                    text = _decode_text(data=data, charset=resp.charset)
+                    try:
+                        parsed = json.loads(text)
+                    except json.JSONDecodeError:
+                        return TextResponse(text=text)
+
+                    if isinstance(parsed, dict):
+                        return JsonResponse(json=parsed)
+                    return JsonResponse(json={"data": parsed})
+
+                if _is_text_content_type(content_type):
+                    text = _decode_text(data=data, charset=resp.charset)
+                    if content_type == "text/html":
+                        from html_to_markdown import convert
+
+                        text = convert(text)
+                    return TextResponse(text=text)
+
+                if _is_file_content_type(content_type):
+                    filename = _infer_filename(url=url, content_type=content_type)
+                    return FileResponse(
+                        name=filename,
+                        mime_type=content_type or "application/octet-stream",
+                        data=data,
+                    )
+
+                filename = _infer_filename(url=url, content_type=content_type)
+                return FileResponse(
+                    name=filename,
+                    mime_type=content_type or "application/octet-stream",
+                    data=data,
+                )
+
+
+def _decode_text(*, data: bytes, charset: str | None) -> str:
+    encoding = charset or "utf-8"
+    return data.decode(encoding, errors="replace")
+
+
+def _is_json_content_type(content_type: str) -> bool:
+    if content_type in {"application/json", "text/json"}:
+        return True
+    return content_type.endswith("+json")
+
+
+def _is_text_content_type(content_type: str) -> bool:
+    if content_type.startswith("text/"):
+        return True
+    return content_type in {
+        "application/xml",
+        "application/xhtml+xml",
+        "application/javascript",
+        "application/x-javascript",
+    }
+
+
+def _is_file_content_type(content_type: str) -> bool:
+    if content_type.startswith("image/"):
+        return True
+    return content_type == "application/pdf"
+
+
+def _infer_filename(*, url: str, content_type: str) -> str:
+    parsed = urlparse(url)
+    basename = os.path.basename(parsed.path)
+    if basename:
+        return basename
+    extension = mimetypes.guess_extension(content_type or "") or ""
+    return f"downloaded-content{extension}"
+
+
+class WebFetchConfig(ToolkitConfig):
+    name: str = "web_fetch"
+
+
+class WebFetchToolkitBuilder(ToolkitBuilder):
+    def __init__(self):
+        super().__init__(name="web_fetch", type=WebFetchConfig)
+
+    async def make(
+        self, *, room: RoomClient, model: str, config: WebFetchConfig
+    ) -> Toolkit:
+        return WebToolkit()

{meshagent_tools-0.25.0 → meshagent_tools-0.25.2/meshagent_tools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshagent-tools
-Version: 0.25.0
+Version: 0.25.2
 Summary: Tools for Meshagent
 License-Expression: Apache-2.0
 Project-URL: Documentation, https://docs.meshagent.com
@@ -12,7 +12,8 @@ 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.0
+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
 Dynamic: license-file

{meshagent_tools-0.25.0 → meshagent_tools-0.25.2}/meshagent_tools.egg-info/SOURCES.txt

@@ -6,6 +6,7 @@ pyproject.toml
 meshagent/tools/__init__.py
 meshagent/tools/blob.py
 meshagent/tools/config.py
+meshagent/tools/container_shell.py
 meshagent/tools/database.py
 meshagent/tools/datetime.py
 meshagent/tools/discovery.py

{meshagent_tools-0.25.0 → meshagent_tools-0.25.2}/meshagent_tools.egg-info/requires.txt

@@ -1,6 +1,7 @@
 pyjwt~=2.10
 pytest~=8.4
 pytest-asyncio~=0.26
-meshagent-api~=0.25.0
+meshagent-api~=0.25.2
+html-to-markdown~=2.24.3
 aiohttp[speedups]~=3.13.0
 opentelemetry-distro~=0.54b1

{meshagent_tools-0.25.0 → meshagent_tools-0.25.2}/pyproject.toml

@@ -12,7 +12,8 @@ dependencies = [
   "pyjwt~=2.10",
   "pytest~=8.4",
   "pytest-asyncio~=0.26",
-  "meshagent-api~=0.25.0",
+  "meshagent-api~=0.25.2",
+  "html-to-markdown~=2.24.3",
   "aiohttp[speedups]~=3.13.0",
   "opentelemetry-distro~=0.54b1"
 ]

meshagent_tools-0.25.0/meshagent/tools/version.py

@@ -1 +0,0 @@
-__version__ = "0.25.0"

meshagent_tools-0.25.0/meshagent/tools/web_toolkit.py

@@ -1,42 +0,0 @@
-from meshagent.api.messaging import TextResponse
-from meshagent.tools import Toolkit, Tool, ToolContext
-from aiohttp import ClientSession
-
-
-class WebToolkit(Toolkit):
-    def __init__(self):
-        super().__init__(tools=[WebFetchTool()])
-
-
-class WebFetchTool(Tool):
-    def __init__(self):
-        super().__init__(
-            name="get_web_page_text",
-            title="get web page text",
-            description="gets the text of a web page",
-            input_schema={
-                "type": "object",
-                "properties": {
-                    "url": {
-                        "type": "string",
-                        "description": "the url of the web page (always start it with a proper scheme like https://)",
-                    }
-                },
-                "additionalProperties": False,
-            },
-        )
-
-    async def execute(
-        self,
-        *,
-        context: ToolContext,
-        url: str,
-    ) -> str:
-        async with ClientSession() as session:
-            async with session.get(url) as resp:
-                body = await resp.text()
-
-                from bs4 import BeautifulSoup
-
-                soup = BeautifulSoup(body, "html.parser")
-                return TextResponse(text=soup.get_text())