made more changes

Author: darkcoderrises

dgraph/cmd/alpha/run.go

@@ -43,9 +43,9 @@ import (
 	_ "github.com/dgraph-io/gqlparser/v2/validator/rules" // make gql validator init() all rules
 	"github.com/dgraph-io/ristretto/v2/z"
 	"github.com/hypermodeinc/dgraph/v25/audit"
+	"github.com/hypermodeinc/dgraph/v25/dgraph/cmd/mcp"
 	"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"
@@ -113,7 +113,7 @@ they form a Raft group and provide synchronous replication.
 	flag.String("custom_tokenizers", "",
 		"Comma separated list of tokenizer plugins for custom indices.")
 
-	flag.Bool("mcp", true, "Enable MCP server.")
+	flag.Bool("mcp", false, "run MCP server along with alpha.")
 
 	// By default Go GRPC traces all requests.
 	grpc.EnableTracing = false
@@ -477,7 +477,7 @@ func serveGRPC(l net.Listener, tlsCfg *tls.Config, closer *z.Closer) {
 }
 
 func setupMcp(baseMux *http.ServeMux, connectionString, url string, readOnly bool) error {
-	s, err := dgraphmcp.NewMCPServer(connectionString, readOnly)
+	s, err := mcp.NewMCPServer(connectionString, readOnly)
 	if err != nil {
 		glog.Errorf("Failed to initialize MCPServer: %v", err)
 		return err

mcp/README.md dgraph/cmd/mcp/README.mdmcp/README.md renamed to dgraph/cmd/mcp/README.md

@@ -19,6 +19,18 @@ management and querying capabilities. There are two ways you can access the mcp
 - Install dgraph alpha
 - Start dgraph alpha
 
+For Read only:
+
+```json
+{
+  "dgraph-mcp-ro": {
+    "serverUrl": "http://localhost:8080/mcp-ro/sse"
+  }
+}
+```
+
+For Read write:
+
 ```json
 {
   "dgraph-mcp": {
@@ -29,26 +41,22 @@ management and querying capabilities. There are two ways you can access the mcp
 
 ## Setup Instructions for go code
 
-- Install golang 1.23+
-- Clone the repository
-- cd mcp/dgraph-mcp
-- go build
+- Install dgraph binary
 - 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",
-      }
+      "command": "dgraph_binary",
+      "args": ["mcp -c dgraph://localhost:9080"]
     }
   }
 }
 ```
 
+- Modify the server details using args in dgraph mcp command
+
 ### Local Setup for Claude Desktop
 
 You can setup a local experience using Claude app

mcp/mcp_server.go dgraph/cmd/mcp/mcp_server.gomcp/mcp_server.go renamed to dgraph/cmd/mcp/mcp_server.go

@@ -2,7 +2,9 @@ package mcp
 
 import (
 	"context"
+	_ "embed"
 	"fmt"
+	"sync"
 	"time"
 
 	"github.com/dgraph-io/dgo/v250"
@@ -13,16 +15,23 @@ import (
 	"github.com/mark3labs/mcp-go/server"
 )
 
+//go:embed prompt.txt
+var promptBytes []byte
+
 var dgraphConnection *dgo.Dgraph
+var getConnLock sync.Mutex
 
 func getConn(connectionString string) (*dgo.Dgraph, error) {
+	getConnLock.Lock()
+	defer getConnLock.Unlock()
+
 	if dgraphConnection != nil {
 		return dgraphConnection, nil
 	}
 
 	conn, err := dgo.Open(connectionString)
 	if err != nil {
-		for i := range 10 {
+		for i := range 3 {
 			time.Sleep(time.Second * time.Duration(i))
 			conn, err = dgo.Open(connectionString)
 			if err == nil {
@@ -41,7 +50,7 @@ func getConn(connectionString string) (*dgo.Dgraph, error) {
 func NewMCPServer(connectionString string, readOnly bool) (*server.MCPServer, error) {
 	s := server.NewMCPServer(
 		"Dgraph MCP Server",
-		"1.0.0",
+		"v25.0.0",
 		server.WithResourceCapabilities(true, true),
 		server.WithLogging(),
 		server.WithRecovery(),
@@ -226,10 +235,10 @@ func NewMCPServer(connectionString string, readOnly bool) (*server.MCPServer, er
 			{
 				"shortest_path_query": "
 					{
-						q(func: eq(guid, "something") { // get first uid in form of a query
+						q(func: eq(guid, "first guid") { // get first uid in form of a query
 							a as uid
 						}
-						q1(func: eq(guid, "something else")) { // get second uid in form of a query
+						q1(func: eq(guid, "second guid")) { // get second uid in form of a query
 							b as uid
 						}
 						path as shortest(from: uid(a), to: uid(b), numpaths: 5, maxheapsize: 10000) {
@@ -259,10 +268,10 @@ func NewMCPServer(connectionString string, readOnly bool) (*server.MCPServer, er
 				{
 					"shortest_path_query": "
 						{
-							q(func: eq(guid, "something") { // get first uid in form of a query
+							q(func: eq(guid, "first guid")) { // get first uid in form of a query
 								a as uid
 							}
-							q1(func: eq(guid, "something else")) { // get second uid in form of a query
+							q1(func: eq(guid, "second guid")) { // get second uid in form of a query
 								b as uid
 							}
 
@@ -302,5 +311,24 @@ func NewMCPServer(connectionString string, readOnly bool) (*server.MCPServer, er
 		}, nil
 	})
 
+	addPrompt(s)
+
 	return s, nil
 }
+
+func addPrompt(s *server.MCPServer) {
+	prompt := string(promptBytes)
+	s.AddPrompt(mcp.NewPrompt("Quick start prompt",
+		mcp.WithPromptDescription("A quick Start prompt for new users and llms"),
+	), func(ctx context.Context, request mcp.GetPromptRequest) (*mcp.GetPromptResult, error) {
+		return mcp.NewGetPromptResult(
+			"A quick start prompt",
+			[]mcp.PromptMessage{
+				mcp.NewPromptMessage(
+					mcp.RoleAssistant,
+					mcp.NewTextContent(prompt),
+				),
+			},
+		), nil
+	})
+}

mcp/prompt.txt dgraph/cmd/mcp/prompt.txtmcp/prompt.txt renamed to dgraph/cmd/mcp/prompt.txt

@@ -10,7 +10,6 @@ import (
 	"github.com/mark3labs/mcp-go/server"
 	"github.com/spf13/cobra"
 
-	"github.com/hypermodeinc/dgraph/v25/mcp"
 	"github.com/hypermodeinc/dgraph/v25/x"
 )
 
@@ -23,28 +22,28 @@ func init() {
 		Use:   "mcp",
 		Short: "Run Dgraph MCP server",
 		Long: `
-A Dgraph MCP server is a long running process that provides an STDIO interface for running mcp
+A Dgraph MCP server is a long running process that provides an STDIO
+interface for running mcp server.
 `,
 		Run: func(cmd *cobra.Command, args []string) {
-			defer x.StartProfile(Mcp.Conf).Stop()
 			run()
 		},
-		Annotations: map[string]string{"group": "core"},
+		Annotations: map[string]string{"group": "tool"},
 	}
 	Mcp.EnvPrefix = "DGRAPH_MCP"
 	Mcp.Cmd.SetHelpTemplate(x.NonRootTemplate)
 
 	flag := Mcp.Cmd.Flags()
 
-	flag.StringP("connection", "c", "dgraph://localhost:9080", "Dgraph connection string.")
+	flag.StringP("con-str", "c", "", "Dgraph connection string.")
 	flag.Bool("read-only", false, "Run MCP server in read-only mode.")
 }
 
 func run() {
-	connectionString := Mcp.Conf.GetString("connection")
-	readOnly := Mcp.Conf.GetBool("read_only")
+	connectionString := Mcp.Conf.GetString("con-str")
+	readOnly := Mcp.Conf.GetBool("read-only")
 
-	s, err := mcp.NewMCPServer(connectionString, readOnly)
+	s, err := NewMCPServer(connectionString, readOnly)
 	if err != nil {
 		glog.Errorf("Failed to initialize MCPServer: %v", err)
 		return