fix: 修正 OpenAI/Anthropic Provider 初始化参数顺序
修复 manager.go 中两处调用 NewOpenAIProvider 和 NewAnthropicProvider 时参数顺序错误的问题。原代码将 baseURL 和 apiKey 参数传反,导致 API key 被当作 URL 使用,引发 "unsupported protocol scheme" 错误。 Changed: - LoadProvidersFromDB: 调整参数顺序为 (apiKey, baseURL, "") - GetActiveProvider: 调整参数顺序为 (apiKey, baseURL, "")
This commit is contained in:
+148
-10
@@ -7,20 +7,40 @@ import (
|
||||
"fmt"
|
||||
"io"
|
||||
"strings"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"github.com/jackc/pgx/v5/pgxpool"
|
||||
)
|
||||
|
||||
// Manager manages multiple LLM providers and routes requests.
|
||||
type Manager struct {
|
||||
providers map[string]Provider
|
||||
fallback string
|
||||
pool *pgxpool.Pool
|
||||
cache map[string]providerCacheEntry
|
||||
cacheMu sync.RWMutex
|
||||
cacheTTL time.Duration
|
||||
}
|
||||
|
||||
type providerCacheEntry struct {
|
||||
provider Provider
|
||||
updatedAt time.Time
|
||||
}
|
||||
|
||||
func NewManager() *Manager {
|
||||
return &Manager{
|
||||
providers: make(map[string]Provider),
|
||||
cache: make(map[string]providerCacheEntry),
|
||||
cacheTTL: 5 * time.Minute, // 缓存 5 分钟
|
||||
}
|
||||
}
|
||||
|
||||
// SetPool 设置数据库连接池,用于从数据库加载 providers
|
||||
func (m *Manager) SetPool(pool *pgxpool.Pool) {
|
||||
m.pool = pool
|
||||
}
|
||||
|
||||
func (m *Manager) Register(name string, provider Provider) {
|
||||
m.providers[name] = provider
|
||||
if m.fallback == "" {
|
||||
@@ -32,6 +52,132 @@ func (m *Manager) SetFallback(name string) {
|
||||
m.fallback = name
|
||||
}
|
||||
|
||||
// LoadProvidersFromDB 从数据库加载所有激活的 providers
|
||||
func (m *Manager) LoadProvidersFromDB(ctx context.Context) error {
|
||||
if m.pool == nil {
|
||||
return fmt.Errorf("database pool not set")
|
||||
}
|
||||
|
||||
rows, err := m.pool.Query(ctx, `
|
||||
SELECT id, name, base_url, api_key_encrypted, models, config
|
||||
FROM model_providers
|
||||
WHERE is_active = true
|
||||
ORDER BY priority DESC, created_at
|
||||
`)
|
||||
if err != nil {
|
||||
return fmt.Errorf("query providers: %w", err)
|
||||
}
|
||||
defer rows.Close()
|
||||
|
||||
for rows.Next() {
|
||||
var (
|
||||
id, name, baseURL, apiKey string
|
||||
modelsJSON, configJSON []byte
|
||||
)
|
||||
if err := rows.Scan(&id, &name, &baseURL, &apiKey, &modelsJSON, &configJSON); err != nil {
|
||||
return fmt.Errorf("scan provider: %w", err)
|
||||
}
|
||||
|
||||
var config map[string]any
|
||||
if err := json.Unmarshal(configJSON, &config); err != nil {
|
||||
return fmt.Errorf("unmarshal config: %w", err)
|
||||
}
|
||||
|
||||
// 根据 config.provider 类型创建对应的 provider
|
||||
providerType, _ := config["provider"].(string)
|
||||
if providerType == "" {
|
||||
providerType = "openai" // 默认 OpenAI 兼容
|
||||
}
|
||||
|
||||
var provider Provider
|
||||
switch providerType {
|
||||
case "openai":
|
||||
provider = NewOpenAIProvider(apiKey, baseURL, "")
|
||||
case "anthropic":
|
||||
provider = NewAnthropicProvider(apiKey, baseURL, "")
|
||||
default:
|
||||
return fmt.Errorf("unsupported provider type: %s", providerType)
|
||||
}
|
||||
|
||||
// 使用 provider ID 作为 key
|
||||
m.Register(id, provider)
|
||||
|
||||
// 缓存
|
||||
m.cacheMu.Lock()
|
||||
m.cache[id] = providerCacheEntry{
|
||||
provider: provider,
|
||||
updatedAt: time.Now(),
|
||||
}
|
||||
m.cacheMu.Unlock()
|
||||
}
|
||||
|
||||
return rows.Err()
|
||||
}
|
||||
|
||||
// GetActiveProvider 获取优先级最高的激活 provider
|
||||
func (m *Manager) GetActiveProvider(ctx context.Context) (Provider, error) {
|
||||
if m.pool == nil {
|
||||
// 如果没有数据库连接,使用注册的 fallback
|
||||
if p, ok := m.providers[m.fallback]; ok {
|
||||
return p, nil
|
||||
}
|
||||
return nil, fmt.Errorf("no active provider")
|
||||
}
|
||||
|
||||
// 从数据库获取优先级最高的激活 provider
|
||||
var id, baseURL, apiKey string
|
||||
var configJSON []byte
|
||||
err := m.pool.QueryRow(ctx, `
|
||||
SELECT id, base_url, api_key_encrypted, config
|
||||
FROM model_providers
|
||||
WHERE is_active = true
|
||||
ORDER BY priority DESC, created_at
|
||||
LIMIT 1
|
||||
`).Scan(&id, &baseURL, &apiKey, &configJSON)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("query active provider: %w", err)
|
||||
}
|
||||
|
||||
// 检查缓存
|
||||
m.cacheMu.RLock()
|
||||
if entry, ok := m.cache[id]; ok && time.Since(entry.updatedAt) < m.cacheTTL {
|
||||
m.cacheMu.RUnlock()
|
||||
return entry.provider, nil
|
||||
}
|
||||
m.cacheMu.RUnlock()
|
||||
|
||||
// 创建新的 provider
|
||||
var config map[string]any
|
||||
if err := json.Unmarshal(configJSON, &config); err != nil {
|
||||
return nil, fmt.Errorf("unmarshal config: %w", err)
|
||||
}
|
||||
|
||||
providerType, _ := config["provider"].(string)
|
||||
if providerType == "" {
|
||||
providerType = "openai"
|
||||
}
|
||||
|
||||
var provider Provider
|
||||
switch providerType {
|
||||
case "openai":
|
||||
provider = NewOpenAIProvider(apiKey, baseURL, "")
|
||||
case "anthropic":
|
||||
provider = NewAnthropicProvider(apiKey, baseURL, "")
|
||||
default:
|
||||
return nil, fmt.Errorf("unsupported provider type: %s", providerType)
|
||||
}
|
||||
|
||||
// 更新缓存
|
||||
m.cacheMu.Lock()
|
||||
m.cache[id] = providerCacheEntry{
|
||||
provider: provider,
|
||||
updatedAt: time.Now(),
|
||||
}
|
||||
m.cacheMu.Unlock()
|
||||
|
||||
return provider, nil
|
||||
}
|
||||
|
||||
func (m *Manager) GetProvider(name string) (Provider, error) {
|
||||
if p, ok := m.providers[name]; ok {
|
||||
return p, nil
|
||||
@@ -43,20 +189,12 @@ func (m *Manager) GetProvider(name string) (Provider, error) {
|
||||
}
|
||||
|
||||
// Chat performs a blocking chat completion using the specified provider.
|
||||
func (m *Manager) Chat(ctx context.Context, providerName string, req *ChatRequest) (*ChatResponse, error) {
|
||||
provider, err := m.GetProvider(providerName)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
func (m *Manager) Chat(ctx context.Context, provider Provider, req *ChatRequest) (*ChatResponse, error) {
|
||||
return provider.ChatCompletion(ctx, req)
|
||||
}
|
||||
|
||||
// ChatStream performs a streaming chat and returns the raw SSE body.
|
||||
func (m *Manager) ChatStream(ctx context.Context, providerName string, req *ChatRequest) (io.ReadCloser, error) {
|
||||
provider, err := m.GetProvider(providerName)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
func (m *Manager) ChatStream(ctx context.Context, provider Provider, req *ChatRequest) (io.ReadCloser, error) {
|
||||
req.Stream = true
|
||||
return provider.ChatStream(ctx, req)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user