feat: add web search tool provider (#2181)

Author: Paperlz

object/merge_agent_tools.go

@@ -34,7 +34,7 @@ func buildMergedBuiltinRegistry(store *Store, lang string) *builtin_tool.ToolReg
 		if err != nil || p == nil || p.Category != "Tool" {
 			continue
 		}
-		tp, err := tool.NewProvider(p.Category, p.Type, lang)
+		tp, err := tool.NewProvider(getToolProviderConfig(p), lang)
 		if err != nil {
 			continue
 		}

object/message_tool.go

@@ -38,7 +38,7 @@ func buildAgentClientsForToolProvider(toolProviderName string, lang string) (*ag
 		return nil, nil
 	}
 
-	tp, err := tool.NewProvider(p.Category, p.Type, lang)
+	tp, err := tool.NewProvider(getToolProviderConfig(p), lang)
 	if err != nil {
 		return nil, err
 	}

object/provider.go

@@ -706,9 +706,16 @@ func TestMcpProvider(p *Provider, lang string) (string, error) {
 
 // TestToolProvider parses provider.testContent as {"tool":"...","arguments":{}} and invokes one builtin tool.
 func TestToolProvider(p *Provider, lang string) (string, error) {
+	return p.testToolProviderWithLoader(lang, getProvider)
+}
+
+func (p *Provider) testToolProviderWithLoader(lang string, loadProvider func(owner string, name string) (*Provider, error)) (string, error) {
 	if p.Category != "Tool" {
 		return "", fmt.Errorf(i18n.Translate(lang, "object:provider is not a Tool provider"))
 	}
+	if err := p.restoreMaskedToolProviderSecrets(loadProvider); err != nil {
+		return "", err
+	}
 
 	var payload struct {
 		Tool      string                 `json:"tool"`
@@ -724,7 +731,7 @@ func TestToolProvider(p *Provider, lang string) (string, error) {
 		payload.Arguments = map[string]interface{}{}
 	}
 
-	tp, err := tool.NewProvider(p.Category, p.Type, lang)
+	tp, err := tool.NewProvider(getToolProviderConfig(p), lang)
 	if err != nil {
 		return "", err
 	}
@@ -760,6 +767,55 @@ func TestToolProvider(p *Provider, lang string) (string, error) {
 	return output, nil
 }
 
+func getToolProviderConfig(p *Provider) tool.ProviderConfig {
+	return tool.ProviderConfig{
+		Category:     p.Category,
+		Type:         p.Type,
+		SubType:      p.SubType,
+		ProviderUrl:  p.ProviderUrl,
+		ClientId:     p.ClientId,
+		ClientSecret: p.ClientSecret,
+	}
+}
+
+func (p *Provider) restoreMaskedToolProviderSecrets(loadProvider func(owner string, name string) (*Provider, error)) error {
+	if p == nil {
+		return nil
+	}
+
+	maskedClientSecret := p.ClientSecret == "***"
+	maskedUserKey := p.UserKey == "***"
+	maskedSignKey := p.SignKey == "***"
+	if !maskedClientSecret && !maskedUserKey && !maskedSignKey {
+		return nil
+	}
+	if strings.TrimSpace(p.Owner) == "" || strings.TrimSpace(p.Name) == "" {
+		return fmt.Errorf("cannot restore masked tool provider secrets without owner and name")
+	}
+
+	providerDb, err := loadProvider(p.Owner, p.Name)
+	if err != nil {
+		return err
+	}
+	if providerDb == nil {
+		return fmt.Errorf("provider not found: %s/%s", p.Owner, p.Name)
+	}
+
+	p.processProviderParams(providerDb)
+
+	if maskedClientSecret && (p.ClientSecret == "" || p.ClientSecret == "***") {
+		return fmt.Errorf("masked clientSecret could not be restored")
+	}
+	if maskedUserKey && (p.UserKey == "" || p.UserKey == "***") {
+		return fmt.Errorf("masked userKey could not be restored")
+	}
+	if maskedSignKey && (p.SignKey == "" || p.SignKey == "***") {
+		return fmt.Errorf("masked signKey could not be restored")
+	}
+
+	return nil
+}
+
 func (p *Provider) processProviderParams(providerDb *Provider) {
 	if p.ClientSecret == "***" {
 		p.ClientSecret = providerDb.ClientSecret

tool/provider.go

@@ -26,17 +26,29 @@ type Provider interface {
 	BuiltinTools() []builtin_tool.BuiltinTool
 }
 
+// ProviderConfig contains the Provider fields needed to construct builtin tools.
+type ProviderConfig struct {
+	Category     string
+	Type         string
+	SubType      string
+	ProviderUrl  string
+	ClientId     string
+	ClientSecret string
+}
+
 // NewProvider instantiates a Tool provider implementation from category and type.
-func NewProvider(category string, typ string, lang string) (Provider, error) {
-	if category != "Tool" {
-		return nil, fmt.Errorf(i18n.Translate(lang, "tool:expected category Tool, got %s"), category)
+func NewProvider(config ProviderConfig, lang string) (Provider, error) {
+	if config.Category != "Tool" {
+		return nil, fmt.Errorf(i18n.Translate(lang, "tool:expected category Tool, got %s"), config.Category)
 	}
-	switch typ {
+	switch config.Type {
 	case "Time":
 		return &TimeProvider{}, nil
+	case "WebSearch":
+		return NewWebSearchProvider(config)
 	case "Shell":
 		return &ShellProvider{}, nil
 	default:
-		return nil, fmt.Errorf(i18n.Translate(lang, "tool:unsupported tool provider type: %s"), typ)
+		return nil, fmt.Errorf(i18n.Translate(lang, "tool:unsupported tool provider type: %s"), config.Type)
 	}
 }