refactor: web search provider registry pattern

This commit is contained in:
wizardchen
2026-01-19 20:28:31 +08:00
committed by lyingbug
parent b74545b007
commit fad72fc272
8 changed files with 159 additions and 103 deletions
+16 -27
View File
@@ -18,7 +18,7 @@ import (
// WebSearchService provides web search functionality
type WebSearchService struct {
providers map[string]interfaces.WebSearchProvider
config *config.WebSearchConfig
timeout int
}
// CompressWithRAG performs RAG-based compression using a temporary, hidden knowledge base.
@@ -259,7 +259,7 @@ func (s *WebSearchService) Search(
}
// Set timeout
timeout := time.Duration(s.config.Timeout) * time.Second
timeout := time.Duration(s.timeout) * time.Second
if timeout == 0 {
timeout = 10 * time.Second
}
@@ -286,37 +286,26 @@ func (s *WebSearchService) Search(
}
// NewWebSearchService creates a new web search service
func NewWebSearchService(cfg *config.Config) (interfaces.WebSearchService, error) {
if cfg.WebSearch == nil {
return nil, fmt.Errorf("web search config is not available")
func NewWebSearchService(cfg *config.Config, registry *web_search.Registry) (interfaces.WebSearchService, error) {
timeout := 10 // default timeout
if cfg.WebSearch != nil && cfg.WebSearch.Timeout > 0 {
timeout = cfg.WebSearch.Timeout
}
service := &WebSearchService{
providers: make(map[string]interfaces.WebSearchProvider),
config: cfg.WebSearch,
// Create all registered providers
providers, err := registry.CreateAllProviders()
if err != nil {
return nil, err
}
// Initialize providers based on config
for _, providerConfig := range cfg.WebSearch.Providers {
var provider interfaces.WebSearchProvider
var err error
switch providerConfig.ID {
case "duckduckgo":
provider, err = web_search.NewDuckDuckGoProvider(providerConfig)
case "google":
provider, err = web_search.NewGoogleProvider(providerConfig)
default:
return nil, fmt.Errorf("unknown web search provider: %s", providerConfig.ID)
}
if err != nil {
return nil, fmt.Errorf("failed to initialize provider %s: %v", providerConfig.ID, err)
}
service.providers[providerConfig.ID] = provider
logger.Infof(context.Background(), "Initialized web search provider: %s", providerConfig.ID)
for id := range providers {
logger.Infof(context.Background(), "Initialized web search provider: %s", id)
}
return service, nil
return &WebSearchService{
providers: providers,
timeout: timeout,
}, nil
}
// filterBlacklist filters results based on blacklist rules
@@ -11,7 +11,6 @@ import (
"time"
"github.com/PuerkitoBio/goquery"
"github.com/Tencent/WeKnora/internal/config"
"github.com/Tencent/WeKnora/internal/logger"
"github.com/Tencent/WeKnora/internal/types"
"github.com/Tencent/WeKnora/internal/types/interfaces"
@@ -24,7 +23,7 @@ type DuckDuckGoProvider struct {
}
// NewDuckDuckGoProvider creates a new DuckDuckGo provider
func NewDuckDuckGoProvider(_ config.WebSearchProviderConfig) (interfaces.WebSearchProvider, error) {
func NewDuckDuckGoProvider() (interfaces.WebSearchProvider, error) {
return &DuckDuckGoProvider{
client: &http.Client{
Timeout: 30 * time.Second,
@@ -32,6 +31,17 @@ func NewDuckDuckGoProvider(_ config.WebSearchProviderConfig) (interfaces.WebSear
}, nil
}
// DuckDuckGoProviderInfo returns the provider info for registration
func DuckDuckGoProviderInfo() types.WebSearchProviderInfo {
return types.WebSearchProviderInfo{
ID: "duckduckgo",
Name: "DuckDuckGo",
Free: true,
RequiresAPIKey: false,
Description: "DuckDuckGo Search API",
}
}
// Name returns the provider name
func (p *DuckDuckGoProvider) Name() string {
return "duckduckgo"
@@ -4,11 +4,11 @@ import (
"context"
"fmt"
"net/url"
"os"
"google.golang.org/api/customsearch/v1"
"google.golang.org/api/option"
"github.com/Tencent/WeKnora/internal/config"
"github.com/Tencent/WeKnora/internal/types"
"github.com/Tencent/WeKnora/internal/types/interfaces"
)
@@ -22,8 +22,13 @@ type GoogleProvider struct {
}
// NewGoogleProvider creates a new Google provider
func NewGoogleProvider(cfg config.WebSearchProviderConfig) (interfaces.WebSearchProvider, error) {
u, err := url.Parse(cfg.APIURL)
func NewGoogleProvider() (interfaces.WebSearchProvider, error) {
apiURL := os.Getenv("GOOGLE_SEARCH_API_URL")
if apiURL == "" {
return nil, fmt.Errorf("GOOGLE_SEARCH_API_URL environment variable is not set")
}
u, err := url.Parse(apiURL)
if err != nil {
return nil, err
}
@@ -46,10 +51,21 @@ func NewGoogleProvider(cfg config.WebSearchProviderConfig) (interfaces.WebSearch
srv: srv,
apiKey: apiKey,
engineID: engineID,
baseURL: cfg.APIURL,
baseURL: apiURL,
}, nil
}
// GoogleProviderInfo returns the provider info for registration
func GoogleProviderInfo() types.WebSearchProviderInfo {
return types.WebSearchProviderInfo{
ID: "google",
Name: "Google",
Free: false,
RequiresAPIKey: true,
Description: "Google Custom Search API",
}
}
// Name returns the provider name
func (p *GoogleProvider) Name() string {
return "google"
@@ -0,0 +1,88 @@
package web_search
import (
"fmt"
"sync"
"github.com/Tencent/WeKnora/internal/types"
"github.com/Tencent/WeKnora/internal/types/interfaces"
)
// ProviderFactory creates a new web search provider instance
type ProviderFactory func() (interfaces.WebSearchProvider, error)
// ProviderRegistration holds provider metadata and factory
type ProviderRegistration struct {
Info types.WebSearchProviderInfo
Factory ProviderFactory
}
// Registry manages web search provider registrations
type Registry struct {
providers map[string]*ProviderRegistration
mu sync.RWMutex
}
// NewRegistry creates a new web search provider registry
func NewRegistry() *Registry {
return &Registry{
providers: make(map[string]*ProviderRegistration),
}
}
// Register registers a web search provider
func (r *Registry) Register(info types.WebSearchProviderInfo, factory ProviderFactory) {
r.mu.Lock()
defer r.mu.Unlock()
r.providers[info.ID] = &ProviderRegistration{
Info: info,
Factory: factory,
}
}
// GetRegistration returns the registration for a provider
func (r *Registry) GetRegistration(id string) (*ProviderRegistration, bool) {
r.mu.RLock()
defer r.mu.RUnlock()
reg, ok := r.providers[id]
return reg, ok
}
// GetAllProviderInfos returns info for all registered providers
func (r *Registry) GetAllProviderInfos() []types.WebSearchProviderInfo {
r.mu.RLock()
defer r.mu.RUnlock()
infos := make([]types.WebSearchProviderInfo, 0, len(r.providers))
for _, reg := range r.providers {
infos = append(infos, reg.Info)
}
return infos
}
// CreateProvider creates a provider instance by ID
func (r *Registry) CreateProvider(id string) (interfaces.WebSearchProvider, error) {
r.mu.RLock()
reg, ok := r.providers[id]
r.mu.RUnlock()
if !ok {
return nil, fmt.Errorf("web search provider %s not registered", id)
}
return reg.Factory()
}
// CreateAllProviders creates instances of all registered providers
func (r *Registry) CreateAllProviders() (map[string]interfaces.WebSearchProvider, error) {
r.mu.RLock()
defer r.mu.RUnlock()
providers := make(map[string]interfaces.WebSearchProvider)
for id, reg := range r.providers {
provider, err := reg.Factory()
if err != nil {
// Skip providers that fail to initialize (e.g., missing API keys)
continue
}
providers[id] = provider
}
return providers, nil
}