Merge pull request #3 from alaturqua/add_tools

refactor: rename show_* functions to list_* and add describe_table fu…

Author: alaturqua

README.md

@@ -104,18 +104,18 @@ The server provides the following MCP resources:
 
 ### Catalog and Schema Navigation
 
-- **catalog://main** (`show_catalogs`)
+- **catalog://main** (`list_catalogs`)
 
   - Lists all available Trino catalogs
   - No parameters required
 
-- **schema://{catalog}** (`show_schemas`)
+- **schema://{catalog}** (`list_schemas`)
 
   - Lists all schemas in the specified catalog
   - Parameters:
     - `catalog`: Catalog name (string, required)
 
-- **table://{catalog}/{schema}** (`show_tables`)
+- **table://{catalog}/{schema}** (`list_tables`)
   - Lists all tables in the specified schema
   - Parameters:
     - `catalog`: Catalog name (string, required)
@@ -125,6 +125,32 @@ The server provides the following MCP resources:
 
 ### Query and Exploration Tools
 
+- **show_catalogs**
+
+  - List all available catalogs
+  - No parameters required
+
+- **show_schemas**
+
+  - List all schemas in a catalog
+  - Parameters:
+    - `catalog`: Catalog name (string, required)
+
+- **show_tables**
+
+  - List all tables in a schema
+  - Parameters:
+    - `catalog`: Catalog name (string, required)
+    - `schema`: Schema name (string, required)
+
+- **describe_table**
+
+  - Show detailed table structure and column information
+  - Parameters:
+    - `table`: Table name (string, required)
+    - `catalog`: Catalog name (string, optional)
+    - `schema`: Schema name (string, optional)
+
 - **execute_query**
 
   - Execute a SQL query and return formatted results

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mcp-trino-python"
-version = "0.3.0"
+version = "0.4.0"
 description = "A Model Context Protocol (MCP) connector for Trino, enabling seamless integration between MCP-compliant services and Trino query engine"
 readme = "README.md"
 license = { text = "Apache-2.0" }

src/server.py

@@ -19,35 +19,83 @@
 # Resources
 @mcp.resource(
     "catalog://main",
-    name="show_catalogs",
+    name="list_catalogs",
     description="List all available Trino catalogs",
 )
-def show_catalogs() -> str:
+def list_catalogs() -> str:
     """List all available Trino catalogs."""
-    return client.show_catalogs()
+    return client.list_catalogs()
 
 
 @mcp.resource(
     "schema://{catalog}",
-    name="show_schemas",
+    name="list_schemas",
     description="List all schemas in the specified catalog",
 )
-def show_schemas(catalog: str) -> str:
+def list_schemas(catalog: str) -> str:
     """List all schemas in a catalog."""
-    return client.show_schemas(catalog)
+    return client.list_schemas(catalog)
 
 
 @mcp.resource(
     "table://{catalog}/{schema}",
-    name="show_tables",
+    name="list_tables",
     description="List all tables in the specified schema",
 )
-def show_tables(catalog: str, schema: str) -> str:
+def list_tables(catalog: str, schema: str) -> str:
     """List all tables in a schema."""
-    return client.show_tables(catalog, schema)
+    return client.list_tables(catalog, schema)
 
 
 # Tools
+@mcp.tool(description="List all available catalogs")
+def show_catalogs() -> str:
+    """List all available catalogs."""
+    return client.list_catalogs()
+
+
+@mcp.tool(description="List all schemas in a catalog")
+def show_schemas(catalog: str) -> str:
+    """List all schemas in a catalog.
+
+    Args:
+        catalog: The name of the catalog
+
+    Returns:
+        str: List of schemas in the specified catalog
+    """
+    return client.list_schemas(catalog)
+
+
+@mcp.tool(description="List all tables in a schema")
+def show_tables(catalog: str, schema: str) -> str:
+    """List all tables in a schema.
+
+    Args:
+        catalog: The name of the catalog
+        schema: The name of the schema
+
+    Returns:
+        str: List of tables in the specified schema
+    """
+    return client.list_tables(catalog, schema)
+
+
+@mcp.tool(description="Describe a table")
+def describe_table(table: str, catalog: str | None = None, schema: str | None = None) -> str:
+    """Describe a table.
+
+    Args:
+        table: The name of the table
+        catalog: Optional catalog name (defaults to configured catalog)
+        schema: Optional schema name (defaults to configured schema)
+
+    Returns:
+        str: Table description in JSON format
+    """
+    return client.describe_table(table, catalog, schema)
+
+
 @mcp.tool(description="Show the CREATE TABLE statement for a specific table")
 def show_create_table(table: str, catalog: str | None = None, schema: str | None = None) -> str:
     """Show the CREATE TABLE statement for a table.

src/trino_client.py

@@ -96,7 +96,7 @@ def get_query_history(self, limit: int | None = None) -> str:
             query += f" LIMIT {limit}"
         return self.execute_query(query)
 
-    def show_catalogs(self) -> str:
+    def list_catalogs(self) -> str:
         """List all available catalogs.
 
         Returns:
@@ -105,7 +105,7 @@ def show_catalogs(self) -> str:
         catalogs = [row["Catalog"] for row in json.loads(self.execute_query("SHOW CATALOGS"))]
         return "\n".join(catalogs)
 
-    def show_schemas(self, catalog: str | None = None) -> str:
+    def list_schemas(self, catalog: str | None = None) -> str:
         """List all schemas in a catalog.
 
         Args:
@@ -125,7 +125,7 @@ def show_schemas(self, catalog: str | None = None) -> str:
         schemas = [row["Schema"] for row in json.loads(self.execute_query(query))]
         return "\n".join(schemas)
 
-    def show_tables(self, catalog: str | None = None, schema: str | None = None) -> str:
+    def list_tables(self, catalog: str | None = None, schema: str | None = None) -> str:
         """List all tables in a schema.
 
         Args:
@@ -147,6 +147,27 @@ def show_tables(self, catalog: str | None = None, schema: str | None = None) ->
         tables = [row["Table"] for row in json.loads(self.execute_query(query))]
         return "\n".join(tables)
 
+    def describe_table(self, table: str, catalog: str | None = None, schema: str | None = None) -> str:
+        """Describe the structure of a table.
+
+        Args:
+            table (str): The name of the table.
+            catalog (Optional[str]): The catalog name. If None, uses configured default.
+            schema (Optional[str]): The schema name. If None, uses configured default.
+
+        Returns:
+            str: JSON-formatted string containing table description.
+
+        Raises:
+            CatalogSchemaError: If either catalog or schema is not specified and not configured.
+        """
+        catalog = catalog or self.config.catalog
+        schema = schema or self.config.schema
+        if not catalog or not schema:
+            raise CatalogSchemaError()
+        query = f"DESCRIBE {catalog}.{schema}.{table}"
+        return self.execute_query(query)
+
     def show_create_table(self, table: str, catalog: str | None = None, schema: str | None = None) -> str:
         """Show the CREATE TABLE statement for a table.