Add watcher. Make as_mcp more flexible.

Author: monoxgas

docs/api/tools.mdx

@@ -579,11 +579,7 @@ as\_mcp
 -------
 
 ```python
-as_mcp(
-    tools: Iterable[Tool[..., Any] | Callable[..., Any]],
-    *,
-    name: str = "Rigging Tools",
-) -> FastMCP
+as_mcp(*tools: Any, name: str = 'Rigging Tools') -> FastMCP
 ```
 
 Serves a collection of Rigging tools over the Model Context Protocol (MCP).
@@ -595,15 +591,16 @@ the conversion between Rigging's `Tool` objects and the MCP specification.
 **Parameters:**
 
 * **`tools`**
-  (`Iterable[Tool[..., Any] | Callable[..., Any]]`)
-  –An iterable of `rigging.Tool` objects or raw Python functions
-  to be exposed. If raw functions are passed, they will be
-  converted to `Tool` objects automatically.
+  (`Any`, default:
+  `()`
+  )
+  –Any number of `rigging.Tool` objects, raw Python functions,
+  or class instances with `@tool_method` methods.
 * **`name`**
   (`str`, default:
   `'Rigging Tools'`
   )
-  –The name of the MCP server. This is used for identification
+  –The name of the MCP server. This is used for identification.
 
 Example
 
@@ -618,7 +615,7 @@ def add_numbers(a: int, b: int) -> int:
     return a + b
 
 if __name__ == "__main__":
