fix some tests

Author: jba

examples/server/memory/kb.go

@@ -434,7 +434,7 @@ func (k knowledgeBase) openNodes(names []string) (KnowledgeGraph, error) {
 func (k knowledgeBase) CreateEntities(ctx context.Context, req *mcp.ServerRequest[*mcp.CallToolParams], args CreateEntitiesArgs) (*mcp.CallToolResult, CreateEntitiesResult, error) {
 	var res mcp.CallToolResult
 
-	entities, err := k.createEntities(req.Params.Arguments.Entities)
+	entities, err := k.createEntities(args.Entities)
 	if err != nil {
 		return nil, CreateEntitiesResult{}, err
 	}
@@ -447,90 +447,84 @@ func (k knowledgeBase) CreateEntities(ctx context.Context, req *mcp.ServerReques
 		Entities: entities,
 	}
 
-	return &res, entities, nil
+	return &res, CreateEntitiesResult{Entities: entities}, nil
 }
 
 func (k knowledgeBase) CreateRelations(ctx context.Context, req *mcp.ServerRequest[*mcp.CallToolParams], args CreateRelationsArgs) (*mcp.CallToolResult, CreateRelationsResult, error) {
 	var res mcp.CallToolResult
 
-	relations, err := k.createRelations(req.Params.Arguments.Relations)
+	relations, err := k.createRelations(args.Relations)
 	if err != nil {
-		return nil, err
+		return nil, CreateRelationsResult{}, err
 	}
 
 	res.Content = []mcp.Content{
 		&mcp.TextContent{Text: "Relations created successfully"},
 	}
 
-	res.StructuredContent = CreateRelationsResult{
-		Relations: relations,
-	}
-
-	return &res, nil
+	return &res, CreateRelationsResult{Relations: relations}, nil
 }
 
 func (k knowledgeBase) AddObservations(ctx context.Context, req *mcp.ServerRequest[*mcp.CallToolParams], args AddObservationsArgs) (*mcp.CallToolResult, AddObservationsResult, error) {
 	var res mcp.CallToolResult
 
-	observations, err := k.addObservations(req.Params.Arguments.Observations)
+	observations, err := k.addObservations(args.Observations)
 	if err != nil {
-		return nil, err
+		return nil, AddObservationsResult{}, err
 	}
 
 	res.Content = []mcp.Content{
 		&mcp.TextContent{Text: "Observations added successfully"},
 	}
 
-	res.StructuredContent = AddObservationsResult{
+	return &res, AddObservationsResult{
 		Observations: observations,
-	}
-
-	return &res, nil
+	}, nil
 }
 
 func (k knowledgeBase) DeleteEntities(ctx context.Context, req *mcp.ServerRequest[*mcp.CallToolParams], args DeleteEntitiesArgs) (*mcp.CallToolResult, struct{}, error) {
 	var res mcp.CallToolResult
 
-	err := k.deleteEntities(req.Params.Arguments.EntityNames)
+	err := k.deleteEntities(args.EntityNames)
 	if err != nil {
-		return nil, err
+		return nil, struct{}{}, err
 	}
 
 	res.Content = []mcp.Content{
 		&mcp.TextContent{Text: "Entities deleted successfully"},
 	}
 
-	return &res, nil
+	return &res, struct{}{}, nil
 }
 
 func (k knowledgeBase) DeleteObservations(ctx context.Context, req *mcp.ServerRequest[*mcp.CallToolParams], args DeleteObservationsArgs) (*mcp.CallToolResult, struct{}, error) {
 	var res mcp.CallToolResult
 
-	err := k.deleteObservations(req.Params.Arguments.Deletions)
+	err := k.deleteObservations(args.Deletions)
 	if err != nil {
-		return nil, err
+		return nil, struct{}{}, err
 	}
 
 	res.Content = []mcp.Content{
 		&mcp.TextContent{Text: "Observations deleted successfully"},
 	}
 
-	return &res, nil
+	return &res, struct{}{}, nil
 }
 
 func (k knowledgeBase) DeleteRelations(ctx context.Context, req *mcp.ServerRequest[*mcp.CallToolParams], args DeleteRelationsArgs) (*mcp.CallToolResult, struct{}, error) {
 	var res mcp.CallToolResult
 
-	err := k.deleteRelations(req.Params.Arguments.Relations)
+	err := k.deleteRelations(args.Relations)
 	if err != nil {
-		return nil, err
+		return nil, struct{}{}, err
 	}
 
 	res.Content = []mcp.Content{
 		&mcp.TextContent{Text: "Relations deleted successfully"},
 	}
 
-	return &res, nil
+	return &res, struct{}{}, nil
 }
 
 func (k knowledgeBase) ReadGraph(ctx context.Context, req *mcp.ServerRequest[*mcp.CallToolParams], args any) (*mcp.CallToolResult, KnowledgeGraph, error) {
@@ -551,31 +545,29 @@ func (k knowledgeBase) ReadGraph(ctx context.Context, req *mcp.ServerRequest[*mc
 func (k knowledgeBase) SearchNodes(ctx context.Context, req *mcp.ServerRequest[*mcp.CallToolParams], args SearchNodesArgs) (*mcp.CallToolResult, KnowledgeGraph, error) {
 	var res mcp.CallToolResult
 
-	graph, err := k.searchNodes(req.Params.Arguments.Query)
+	graph, err := k.searchNodes(args.Query)
 	if err != nil {
-		return nil, err
+		return nil, KnowledgeGraph{}, err
 	}
 
 	res.Content = []mcp.Content{
 		&mcp.TextContent{Text: "Nodes searched successfully"},
 	}
 
 	res.StructuredContent = graph
-	return &res, nil
+	return &res, KnowledgeGraph{}, nil
 }
 
 func (k knowledgeBase) OpenNodes(ctx context.Context, req *mcp.ServerRequest[*mcp.CallToolParams], args OpenNodesArgs) (*mcp.CallToolResult, KnowledgeGraph, error) {
 	var res mcp.CallToolResult
 
-	graph, err := k.openNodes(req.Params.Arguments.Names)
+	graph, err := k.openNodes(args.Names)
 	if err != nil {
-		return nil, err
+		return nil, KnowledgeGraph{}, err
 	}
 
 	res.Content = []mcp.Content{
 		&mcp.TextContent{Text: "Nodes opened successfully"},
 	}
-
-	res.StructuredContent = graph
-	return &res, nil
+	return &res, graph, nil
 }