Merge branch 'main' into devon/LangGraph_create_react_agent_example

Author: DevonFulcher

.changes/unreleased/Bug Fix-20250813-105549.yaml

@@ -0,0 +1,3 @@
+kind: Bug Fix
+body: Fix the prompt to ensure grain is passed even for non-time group by"
+time: 2025-08-13T10:55:49.072094-04:00

.changes/unreleased/Enhancement or New Feature-20250813-070837.yaml

@@ -0,0 +1,3 @@
+kind: Enhancement or New Feature
+body: Add default --limit to show tool
+time: 2025-08-13T07:08:37.699907-07:00

.changes/unreleased/Under the Hood-20250813-160036.yaml

@@ -0,0 +1,3 @@
+kind: Under the Hood
+body: Define toolsets
+time: 2025-08-13T16:00:36.907595-05:00

src/dbt_mcp/dbt_cli/tools.py

@@ -117,9 +117,7 @@ def test(
 
     def show(
         sql_query: str = Field(description=get_prompt("dbt_cli/args/sql_query")),
-        limit: int | None = Field(
-            default=None, description=get_prompt("dbt_cli/args/limit")
-        ),
+        limit: int = Field(default=5, description=get_prompt("dbt_cli/args/limit")),
     ) -> str:
         args = ["show", "--inline", sql_query, "--favor-state"]
         # This is quite crude, but it should be okay for now

src/dbt_mcp/prompts/dbt_cli/args/limit.md

@@ -1 +1 @@
-Limit the number of rows that the data platform will return. Use this in place of a `LIMIT` clause in the SQL query.
+Limit the number of rows that the data platform will return. Use this in place of a `LIMIT` clause in the SQL query. If no limit is passed, use the default of 5 to prevent returning a very large result set.

src/dbt_mcp/prompts/semantic_layer/query_metrics.md

@@ -81,12 +81,12 @@ Question: "What's our average order value by product category for orders over $1
     - I should first limit results to verify the query works
     Parameters (initial query):
     metrics=["average_order_value"]
-    group_by=[{"name": "product_category", "type": "dimension"}]
+    group_by=[{"name": "product_category", "type": "dimension", "grain":null}]
     where="{{ Dimension('order_value') }} > 100"
     limit=10
     Follow-up Query (after verifying results):
     metrics=["average_order_value"]
-    group_by=[{"name": "product_category", "type": "dimension"}]
+    group_by=[{"name": "product_category", "type": "dimension", "grain":null}]
     where="{{ Dimension('order_value') }} > 100"
     limit=None
 </example>
@@ -131,7 +131,7 @@ Question: "What's our customer satisfaction score by region?"
     If user agrees, then:
     Parameters:
     metrics=["net_promoter_score"]
-    group_by=[{"name": "region", "type": "dimension"}]
+    group_by=[{"name": "region", "type": "dimension", "grain":null}]
     order_by=[{"name": "net_promoter_score", "desc": true}]
     limit=10
 </example>

src/dbt_mcp/tools/toolsets.py

@@ -0,0 +1,42 @@
+from enum import Enum
+
+from dbt_mcp.tools.tool_names import ToolName
+
+
+class Toolset(Enum):
+    SQL = "sql"
+    SEMANTIC_LAYER = "semantic_layer"
+    DISCOVERY = "discovery"
+    DBT_CLI = "dbt_cli"
+
+
+toolsets = {
+    Toolset.SQL: {
+        ToolName.TEXT_TO_SQL,
+        ToolName.EXECUTE_SQL,
+    },
+    Toolset.SEMANTIC_LAYER: {
+        ToolName.LIST_METRICS,
+        ToolName.GET_DIMENSIONS,
+        ToolName.GET_ENTITIES,
+        ToolName.QUERY_METRICS,
+        ToolName.GET_METRICS_COMPILED_SQL,
+    },
+    Toolset.DISCOVERY: {
+        ToolName.GET_MART_MODELS,
+        ToolName.GET_ALL_MODELS,
+        ToolName.GET_MODEL_DETAILS,
+        ToolName.GET_MODEL_PARENTS,
+        ToolName.GET_MODEL_CHILDREN,
+    },
+    Toolset.DBT_CLI: {
+        ToolName.BUILD,
+        ToolName.COMPILE,
+        ToolName.DOCS,
+        ToolName.LIST,
+        ToolName.PARSE,
+        ToolName.RUN,
+        ToolName.TEST,
+        ToolName.SHOW,
+    },
+}

tests/unit/tools/test_toolsets.py

@@ -0,0 +1,29 @@
+from dbt_mcp.config.config import load_config
+from dbt_mcp.mcp.server import create_dbt_mcp
+from dbt_mcp.tools.toolsets import toolsets
+from tests.env_vars import default_env_vars_context
+
+
+async def test_toolsets_match_server_tools():
+    """Test that the defined toolsets match the tools registered in the server."""
+    sql_tool_names = {"text_to_sql", "execute_sql"}
+
+    with default_env_vars_context():
+        config = load_config()
+        dbt_mcp = await create_dbt_mcp(config)
+
+        # Get all tools from the server
+        server_tools = await dbt_mcp.list_tools()
+        # Manually adding SQL tools here because the server doesn't get them
+        # in this unit test.
+        server_tool_names = {tool.name for tool in server_tools} | sql_tool_names
+        defined_tools = set()
+        for toolset_tools in toolsets.values():
+            defined_tools.update({t.value for t in toolset_tools})
+
+        if server_tool_names != defined_tools:
+            raise ValueError(
+                f"Tool name mismatch:\n"
+                f"In server but not in enum: {server_tool_names - defined_tools}\n"
+                f"In enum but not in server: {defined_tools - server_tool_names}"
+            )