updated mcp server

Author: darkcoderrises

.gitignore

@@ -4,6 +4,8 @@
 /dgraph-bulk-loader
 /osx-docker-gopath
 
+/mcp/dgraph-mcp/dgraph-mcp
+
 # goland project folder
 .idea
 dgraph.iml

dgraph/cmd/alpha/run.go

@@ -25,7 +25,6 @@ import (
 	"time"
 
 	"github.com/golang/glog"
-	"github.com/mark3labs/mcp-go/mcp"
 	"github.com/mark3labs/mcp-go/server"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
@@ -46,6 +45,7 @@ import (
 	"github.com/hypermodeinc/dgraph/v25/audit"
 	"github.com/hypermodeinc/dgraph/v25/edgraph"
 	"github.com/hypermodeinc/dgraph/v25/graphql/admin"
+	dgraphmcp "github.com/hypermodeinc/dgraph/v25/mcp"
 	"github.com/hypermodeinc/dgraph/v25/posting"
 	"github.com/hypermodeinc/dgraph/v25/schema"
 	"github.com/hypermodeinc/dgraph/v25/tok"
@@ -474,57 +474,23 @@ func serveGRPC(l net.Listener, tlsCfg *tls.Config, closer *z.Closer) {
 	s.Stop()
 }
 
-func setupMcp(baseMux *http.ServeMux) {
-	s := server.NewMCPServer(
-		"Dgraph MCP Server",
-		"1.0.0",
-		server.WithResourceCapabilities(true, true),
-		server.WithLogging(),
-		server.WithRecovery(),
-	)
-
-	schemaTool := mcp.NewTool("Get-Schema",
-		mcp.WithDescription("Get schema from dgraph db"),
-	)
-
-	queryTool := mcp.NewTool("Run-DQL", 
-		mcp.WithDescription("Run DQL mutation / query on dgraph db"),
-		mcp.WithString("query",
-			mcp.Required(),
-			mcp.Description("The query to perform. For mutations the format should look like {set {}}"),
-		),
-	)
-
-	s.AddTool(queryTool, func(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-		op := request.Params.Arguments["query"].(string)
-		req := &apiv25.RunDQLRequest{
-			NsName: "root",
-			DqlQuery: op,
-		}
-		resp, err := (&edgraph.ServerV25{}).RunDQL(ctx, req)
-		if err != nil {
-			return mcp.NewToolResultError(err.Error()), nil
-		}
-		return mcp.NewToolResultText(string(resp.QueryResult)), nil
-	})
-
-	s.AddTool(schemaTool, func(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-		req := &apiv25.RunDQLRequest{
-			NsName: "root",
-			DqlQuery: "schema {}",
-		}
-		resp, err := (&edgraph.ServerV25{}).RunDQL(ctx, req)
-		if err != nil {
-			return mcp.NewToolResultError(err.Error()), nil
-		}
-		return mcp.NewToolResultText(string(resp.QueryResult)), nil
-	})
+func setupMcp(baseMux *http.ServeMux, connectionString, readOnly string) error {
+	s, err := dgraphmcp.NewMCPServer(connectionString, readOnly)
+	if err != nil {
+		glog.Errorf("Failed to initialize MCPServer: %v\n", err)
+		return err
+	}
 
 	sse := server.NewSSEServer(s,
 		server.WithBasePath("/mcp"),
 	)
 	baseMux.HandleFunc("/mcp", sse.ServeHTTP)
 	baseMux.HandleFunc("/mcp/", sse.ServeHTTP)
+	return nil
+}
+
+func buildConnectionString(addr string, port int) string {
+	return fmt.Sprintf("dgraph://%s:%d", addr, port)
 }
 
 func setupServer(closer *z.Closer) {
@@ -563,7 +529,6 @@ func setupServer(closer *z.Closer) {
 	baseMux.HandleFunc("/state", stateHandler)
 	baseMux.HandleFunc("/debug/jemalloc", x.JemallocHandler)
 	http.DefaultServeMux.Handle("/debug/z", zpages.NewTracezHandler(zpages.NewSpanProcessor()))
-	setupMcp(baseMux)
 
 	// TODO: Figure out what this is for?
 	http.HandleFunc("/debug/store", storeStatsHandler)
@@ -631,6 +596,10 @@ func setupServer(closer *z.Closer) {
 	// Initialize the servers.
 	x.ServerCloser.AddRunning(3)
 	go serveGRPC(grpcListener, tlsCfg, x.ServerCloser)
+
+	if err := setupMcp(baseMux, buildConnectionString(laddr, grpcPort()), "true"); err != nil {
+		log.Fatal(err)
+	}
 	go x.StartListenHttpAndHttps(httpListener, tlsCfg, x.ServerCloser)
 
 	go func() {

mcp/README.md

@@ -0,0 +1,72 @@
+# Dgraph MCP (Master Control Protocol)
+
+## Project Overview
+
+This is a Dgraph-based Master Control Protocol (MCP) designed to provide advanced graph database
+management and querying capabilities. There are two ways you can access the mcp server:
+
+1. Using the dgraph alpha's http endpoint
+2. Using the go code
+
+## Key Components
+
+- Dgraph schema management
+- Advanced data querying
+- Flexible graph database interactions
+
+## Setup Instructions for dgraph alpha
+
+- Install dgraph alpha
+- Start dgraph alpha
+
+```json
+{
+  "dgraph-mcp": {
+    "serverUrl": "http://localhost:8080/mcp/sse"
+  }
+}
+```
+
+## Setup Instructions for go code
+
+- Install golang 1.23+
+- Clone the repository
+- cd mcp/dgraph-mcp
+- go build
+- Insert the following to your mcp config:
+
+```json
+{
+  "mcpServers": {
+    "dgraph": {
+      "command": "<path to dgraph folder>/mcp/dgraph-mcp/dgraph-mcp",
+      "env": {
+        "DGRAPH_CONNECTION": "dgraph://<host>:443?sslmode=verify-ca&bearertoken=xxxxxxxxxx",
+        "DGRAPH_READ_ONLY": "true" / "false",
+      }
+    }
+  }
+}
+```
+
+### Local Setup for Claude Desktop
+
+You can setup a local experience using Claude app
+
+Install Claude.app from https://claude.ai/download.
+
+On Mac OS the configurations files are in `~/Library/Application\ Support/Claude`. Create
+`~/Library/Application\ Support/Claude/claude_desktop_config.json` file and set the content with mcp
+config shown above.
+
+Close the Claude app and reopen it.
+
+Check that the tools are listed in Claude desktop (Click on the tools icon).
+
+You are ready to chat and get things done in Dgraph from Claude.
+
+## Troubleshooting
+
+- Check Dgraph connection settings
+- Verify Go module dependencies
+- Review error logs carefully

mcp/dgraph-mcp/main.go

@@ -0,0 +1,27 @@
+package main
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/mark3labs/mcp-go/server"
+
+	"github.com/hypermodeinc/dgraph/v25/mcp"
+)
+
+func main() {
+	// Get connection string from env
+	connectionString := os.Getenv("DGRAPH_CONNECTION")
+	readOnly := os.Getenv("DGRAPH_READ_ONLY")
+
+	s, err := mcp.NewMCPServer(connectionString, readOnly)
+	if err != nil {
+		fmt.Printf("Failed to initialize MCPServer: %v\n", err)
+		return
+	}
+
+	// Start the stdio server
+	if err := server.ServeStdio(s); err != nil {
+		fmt.Printf("Server error: %v\n", err)
+	}
+}