simplify names further to UserDefinedTool and SystemTool

Author: bcallender

src/fenic/__init__.py

@@ -108,10 +108,10 @@
     StructField,
     StructType,
     StructuredOutputStrategy,
-    SystemToolDefinition,
+    SystemTool,
     ToolParam,
     TranscriptType,
-    UserDefinedToolDefinition,
+    UserDefinedTool,
 )
 from fenic.core.error import InvalidExampleCollectionError
 from fenic.core.types.semantic import ModelAlias
@@ -237,8 +237,8 @@
     # MCP
     "ToolParam",
     "BoundToolParam",
-    "UserDefinedToolDefinition",
-    "SystemToolDefinition",
+    "UserDefinedTool",
+    "SystemTool",
     "ToolGenerationConfig",
     "create_mcp_server",
     "run_mcp_server_asgi",

src/fenic/_backends/cloud/catalog.py

@@ -51,7 +51,7 @@
     TableAlreadyExistsError,
     TableNotFoundError,
 )
-from fenic.core.mcp.types import ToolParam, UserDefinedToolDefinition
+from fenic.core.mcp.types import ToolParam, UserDefinedTool
 from fenic.core.types import DatasetMetadata, Schema
 from fenic.core.types.schema import ColumnField
 
@@ -341,7 +341,7 @@ def set_view_description(self, view_name: str, description: str) -> bool:
             "Set view description not implemented for cloud catalog"
         )
 
-    def describe_tool(self, tool_name: str) -> UserDefinedToolDefinition:
+    def describe_tool(self, tool_name: str) -> UserDefinedTool:
         """Find and return the tool from the current database."""
         # TODO: Implement get tool for the cloud
         raise NotImplementedError(
@@ -368,7 +368,7 @@ def drop_tool(self, tool_name: str, ignore_if_not_exists: bool = True) -> bool:
             "Drop tool not implemented for cloud catalog"
         )
 
-    def list_tools(self) -> List[UserDefinedToolDefinition]:
+    def list_tools(self) -> List[UserDefinedTool]:
         """Get a list of all tools in the current database."""
         raise NotImplementedError(
             "List tools not implemented for cloud catalog"

src/fenic/_backends/local/catalog.py

@@ -30,7 +30,7 @@
     ToolNotFoundError,
 )
 from fenic.core.mcp._tools import bind_tool
-from fenic.core.mcp.types import ToolParam, UserDefinedToolDefinition
+from fenic.core.mcp.types import ToolParam, UserDefinedTool
 from fenic.core.metrics import QueryMetrics
 from fenic.core.types import (
     DatasetMetadata,
@@ -506,7 +506,7 @@ def set_view_description(self, view_name: str, description: Optional[str]) -> bo
                 ) from e
 
 
-    def describe_tool(self, tool_name: str) -> Optional[UserDefinedToolDefinition]:
+    def describe_tool(self, tool_name: str) -> Optional[UserDefinedTool]:
         """Get a tool's metadata from the system table."""
         cursor = self.db_conn.cursor()
         existing_tool = self.system_tables.describe_tool(cursor, tool_name)
