`ruff format .` across the repo: 153 files, no behaviour change. This is the second gate CONTRIBUTING.md promises, and until now it reported 154 files needing reformat — so a first contributor ran the command the guide told them to run and could not tell their own diff from the background. Landed on its own, with nothing else in it, because a whole-repo reformat is only safe to skip past in blame if it is provably nothing but layout. It was checked that way rather than assumed: every changed file was formatted in memory and compared by full `ast.dump()`, and 152 of 153 come out structurally identical (the one exception was a docstring opening on a quote character, fixed in the commit before this one). The string and comment token streams were diffed separately, so a quote flip or an edited comment could not hide inside a re-layout — five quote-style normalisations and sixteen implicit-concatenation joins, all value-identical, and one commented-out line gaining the space after its `#`. `meshterm specimen` is byte-identical on both platforms, and the suite is 1888 green, gallery gate and `test_theme16` included. What actually changed, in order of how much of the diff it is: wrapped calls and signatures rejoin onto one line where they fit inside the hundred columns; the magic trailing comma expands what it is there to expand; complex slices gain their spaces (`[len(noise) :]`); a few redundant parens go. The tables that are laid out to be read were fenced in the previous commit and are untouched here. The aligned trailing-comment column is gone from about ninety lanes that were not fenced — including the `heat.*` ladder in `MESH_THEME`, which cannot be fenced where it sits. Every comment stays on the entry it describes, so nothing there reads wrong; it just no longer lines up. Add this commit to `.git-blame-ignore-revs`, which follows immediately. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
237 lines
8.8 KiB
Python
237 lines
8.8 KiB
Python
"""The tool plugin contract and registry.
|
|
|
|
A *tool* is one menu option / CLI subcommand. Subclass :class:`Tool`, decorate it with
|
|
:func:`register`, and implement :meth:`Tool.run`. The same registry drives both the
|
|
interactive menu and the Typer CLI, and :meth:`Tool.execute` wraps every invocation in a
|
|
logged ``runs`` row, so new tools get persistence and logging for free.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from abc import ABC, abstractmethod
|
|
from dataclasses import dataclass, field
|
|
from typing import TYPE_CHECKING, Any
|
|
|
|
if TYPE_CHECKING: # avoid importing typer/context at module load for fast startup
|
|
import typer
|
|
|
|
from ..context import AppContext
|
|
|
|
|
|
@dataclass(slots=True)
|
|
class ToolResult:
|
|
"""The outcome of a tool execution.
|
|
|
|
Attributes:
|
|
summary: JSON-serializable summary persisted to the run record.
|
|
message: Optional human-readable closing message.
|
|
artifacts: Paths to any files produced (e.g. generated visualizations).
|
|
"""
|
|
|
|
summary: dict[str, Any] = field(default_factory=dict)
|
|
message: str | None = None
|
|
artifacts: list[str] = field(default_factory=list)
|
|
|
|
|
|
class Tool(ABC):
|
|
"""Base class for all MeshTerm features.
|
|
|
|
Class Attributes:
|
|
name: CLI identifier (kebab-case), unique across tools.
|
|
title: Display name shown as the interactive menu item and on the tool's result
|
|
window. Capitalized, and kept identical to the screen the item opens so the
|
|
menu never promises one name and delivers another. Falls back to ``name``.
|
|
help: One-line description shown in the menu and ``--help`` (no trailing period).
|
|
icon: Emoji drawn before the title in the interactive menu (and only there — the
|
|
result window keeps the plain title). Single-codepoint, emoji-presentation
|
|
glyphs only, so the two-cell width holds across terminals (see
|
|
:mod:`meshterm.ui.tui.emoji_width`).
|
|
category: Grouping label used to organize the interactive menu.
|
|
order: Sort key within a category (lower sorts first).
|
|
menu_visible: Whether the tool appears in the interactive menu. Set ``False`` for
|
|
CLI-only tools (e.g. startup-time diagnostics with no place in a connected
|
|
session); such tools still register a CLI subcommand as usual.
|
|
popup: Whether the menu stays pushed while this tool runs, so the tool's prompts
|
|
and result float over it as modal popups (the quit-dialog pattern) instead of
|
|
replacing the screen. For quick dialog-sized tools; a tool that pushes its
|
|
own full screen keeps the default.
|
|
"""
|
|
|
|
name: str = ""
|
|
title: str = ""
|
|
help: str = ""
|
|
icon: str = ""
|
|
category: str = "General"
|
|
order: int = 100
|
|
menu_visible: bool = True
|
|
popup: bool = False
|
|
|
|
@abstractmethod
|
|
async def run(self, ctx: AppContext, params: dict[str, Any]) -> ToolResult:
|
|
"""Execute the tool's work.
|
|
|
|
Args:
|
|
ctx: Shared application context (console, device, repository, ...).
|
|
params: Validated parameters for this invocation.
|
|
|
|
Returns:
|
|
A :class:`ToolResult` describing the outcome.
|
|
"""
|
|
|
|
async def prompt_params(self, ctx: AppContext) -> dict[str, Any]:
|
|
"""Interactively gather parameters for the menu.
|
|
|
|
The default implementation requires no parameters. Tools override this to ask
|
|
the user via ``questionary``.
|
|
|
|
Args:
|
|
ctx: Shared application context.
|
|
|
|
Returns:
|
|
A parameter dict compatible with :meth:`run`.
|
|
"""
|
|
return {}
|
|
|
|
def register_cli(self, app: typer.Typer) -> None:
|
|
"""Register this tool as a Typer subcommand.
|
|
|
|
The default registers a no-argument command. Tools with parameters override this
|
|
to declare typed options, then delegate to :meth:`execute`.
|
|
|
|
Args:
|
|
app: The Typer application to add the command to.
|
|
"""
|
|
from ..cli import run_tool_command
|
|
|
|
@app.command(name=self.name, help=self.help)
|
|
def _command() -> None:
|
|
run_tool_command(self, {})
|
|
|
|
async def execute(self, ctx: AppContext, params: dict[str, Any]) -> ToolResult:
|
|
"""Run the tool wrapped in run-logging and error capture.
|
|
|
|
Opens a ``runs`` row before execution and closes it with the final status and
|
|
summary afterward, regardless of success.
|
|
|
|
Args:
|
|
ctx: Shared application context.
|
|
params: Parameters for this invocation.
|
|
|
|
Returns:
|
|
The :class:`ToolResult` from :meth:`run`.
|
|
|
|
Raises:
|
|
Exception: Re-raises any error from :meth:`run` after recording it.
|
|
"""
|
|
from ..core.connection import DeviceCommandError
|
|
from ..core.device_config import DeviceConfigError
|
|
from ..core.preferences import PreferenceError
|
|
from ..core.selection import DeviceSelectionError
|
|
|
|
run_id = ctx.repo.start_run(self.name, params, ctx.profile_name)
|
|
ctx.log.debug("run %s start: tool=%s params=%s", run_id, self.name, params)
|
|
try:
|
|
result = await self.run(ctx, {**params, "_run_id": run_id})
|
|
except (
|
|
DeviceSelectionError,
|
|
DeviceConfigError,
|
|
DeviceCommandError,
|
|
PreferenceError,
|
|
) as exc:
|
|
# Expected user-facing condition (no/ambiguous device, a bad config or
|
|
# preference value, or a transient command failure): record it but don't dump
|
|
# a traceback; callers print the message cleanly.
|
|
ctx.repo.finish_run(run_id, "error", {"error": str(exc)})
|
|
ctx.log.debug("run %s aborted: %s", run_id, exc)
|
|
raise
|
|
except Exception as exc: # noqa: BLE001 - we record then re-raise
|
|
ctx.repo.finish_run(run_id, "error", {"error": str(exc)})
|
|
ctx.log.exception("run %s failed: %s", run_id, exc)
|
|
raise
|
|
ctx.repo.finish_run(run_id, "ok", result.summary)
|
|
ctx.log.debug("run %s ok", run_id)
|
|
return result
|
|
|
|
|
|
_REGISTRY: dict[str, Tool] = {}
|
|
|
|
#: Explicit menu ordering for tool categories. The menu asks "What would you like to
|
|
#: do?", so its sections answer that: each names a *doing*, not a subject, and holds
|
|
#: everything that shares it. Message leads (the everyday features, plus the book you
|
|
#: pick a recipient from), then Watch (what the mesh is doing, what it did, what to be
|
|
#: told about), Explore (where the nodes are, how they reach each other, and the boards
|
|
#: that score the walking), then the two scopes a setting can belong to — This node, the
|
|
#: radio in your hand, and Other nodes, someone else's over the mesh.
|
|
#:
|
|
#: This app closes the list as the third and last *scope*, after the radio in your hand and
|
|
#: someone else's over the mesh: the program in front of you. It holds the one thing that
|
|
#: changes how MeshTerm behaves (Preferences) and the four pages that say what MeshTerm is
|
|
#: — questions none of the doings above can hold, and which nothing on the mesh can answer.
|
|
#: It sits last because a reader who has run out of things to do is who goes looking for it.
|
|
#: Categories not listed here sort last, alphabetically, so a new category still appears.
|
|
_CATEGORY_ORDER = [
|
|
"Message",
|
|
"Watch",
|
|
"Explore",
|
|
"This node",
|
|
"Other nodes",
|
|
"This app",
|
|
]
|
|
|
|
|
|
def _category_rank(category: str) -> int:
|
|
"""Return a category's sort rank (its position in ``_CATEGORY_ORDER``, else last)."""
|
|
try:
|
|
return _CATEGORY_ORDER.index(category)
|
|
except ValueError:
|
|
return len(_CATEGORY_ORDER)
|
|
|
|
|
|
def register(cls: type[Tool]) -> type[Tool]:
|
|
"""Class decorator that instantiates a tool and adds it to the registry.
|
|
|
|
Args:
|
|
cls: The :class:`Tool` subclass to register.
|
|
|
|
Returns:
|
|
The unchanged class (so the decorator is transparent).
|
|
|
|
Raises:
|
|
ValueError: If the tool has no ``name`` or the name is already registered.
|
|
"""
|
|
instance = cls()
|
|
if not instance.name:
|
|
raise ValueError(f"{cls.__name__} must define a non-empty 'name'.")
|
|
if instance.name in _REGISTRY:
|
|
raise ValueError(f"Duplicate tool name: {instance.name!r}")
|
|
_REGISTRY[instance.name] = instance
|
|
return cls
|
|
|
|
|
|
def all_tools() -> list[Tool]:
|
|
"""Return all registered tools sorted by category rank, then order, then name.
|
|
|
|
Categories are ordered by :data:`_CATEGORY_ORDER` (Mesh first), so the first-class
|
|
Chat and Channels tools lead the menu; within a category, ``order`` then ``name`` break
|
|
ties.
|
|
|
|
Returns:
|
|
The registered tool instances in stable menu order.
|
|
"""
|
|
return sorted(
|
|
_REGISTRY.values(),
|
|
key=lambda t: (_category_rank(t.category), t.category, t.order, t.name),
|
|
)
|
|
|
|
|
|
def get_tool(name: str) -> Tool | None:
|
|
"""Look up a registered tool by name.
|
|
|
|
Args:
|
|
name: The tool's ``name``.
|
|
|
|
Returns:
|
|
The tool instance, or ``None`` if not registered.
|
|
"""
|
|
return _REGISTRY.get(name)
|