add logic to automated tool creation to add limit, table_format as arguments the mcp server knows about, but are not passed to the tool func

Author: bcallender

src/fenic/api/mcp/server.py

@@ -30,7 +30,7 @@ def create_mcp_server(
         session: Fenic session used to execute tools.
         server_name: Name of the MCP server.
         tools: Tools to register (optional).
-        automated_tool_generation: Generate automated tools for one or more Dataframes
+        automated_tool_generation: Generate automated tools for one or more Dataframes.
         concurrency_limit: Maximum number of concurrent tool executions.
     """
     dynamic_tools: List[DynamicToolDefinition] = []
@@ -43,7 +43,7 @@ def create_mcp_server(
             tool_group_name=automated_tool_generation.tool_group_name,
             sql_max_rows=automated_tool_generation.sql_max_rows)
         )
-    if not tools and not dynamic_tools:
+    if not (tools or dynamic_tools):
         raise ConfigurationError("No tools provided. Either provide tools or set generate_automated_tools=True and provide datasets.")
     return FenicMCPServer(session._session_state, tools, dynamic_tools, server_name, concurrency_limit)
 

src/fenic/api/mcp/tool_generation.py

@@ -110,13 +110,13 @@ def read_func(
         sort_ascending: Annotated[Optional[Union[bool, str]], "Sort ascending for all order_by columns"] = True,
     ) -> LogicalPlan:
 
+        if df_name not in name_to_df:
+            raise ValidationError(f"Unknown DataFrame '{df_name}'. Available: {', '.join(name_to_df.keys())}")
+        df = name_to_df[df_name]
         limit = int(limit) if isinstance(limit, str) else limit
         offset = int(offset) if isinstance(offset, str) else offset
         sort_ascending = bool(sort_ascending) if isinstance(sort_ascending, str) else sort_ascending
         order_by = [c.strip() for c in order_by.split(",") if c.strip()] if order_by else None
-        if df_name not in name_to_df:
-            raise ValidationError(f"Unknown DataFrame '{df_name}'. Available: {', '.join(name_to_df.keys())}")
-        df = name_to_df[df_name]
 
         # order_by when not paginating via OFFSET (to avoid double sorting)
         if order_by and offset is None:
@@ -141,7 +141,7 @@ def read_func(
         name=tool_name,
         description=tool_description,
         func=read_func,
-        result_limit=result_limit,
+        max_result_limit=result_limit,
     )
 
 """
@@ -186,7 +186,7 @@ def search_summary(
         name=tool_name,
         description=tool_description,
         func=search_summary,
-        result_limit=None,
+        max_result_limit=None,
     )
 
 def auto_generate_search_content_tool(
@@ -255,7 +255,7 @@ def search_rows(
         name=tool_name,
         description=tool_description,
         func=search_rows,
-        result_limit=result_limit,
+        max_result_limit=result_limit,
     )
 
 
@@ -322,7 +322,8 @@ def schema_func(
         name=tool_name,
         description=enhanced_description,
         func=schema_func,
-        result_limit=None,
+        max_result_limit=None,
+        default_table_format="structured"
     )
 
 
@@ -387,7 +388,7 @@ def analyze_func(
         name=tool_name,
         description=enhanced_description,
         func=analyze_func,
-        result_limit=result_limit,
+        max_result_limit=result_limit,
     )
     return tool
 
@@ -606,7 +607,8 @@ def profile_func(
         name=tool_name,
         description=enhanced_description,
         func=profile_func,
-        result_limit=None,
+        max_result_limit=None,
+        default_table_format="structured"
     )
 
 

src/fenic/core/_serde/proto/serde_context.py

@@ -932,7 +932,7 @@ def serialize_tool_definition(
                     params=serialized_params,
                     parameterized_view=self.serialize_logical_plan("parameterized_view",
                                                                    tool_definition._parameterized_view),
-                    result_limit=tool_definition.result_limit,
+                    result_limit=tool_definition.max_result_limit,
                 )
             except Exception as e:
                 self._handle_serde_error(e)
@@ -951,7 +951,7 @@ def deserialize_tool_definition(
                     params=[self.deserialize_tool_parameter(tool_param) for tool_param in tool_definition_proto.params],
                     _parameterized_view=self.deserialize_logical_plan("parameterized_view",
                                                                       tool_definition_proto.parameterized_view),
-                    result_limit=tool_definition_proto.result_limit,
+                    max_result_limit=tool_definition_proto.result_limit,
                 )
             except Exception as e:
                 self._handle_serde_error(e)