@@ -534,7 +534,7 @@ def create_tool(
         self.system_tables.save_tool(cursor, tool_definition)
         return True
 
-    def list_tools(self) -> List[UserDefinedToolDefinition]:
+    def list_tools(self) -> List[UserDefinedTool]:
         """List all tools in the current catalog."""
         cursor = self.db_conn.cursor()
         return self.system_tables.list_tools(cursor)

src/fenic/_backends/local/system_table_client.py

@@ -19,7 +19,7 @@
 from fenic.core._serde.proto.serde_context import SerdeContext
 from fenic.core._serde.proto.types import ToolDefinitionProto
 from fenic.core.error import CatalogError
-from fenic.core.mcp.types import UserDefinedToolDefinition
+from fenic.core.mcp.types import UserDefinedTool
 from fenic.core.metrics import QueryMetrics
 from fenic.core.types import ColumnField, DatasetMetadata, Schema
 from fenic.core.types.datatypes import (
@@ -465,7 +465,7 @@ def delete_database_views(self, cursor: duckdb.DuckDBPyConnection, database_name
                 f"Failed to delete views metadata for database {database_name}"
             ) from e
 
-    def save_tool(self, cursor: duckdb.DuckDBPyConnection, tool: UserDefinedToolDefinition) -> None:
+    def save_tool(self, cursor: duckdb.DuckDBPyConnection, tool: UserDefinedTool) -> None:
         """Save a tool's metadata to the system table.
         Raises:
             CatalogError: If the tool metadata cannot be saved.
@@ -486,7 +486,7 @@ def save_tool(self, cursor: duckdb.DuckDBPyConnection, tool: UserDefinedToolDefi
                 f"Failed to save tool metadata for {tool.name}"
             ) from e
 
-    def describe_tool(self, cursor: duckdb.DuckDBPyConnection, tool_name: str) -> Optional[UserDefinedToolDefinition]:
+    def describe_tool(self, cursor: duckdb.DuckDBPyConnection, tool_name: str) -> Optional[UserDefinedTool]:
         """Get a tool's metadata from the system table.
         Raises:
             CatalogError: If the tool metadata cannot be retrieved.
@@ -508,7 +508,7 @@ def describe_tool(self, cursor: duckdb.DuckDBPyConnection, tool_name: str) -> Op
                 f"Failed to retrieve tool metadata for {tool_name}"
             ) from e
 
-    def list_tools(self, cursor: duckdb.DuckDBPyConnection) -> List[UserDefinedToolDefinition]:
+    def list_tools(self, cursor: duckdb.DuckDBPyConnection) -> List[UserDefinedTool]:
         """List all tools in the system table.
         Raises:
             CatalogError: If the tools metadata cannot be retrieved.
@@ -815,7 +815,7 @@ def _initialize_tools_metadata(self, cursor: duckdb.DuckDBPyConnection) -> None:
                 f"Failed to initialize tools and {TOOLS_METADATA_TABLE} table"
             ) from e
 
-    def _deserialize_and_resolve_tool(self, row: tuple) -> UserDefinedToolDefinition:
+    def _deserialize_and_resolve_tool(self, row: tuple) -> UserDefinedTool:
        decoded_tool = base64.b64decode(row[0])
        proto_tool = ToolDefinitionProto.FromString(decoded_tool)
        return self.serde_context.deserialize_tool_definition(proto_tool)

src/fenic/api/catalog.py

@@ -6,7 +6,7 @@
 
 from fenic.api.dataframe.dataframe import DataFrame
 from fenic.core._interfaces.catalog import BaseCatalog
-from fenic.core.mcp.types import ToolParam, UserDefinedToolDefinition
+from fenic.core.mcp.types import ToolParam, UserDefinedTool
 from fenic.core.types import DatasetMetadata, Schema
 
 
@@ -654,7 +654,7 @@ def drop_view(self, view_name: str, ignore_if_not_exists: bool = True) -> bool:
         return self.catalog.drop_view(view_name, ignore_if_not_exists)
 
     @validate_call(config=ConfigDict(strict=True))
-    def describe_tool(self, tool_name: str) -> UserDefinedToolDefinition:
+    def describe_tool(self, tool_name: str) -> UserDefinedTool:
         """Returns the tool with the specified name from the current catalog.
 
         Args:
@@ -747,7 +747,7 @@ def drop_tool(self, tool_name: str, ignore_if_not_exists: bool = True) -> bool:
         """
         return self.catalog.drop_tool(tool_name, ignore_if_not_exists)
 
-    def list_tools(self) -> List[UserDefinedToolDefinition]:
+    def list_tools(self) -> List[UserDefinedTool]:
         """Lists the tools available in the current catalog."""
         return self.catalog.list_tools()
 

src/fenic/api/mcp/server.py

@@ -13,14 +13,15 @@
 from fenic.api.session.session import Session
 from fenic.core.error import ConfigurationError
 from fenic.core.mcp._server import FenicMCPServer, MCPTransport
-from fenic.core.mcp.types import SystemToolDefinition, UserDefinedToolDefinition
+from fenic.core.mcp.types import SystemTool, UserDefinedTool
 
 
 def create_mcp_server(
     session: Session,
     server_name: str,
     *,
-    user_defined_tools: Optional[List[UserDefinedToolDefinition]] = None,
+    user_defined_tools: Optional[List[UserDefinedTool]] = None,
+    system_tools: Optional[List[SystemTool]] = None,
     automated_tool_generation: Optional[ToolGenerationConfig] = None,
     concurrency_limit: int = 8,
 ) -> FenicMCPServer:
@@ -29,13 +30,13 @@ def create_mcp_server(
     Args:
         session: Fenic session used to execute tools.
         server_name: Name of the MCP server.
+        system_tools: List of system tools to register (optional).
         user_defined_tools: Tools to register (optional).
         automated_tool_generation: Generate automated tools for one or more Dataframes.
         concurrency_limit: Maximum number of concurrent tool executions.
     """
-    system_tools: List[SystemToolDefinition] = []
-    if user_defined_tools is None:
-        user_defined_tools = []
+    system_tools = system_tools or []
+    user_defined_tools = user_defined_tools or []
     if automated_tool_generation:
         system_tools.extend(auto_generate_system_tools_from_tables(
             automated_tool_generation.table_names,

src/fenic/api/mcp/tool_generation.py

@@ -11,17 +11,10 @@
 
 from __future__ import annotations
 
-import asyncio
-import functools
 import hashlib
-import inspect
 import re
 from dataclasses import dataclass
-from inspect import iscoroutinefunction
 from typing import (
-    Any,
-    Callable,
-    Coroutine,
     Dict,
     List,
     Literal,
@@ -45,7 +38,7 @@
 from fenic.core._logical_plan.plans.base import LogicalPlan
 from fenic.core._utils.schema import convert_custom_dtype_to_polars
 from fenic.core.error import ConfigurationError, ValidationError
-from fenic.core.mcp.types import SystemToolDefinition, TableFormat
+from fenic.core.mcp.types import SystemTool
 from fenic.core.types.datatypes import (
     BooleanType,
     DoubleType,
@@ -92,7 +85,7 @@ def auto_generate_system_tools_from_tables(
     *,
     tool_group_name: str,
     max_result_limit: int = 100,
-) -> List[SystemToolDefinition]:
+) -> List[SystemTool]:
     """Generate Schema/Profile/Read/Search/Analyze tools from catalog tables.
 
     Validates that each table exists and has a non-empty description in catalog metadata.
@@ -112,7 +105,7 @@ def _auto_generate_read_tool(
     tool_description: str,
     *,
     result_limit: int = 50,
-) -> SystemToolDefinition:
+) -> SystemTool:
     """Create a read tool over one or many datasets."""
     if len(datasets) == 0:
         raise ConfigurationError("Cannot create read tool: no datasets provided.")
@@ -165,7 +158,7 @@ async def read_func(
             sort_ascending=sort_ascending,
         )
 
-    return SystemToolDefinition(
+    return SystemTool(
         name=tool_name,
         description=tool_description,
         func=read_func,
@@ -179,7 +172,7 @@ def _auto_generate_search_summary_tool(
     session: Session,
     tool_name: str,
     tool_description: str,
-) -> SystemToolDefinition:
+) -> SystemTool:
     """Create a grep-like summary tool over one or many datasets (string columns)."""
     if len(datasets) == 0:
         raise ValueError("Cannot create search summary tool: no datasets provided.")
@@ -205,7 +198,7 @@ async def search_summary(
         pl_df = pl.DataFrame(rows)
         return InMemorySource.from_session_state(pl_df, session._session_state)
 
-    return SystemToolDefinition(
+    return SystemTool(
         name=tool_name,
         description=tool_description,
         func=search_summary,
@@ -220,7 +213,7 @@ def _auto_generate_search_content_tool(
     tool_description: str,
     *,
     result_limit: int = 100,
-) -> SystemToolDefinition:
+) -> SystemTool:
     """Create a content search tool for a single dataset (string columns)."""
     if len(datasets) == 0:
         raise ValidationError("Cannot create search content tool: no datasets provided.")
@@ -276,7 +269,7 @@ async def search_rows(
             sort_ascending=sort_ascending,
         )
 
-    return SystemToolDefinition(
+    return SystemTool(
         name=tool_name,
         description=tool_description,
         func=search_rows,
@@ -290,7 +283,7 @@ def _auto_generate_schema_tool(
     session: Session,
     tool_name: str,
     tool_description: str,
-) -> SystemToolDefinition:
+) -> SystemTool:
     """Create a schema tool over one or many datasets.
 
     - Returns one row per dataset with a column `schema` containing a list of
@@ -337,7 +330,7 @@ async def schema_func(
             session._session_state,
         )
 
-    return SystemToolDefinition(
+    return SystemTool(
         name=tool_name,
         description=tool_description.strip(),
         func=schema_func,
@@ -352,7 +345,7 @@ def _auto_generate_sql_tool(
     tool_description: str,
     *,
     result_limit: int = 100,
-) -> SystemToolDefinition:
+) -> SystemTool:
     """Create an Analyze tool that executes DuckDB SELECT SQL across datasets.
 
     - JOINs between the provided datasets are allowed.
@@ -389,7 +382,7 @@ async def analyze_func(
     )
     enhanced_description = "\n".join(lines)
 
-    tool = SystemToolDefinition(
+    tool = SystemTool(
         name=tool_name,
         description=enhanced_description,
         func=analyze_func,
@@ -485,7 +478,7 @@ def _auto_generate_profile_tool(
     tool_description: str,
     *,
     topk_distinct: int = 10,
-) -> SystemToolDefinition:
+) -> SystemTool:
     """Create a cached Profile tool for one or many datasets.
 
     Output columns include:
@@ -525,7 +518,7 @@ async def profile_func(
 
         return profile_df._logical_plan
 
-    return SystemToolDefinition(
+    return SystemTool(
         name=tool_name,
         description=tool_description,
         func=profile_func,
@@ -700,7 +693,7 @@ def _auto_generate_system_tools(
     *,
     tool_group_name: str,
     max_result_limit: int = 100,
-) -> List[SystemToolDefinition]:
+) -> List[SystemTool]:
     """Generate core tools spanning all datasets: Schema, Profile, Analyze.
 
     - Schema: list columns/types for any or all datasets

src/fenic/core/__init__.py

@@ -2,9 +2,9 @@
 
 from fenic.core.mcp import (
     BoundToolParam,
-    SystemToolDefinition,
+    SystemTool,
     ToolParam,
-    UserDefinedToolDefinition,
+    UserDefinedTool,
 )
 from fenic.core.metrics import (
     LMMetrics,
@@ -105,6 +105,6 @@
     # MCP
     "ToolParam",
     "BoundToolParam",
-    "UserDefinedToolDefinition",
-    "SystemToolDefinition",
+    "UserDefinedTool",
+    "SystemTool",
 ]

src/fenic/core/_interfaces/catalog.py

@@ -7,7 +7,7 @@
 
 if TYPE_CHECKING:
     from fenic.core._logical_plan.plans.base import LogicalPlan
-    from fenic.core.mcp.types import ToolParam, UserDefinedToolDefinition
+    from fenic.core.mcp.types import ToolParam, UserDefinedTool
 
 
 class BaseCatalog(ABC):
@@ -145,7 +145,7 @@ def describe_view(self, view_name: str) -> DatasetMetadata:
         pass
 
     @abstractmethod
-    def describe_tool(self, tool_name: str) -> UserDefinedToolDefinition:
+    def describe_tool(self, tool_name: str) -> UserDefinedTool:
         """Find and return the tool from the current catalog."""
         pass
 
@@ -168,6 +168,6 @@ def drop_tool(self, tool_name: str, ignore_if_not_exists: bool = True) -> bool:
         pass
 
     @abstractmethod
-    def list_tools(self) -> List[UserDefinedToolDefinition]:
+    def list_tools(self) -> List[UserDefinedTool]:
         """Get a list of all tools in the current catalog."""
         pass