-    rg.as_mcp([add_numbers]).run(
+    rg.as_mcp(add_numbers).run(
         transport="stdio"
     )
 ```
@@ -627,8 +624,7 @@ if __name__ == "__main__":
 <Accordion title="Source code in rigging/tools/mcp.py" icon="code">
 ```python
 def as_mcp(
-    tools: t.Iterable[Tool[..., t.Any] | t.Callable[..., t.Any]],
-    *,
+    *tools: t.Any,
     name: str = "Rigging Tools",
 ) -> "FastMCP":
     """
@@ -639,10 +635,9 @@ def as_mcp(
     the conversion between Rigging's `Tool` objects and the MCP specification.
 
     Args:
-        tools: An iterable of `rigging.Tool` objects or raw Python functions
-               to be exposed. If raw functions are passed, they will be
-               converted to `Tool` objects automatically.
-        name: The name of the MCP server. This is used for identification
+        tools: Any number of `rigging.Tool` objects, raw Python functions,
+               or class instances with `@tool_method` methods.
+        name: The name of the MCP server. This is used for identification.
 
     Example:
         ~~~python
@@ -656,15 +651,32 @@ def as_mcp(
             return a + b
 
         if __name__ == "__main__":
-            rg.as_mcp([add_numbers]).run(
+            rg.as_mcp(add_numbers).run(
                 transport="stdio"
             )
         ~~~
     """
-    rigging_tools = [t if isinstance(t, Tool) else Tool.from_callable(t) for t in tools]
+    rigging_tools: list[Tool[..., t.Any]] = []
+    for tool in flatten_list(list(tools)):
+        interior_tools = [
+            val
+            for _, val in inspect.getmembers(
+                tool,
+                predicate=lambda x: isinstance(x, Tool),
+            )
+        ]
+        if interior_tools:
+            rigging_tools.extend(interior_tools)
+        elif not isinstance(tool, Tool):
+            rigging_tools.append(Tool.from_callable(tool))
+        else:
+            rigging_tools.append(tool)
+
     fastmcp_tools = [
         FastMCPTool.from_function(
-            fn=_create_mcp_handler(tool.fn), name=tool.name, description=tool.description
+            fn=_create_mcp_handler(tool.fn),
+            name=tool.name,
+            description=tool.description,
         )
         for tool in rigging_tools
     ]

docs/api/util.mdx

@@ -340,27 +340,117 @@ shorten\_string
 
 ```python
 shorten_string(
-    content: str, max_length: int, *, sep: str = "..."
+    text: str, max_length: int | None, *, sep: str = "..."
 ) -> str
 ```
 
-Return a string at most max\_length characters long by removing the middle of the string.
+Return a string at most max\_length characters long by removing the middle.
 
 <Accordion title="Source code in rigging/util.py" icon="code">
 ```python
-def shorten_string(content: str, max_length: int, *, sep: str = "...") -> str:
+def shorten_string(text: str, max_length: int | None, *, sep: str = "...") -> str:
     """
-    Return a string at most max_length characters long by removing the middle of the string.
+    Return a string at most max_length characters long by removing the middle.
     """
-    if len(content) <= max_length:
-        return content
+    if max_length is None or len(text) <= max_length:
+        return text
+    return shorten_text(text, max_chars=max_length, separator=sep)
+```
 
-    remaining = max_length - len(sep)
-    if remaining <= 0:
-        return sep
 
-    middle = remaining // 2
-    return content[:middle] + sep + content[-middle:]
+</Accordion>
+
+shorten\_text
+-------------
+
+```python
+shorten_text(
+    text: str,
+    *,
+    max_lines: int | None = None,
+    max_chars: int | None = None,
+    separator: str = "...",
+) -> str
+```
+
+Shortens text to a maximum number of lines and/or characters by removing
+content from the middle.
+
+Line shortening is applied first, followed by character shortening.
+
+**Parameters:**
+
+* **`text`**
+  (`str`)
+  –The string to shorten.
+* **`max_lines`**
+  (`int | None`, default:
+  `None`
+  )
+  –The maximum number of lines to allow.
+* **`max_chars`**
+  (`int | None`, default:
+  `None`
+  )
+  –The maximum number of characters to allow.
+* **`separator`**
+  (`str`, default:
+  `'...'`
+  )
+  –The separator to insert in the middle of the shortened text.
+
+**Returns:**
+
+* `str`
+  –The shortened text
+
+<Accordion title="Source code in rigging/util.py" icon="code">
+```python
+def shorten_text(
+    text: str,
+    *,
+    max_lines: int | None = None,
+    max_chars: int | None = None,
+    separator: str = "...",
+) -> str:
+    """
+    Shortens text to a maximum number of lines and/or characters by removing
+    content from the middle.
+
+    Line shortening is applied first, followed by character shortening.
+
+    Args:
+        text: The string to shorten.
+        max_lines: The maximum number of lines to allow.
+        max_chars: The maximum number of characters to allow.
+        separator: The separator to insert in the middle of the shortened text.
+
+    Returns:
+        The shortened text
+    """
+    # 1 - line count first
+    if max_lines is not None:
+        lines = text.splitlines()
+        if len(lines) > max_lines:
+            remaining_lines = max_lines - 1  # leave space for the separator
+            if remaining_lines <= 0:
+                text = separator  # if max_lines is 1, just use the separator
+            else:
+                half = remaining_lines // 2
+                start_lines = lines[:half]
+                end_lines = lines[-(remaining_lines - half) :]
+                text = "\n".join([*start_lines, separator, *end_lines])
+
+    # 2 - character count
+    if max_chars is not None and len(text) > max_chars:
+        remaining_chars = max_chars - len(separator)
+        if remaining_chars <= 0:
+            text = separator
+        else:
+            half_chars = remaining_chars // 2
+            text = text[:half_chars] + separator + text[-half_chars:]
+
+    return text
 ```
 
 
@@ -413,26 +503,26 @@ truncate\_string
 
 ```python
 truncate_string(
-    content: str, max_length: int, *, suf: str = "..."
+    text: str, max_length: int, *, suf: str = "..."
 ) -> str
 ```
 
 Return a string at most max\_length characters long by removing the end of the string.
 
 <Accordion title="Source code in rigging/util.py" icon="code">
 ```python
-def truncate_string(content: str, max_length: int, *, suf: str = "...") -> str:
+def truncate_string(text: str, max_length: int, *, suf: str = "...") -> str:
     """
     Return a string at most max_length characters long by removing the end of the string.
     """
-    if len(content) <= max_length:
-        return content
+    if len(text) <= max_length:
+        return text
 
     remaining = max_length - len(suf)
     if remaining <= 0:
         return suf
 
-    return content[:remaining] + suf
+    return text[:remaining] + suf
 ```