Use TABULAR/PLOTLY_FIGURE PropRole.matches() in formatters

Author: KoolADE85

dash/mcp/primitives/tools/prop_roles.py

@@ -100,7 +100,7 @@ def _compute_dropdown_value_schema(param: MCPInput) -> dict[str, Any]:
     description="Returns formatted text",
 )
 
-GENERIC_FIGURE = PropRole(
+PLOTLY_FIGURE = PropRole(
     identifiers={(ANY_COMPONENT, "figure")},
     description="Returns chart/visualization data",
     input_schema={

dash/mcp/primitives/tools/results/result_dataframe.py

@@ -13,15 +13,11 @@
 
 from dash.mcp.types import MCPOutput
 
+from ..prop_roles import TABULAR
 from .base import ResultFormatter
 
 MAX_ROWS = 50
 
-_TABULAR_PROPS = {
-    ("DataTable", "data"),
-    ("AgGrid", "rowData"),
-}
-
 
 def _to_markdown_table(rows: list[dict], max_rows: int = MAX_ROWS) -> str:
     """Render a list of row dicts as a markdown table."""
@@ -54,8 +50,7 @@ class DataFrameResult(ResultFormatter):
     def format(
         cls, output: MCPOutput, returned_output_value: Any
     ) -> list[TextContent | ImageContent]:
-        key = (output.get("component_type"), output.get("property"))
-        if key not in _TABULAR_PROPS:
+        if not TABULAR.matches(output.get("component_type"), output.get("property")):
             return []
         if (
             not isinstance(returned_output_value, list)

dash/mcp/primitives/tools/results/result_plotly_figure.py

@@ -11,6 +11,7 @@
 
 from dash.mcp.types import MCPOutput
 
+from ..prop_roles import PLOTLY_FIGURE
 from .base import ResultFormatter
 
 logger = logging.getLogger(__name__)
@@ -45,9 +46,8 @@ class PlotlyFigureResult(ResultFormatter):
     def format(
         cls, output: MCPOutput, returned_output_value: Any
     ) -> list[TextContent | ImageContent]:
-        if (
-            output.get("component_type") != "Graph"
-            or output.get("property") != "figure"
+        if not PLOTLY_FIGURE.matches(
+            output.get("component_type"), output.get("property")
         ):
             return []
         if not isinstance(returned_output_value, dict):