opencode/picoclaw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

deleted conflicts

Browse source
This commit is contained in:
yanhool 2026-03-09 15:44:09 +08:00
parent 8ac3294872
commit 2a7c91df57
1 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkg/tools/web.go
View file

@ -675,14 +675,8 @@ type WebSearchToolOptions struct {
func NewWebSearchTool(opts WebSearchToolOptions) (*WebSearchTool, error) { func NewWebSearchTool(opts WebSearchToolOptions) (*WebSearchTool, error) {
var provider SearchProvider var provider SearchProvider
maxResults := 5 maxResults := 5
<<<<<<< feat/mutil_keys
// Priority: Perplexity > Brave > Tavily > DuckDuckGo
if opts.PerplexityEnabled && len(opts.PerplexityAPIKeys) > 0 {
=======
// Priority: Perplexity > Brave > SearXNG > Tavily > DuckDuckGo > GLM Search // Priority: Perplexity > Brave > SearXNG > Tavily > DuckDuckGo > GLM Search
if opts.PerplexityEnabled && opts.PerplexityAPIKey != "" { if opts.PerplexityEnabled && len(opts.PerplexityAPIKeys) > 0 {
>>>>>>> main
client, err := createHTTPClient(opts.Proxy, perplexityTimeout) client, err := createHTTPClient(opts.Proxy, perplexityTimeout)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to create HTTP client for Perplexity: %w", err) return nil, fmt.Errorf("failed to create HTTP client for Perplexity: %w", err)
@ -704,16 +698,12 @@ func NewWebSearchTool(opts WebSearchToolOptions) (*WebSearchTool, error) {
if opts.BraveMaxResults > 0 { if opts.BraveMaxResults > 0 {
maxResults = opts.BraveMaxResults maxResults = opts.BraveMaxResults
} }
<<<<<<< feat/mutil_keys
} else if opts.TavilyEnabled && len(opts.TavilyAPIKeys) > 0 {
=======
} else if opts.SearXNGEnabled && opts.SearXNGBaseURL != "" { } else if opts.SearXNGEnabled && opts.SearXNGBaseURL != "" {
provider = &SearXNGSearchProvider{baseURL: opts.SearXNGBaseURL} provider = &SearXNGSearchProvider{baseURL: opts.SearXNGBaseURL}
if opts.SearXNGMaxResults > 0 { if opts.SearXNGMaxResults > 0 {
maxResults = opts.SearXNGMaxResults maxResults = opts.SearXNGMaxResults
} }
} else if opts.TavilyEnabled && opts.TavilyAPIKey != "" { } else if opts.TavilyEnabled && len(opts.TavilyAPIKeys) > 0 {
>>>>>>> main
client, err := createHTTPClient(opts.Proxy, searchTimeout) client, err := createHTTPClient(opts.Proxy, searchTimeout)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to create HTTP client for Tavily: %w", err) return nil, fmt.Errorf("failed to create HTTP client for Tavily: %w", err)