feat: the model supports the ability to invoke built-in tools (casibase#1708)

Author: IsAurora6

agent/agent_util.go

@@ -0,0 +1,63 @@
+package agent
+
+import (
+	"errors"
+	"strings"
+
+	"github.com/ThinkInAIXYZ/go-mcp/protocol"
+	"github.com/casibase/casibase/agent/builtin_tool"
+)
+
+func GetServerNameAndToolNameFromId(id string) (string, string) {
+	tokens := strings.Split(id, "__")
+
+	if len(tokens) == 1 {
+		return "", tokens[0]
+	}
+
+	if len(tokens) > 2 {
+		panic(errors.New("GetServerNameAndToolNameFromName() error, wrong token count for ID: " + id))
+	}
+
+	return tokens[0], tokens[1]
+}
+
+func GetIdFromServerNameAndToolName(ServerName, toolName string) string {
+	return ServerName + "__" + toolName
+}
+
+func MergeBuiltinTools(agentClients *AgentClients, selectedTools []string) *AgentClients {
+	if len(selectedTools) == 0 {
+		return agentClients
+	}
+
+	builtinToolReg := builtin_tool.NewToolRegistry()
+	allBuiltinTools := builtinToolReg.GetToolsAsProtocolTools()
+
+	toolMap := make(map[string]*protocol.Tool, len(allBuiltinTools))
+	for _, tool := range allBuiltinTools {
+		toolMap[tool.Name] = tool
+	}
+
+	selectedBuiltinTools := make([]*protocol.Tool, 0, len(selectedTools))
+	for _, selectedName := range selectedTools {
+		if tool, ok := toolMap[selectedName]; ok {
+			selectedBuiltinTools = append(selectedBuiltinTools, tool)
+		}
+	}
+
+	if len(selectedBuiltinTools) == 0 {
+		return agentClients
+	}
+
+	if agentClients == nil {
+		return &AgentClients{
+			Tools:          selectedBuiltinTools,
+			BuiltinToolReg: builtinToolReg,
+		}
+	}
+
+	agentClients.Tools = append(agentClients.Tools, selectedBuiltinTools...)
+	agentClients.BuiltinToolReg = builtinToolReg
+	return agentClients
+}

agent/mcp_util.go

@@ -3,9 +3,7 @@ package agent
 import (
 	"context"
 	"encoding/json"
-	"errors"
 	"fmt"
-	"strings"
 	"time"
 
 	"github.com/ThinkInAIXYZ/go-mcp/client"
@@ -115,16 +113,3 @@ func GetMCPClientMap(config string, toolsMap map[string]bool) (map[string]*clien
 
 	return clients, nil
 }
-
-func GetServerNameAndToolNameFromId(id string) (string, string) {
-	tokens := strings.Split(id, "__")
-	if len(tokens) != 2 {
-		panic(errors.New("GetServerNameAndToolNameFromName() error, wrong token count for ID: " + id))
-	}
-
-	return tokens[0], tokens[1]
-}
-
-func GetIdFromServerNameAndToolName(ServerName, toolName string) string {
-	return ServerName + "__" + toolName
-}

agent/provider.go

@@ -19,6 +19,7 @@ import (
 
 	"github.com/ThinkInAIXYZ/go-mcp/client"
 	"github.com/ThinkInAIXYZ/go-mcp/protocol"
+	"github.com/casibase/casibase/agent/builtin_tool"
 	"github.com/casibase/casibase/i18n"
 )
 
@@ -27,8 +28,9 @@ type AgentProvider interface {
 }
 
 type AgentClients struct {
-	Clients map[string]*client.Client
-	Tools   []*protocol.Tool
+	Clients        map[string]*client.Client
+	Tools          []*protocol.Tool
+	BuiltinToolReg *builtin_tool.ToolRegistry
 }
 
 func GetAgentProvider(typ string, subType string, text string, mcpTools []*McpTools, lang string) (AgentProvider, error) {

controllers/message_answer.go

@@ -18,6 +18,7 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/casibase/casibase/agent"
 	"github.com/casibase/casibase/conf"
 	"github.com/casibase/casibase/embedding"
 	"github.com/casibase/casibase/model"
@@ -166,6 +167,8 @@ func (c *ApiController) GetMessageAnswer() {
 		return
 	}
 
+	agentClients = agent.MergeBuiltinTools(agentClients, store.BuiltinTools)
+
 	knowledgeCount := store.KnowledgeCount
 	if knowledgeCount <= 0 {
 		knowledgeCount = 10

model/mcp.go

@@ -20,7 +20,6 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/ThinkInAIXYZ/go-mcp/client"
 	"github.com/ThinkInAIXYZ/go-mcp/protocol"
 	"github.com/casibase/casibase/agent"
 	"github.com/casibase/casibase/i18n"
@@ -133,18 +132,13 @@ func QueryTextWithTools(p ModelProvider, question string, writer io.Writer, hist
 		for _, toolCall := range toolCalls {
 			serverName, toolName := agent.GetServerNameAndToolNameFromId(toolCall.Function.Name)
 
-			mcpClient, ok := agentInfo.AgentClients.Clients[serverName]
-			if !ok {
-				continue
-			}
-
 			messages = append(messages, &RawMessage{
 				Text:     "Call result from " + toolCall.Function.Name,
 				Author:   "AI",
 				ToolCall: toolCall,
 			})
 
-			messages, err = callTools(toolCall, toolName, mcpClient, messages, lang)
+			messages, err = callTools(toolCall, serverName, toolName, agentInfo.AgentClients, messages, lang)
 			if err != nil {
 				return nil, err
 			}
@@ -182,20 +176,36 @@ func createToolMessage(toolCall openai.ToolCall, text string) *RawMessage {
 	}
 }
 
-func callTools(toolCall openai.ToolCall, functionName string, mcpClient *client.Client, messages []*RawMessage, lang string) ([]*RawMessage, error) {
+func callTools(toolCall openai.ToolCall, serverName, toolName string, agentClients *agent.AgentClients, messages []*RawMessage, lang string) ([]*RawMessage, error) {
 	var arguments map[string]interface{}
 	ctx := context.Background()
 
 	if err := json.Unmarshal([]byte(toolCall.Function.Arguments), &arguments); err != nil {
 		return nil, fmt.Errorf(i18n.Translate(lang, "model:failed to parse tool arguments: %v"), err)
 	}
 
-	req := &protocol.CallToolRequest{
-		Name:      functionName,
-		Arguments: arguments,
+	var result *protocol.CallToolResult
+	var err error
+
+	if serverName == "" {
+		// builtin tools
+		if agentClients.BuiltinToolReg == nil {
+			return messages, nil
+		}
+		result, err = agentClients.BuiltinToolReg.ExecuteTool(ctx, toolName, arguments)
+	} else {
+		// MCP tools
+		mcpClient, ok := agentClients.Clients[serverName]
+		if !ok {
+			return messages, nil
+		}
+		req := &protocol.CallToolRequest{
+			Name:      toolName,
+			Arguments: arguments,
+		}
+		result, err = mcpClient.CallTool(ctx, req)
 	}
 
-	result, err := mcpClient.CallTool(ctx, req)
 	response := &ToolCallResponse{
 		ToolName: toolCall.Function.Name,
 	}