fix: Phase 6联调 — 插件管理器端口修正 + 多模型配置系统整合 + 历史消息刷新修复
## 调试日志
### 1. 插件管理器启动失败
- **症状**: DevTools 显示插件管理器一直"已停止"，手动启动正常
- **排查**: 对比 process-manager.js 传入的环境变量 vs plugin-manager config.go 读取的变量
- **根因**: config.js 传入 PLUGIN_MANAGER_PORT=8094，但 config.go 读取 os.Getenv("PORT")，env 名不匹配。且 process.env 中 PORT 泄露时被误读为 9090，与 DevTools 端口冲突
- **修复**: config.js 将 PLUGIN_MANAGER_PORT → PORT，使 env 名与代码一致 (c3055f4)
### 2. 历史消息刷新后消失
- **症状**: 浏览器刷新后聊天历史清空
- **排查**: WebSocket history_response handler 中 if (msg.messages) 对空数组 [] 为 truthy
- **根因**: 后端返回空的 history_response (缓存为空) 时，空数组覆盖了 HTTP 已加载的消息
- **修复**: useWebSocket.ts 改为 if (msg.messages && msg.messages.length > 0)，空数组走 else-if 分支仅打日志，不覆盖已有消息
### 3. Phase 6 多模型配置系统
- Gateway: ModelsConfigStore (JSON文件持久化) + Admin CRUD API (providers/models/routing)
- ai-core: ModelSelector 支持按 purpose 选择 + fallback_chain，无配置时回退 .env
- DevTools: 模型配置管理面板 (Providers/Models/Routing 三Tab)、在线模型查询代理、路由表单 checkbox 多选、关键词搜索过滤
- .gitignore: models.json + platform_configs.json
### 4. 多端客户端追踪
- Hub 新增 knownClients 映射 (clientID → KnownClient)，在线/离线状态追踪
- 客户端备注持久化到 PostgreSQL
- DevTools 客户端管理面板
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
@@ -0,0 +1,234 @@
|
||||
package config
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"os"
|
||||
"sync"
|
||||
"time"
|
||||
)
|
||||
|
||||
// ModelsConfigStore manages persistence of model configuration to a JSON file.
|
||||
type ModelsConfigStore struct {
|
||||
mu sync.RWMutex
|
||||
path string
|
||||
config *ModelsConfig
|
||||
}
|
||||
|
||||
// NewModelsConfigStore creates a ModelsConfigStore, creating an empty config file if it doesn't exist.
|
||||
func NewModelsConfigStore(path string) (*ModelsConfigStore, error) {
|
||||
s := &ModelsConfigStore{
|
||||
path: path,
|
||||
config: &ModelsConfig{
|
||||
Version: "1.0",
|
||||
Providers: make(map[string]*ProviderConfig),
|
||||
Models: make(map[string]*ModelConfig),
|
||||
Routing: make(map[string]*RoutingRule),
|
||||
},
|
||||
}
|
||||
if err := s.load(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return s, nil
|
||||
}
|
||||
|
||||
func (s *ModelsConfigStore) load() error {
|
||||
data, err := os.ReadFile(s.path)
|
||||
if err != nil {
|
||||
if os.IsNotExist(err) {
|
||||
return s.save() // Initialize empty file.
|
||||
}
|
||||
return fmt.Errorf("read model config file: %w", err)
|
||||
}
|
||||
if len(data) == 0 {
|
||||
return nil
|
||||
}
|
||||
var cfg ModelsConfig
|
||||
if err := json.Unmarshal(data, &cfg); err != nil {
|
||||
return fmt.Errorf("parse model config file: %w", err)
|
||||
}
|
||||
if cfg.Providers == nil {
|
||||
cfg.Providers = make(map[string]*ProviderConfig)
|
||||
}
|
||||
if cfg.Models == nil {
|
||||
cfg.Models = make(map[string]*ModelConfig)
|
||||
}
|
||||
if cfg.Routing == nil {
|
||||
cfg.Routing = make(map[string]*RoutingRule)
|
||||
}
|
||||
if cfg.Version == "" {
|
||||
cfg.Version = "1.0"
|
||||
}
|
||||
s.config = &cfg
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *ModelsConfigStore) save() error {
|
||||
data, err := json.MarshalIndent(s.config, "", " ")
|
||||
if err != nil {
|
||||
return fmt.Errorf("marshal model config: %w", err)
|
||||
}
|
||||
tmpPath := s.path + ".tmp"
|
||||
if err := os.WriteFile(tmpPath, data, 0640); err != nil {
|
||||
return fmt.Errorf("write model config file: %w", err)
|
||||
}
|
||||
return os.Rename(tmpPath, s.path)
|
||||
}
|
||||
|
||||
// HasConfig returns true if there are any providers or models configured.
|
||||
func (s *ModelsConfigStore) HasConfig() bool {
|
||||
s.mu.RLock()
|
||||
defer s.mu.RUnlock()
|
||||
return len(s.config.Providers) > 0 || len(s.config.Models) > 0
|
||||
}
|
||||
|
||||
// ---- Providers ----
|
||||
|
||||
func (s *ModelsConfigStore) ListProviders() []*ProviderConfig {
|
||||
s.mu.RLock()
|
||||
defer s.mu.RUnlock()
|
||||
result := make([]*ProviderConfig, 0, len(s.config.Providers))
|
||||
for _, p := range s.config.Providers {
|
||||
result = append(result, p)
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
func (s *ModelsConfigStore) GetProvider(name string) (*ProviderConfig, error) {
|
||||
s.mu.RLock()
|
||||
defer s.mu.RUnlock()
|
||||
p, ok := s.config.Providers[name]
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("provider not found: %s", name)
|
||||
}
|
||||
return p, nil
|
||||
}
|
||||
|
||||
func (s *ModelsConfigStore) SetProvider(cfg *ProviderConfig) error {
|
||||
s.mu.Lock()
|
||||
defer s.mu.Unlock()
|
||||
if cfg.Name == "" {
|
||||
return fmt.Errorf("provider name is required")
|
||||
}
|
||||
if cfg.BaseURL == "" {
|
||||
return fmt.Errorf("provider base_url is required")
|
||||
}
|
||||
cfg.UpdatedAt = time.Now()
|
||||
s.config.Providers[cfg.Name] = cfg
|
||||
return s.save()
|
||||
}
|
||||
|
||||
func (s *ModelsConfigStore) DeleteProvider(name string) error {
|
||||
s.mu.Lock()
|
||||
defer s.mu.Unlock()
|
||||
if _, ok := s.config.Providers[name]; !ok {
|
||||
return fmt.Errorf("provider not found: %s", name)
|
||||
}
|
||||
delete(s.config.Providers, name)
|
||||
return s.save()
|
||||
}
|
||||
|
||||
// ---- Models ----
|
||||
|
||||
func (s *ModelsConfigStore) ListModels() []*ModelConfig {
|
||||
s.mu.RLock()
|
||||
defer s.mu.RUnlock()
|
||||
result := make([]*ModelConfig, 0, len(s.config.Models))
|
||||
for _, m := range s.config.Models {
|
||||
result = append(result, m)
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
func (s *ModelsConfigStore) GetModel(id string) (*ModelConfig, error) {
|
||||
s.mu.RLock()
|
||||
defer s.mu.RUnlock()
|
||||
m, ok := s.config.Models[id]
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("model not found: %s", id)
|
||||
}
|
||||
return m, nil
|
||||
}
|
||||
|
||||
func (s *ModelsConfigStore) SetModel(cfg *ModelConfig) error {
|
||||
s.mu.Lock()
|
||||
defer s.mu.Unlock()
|
||||
if cfg.ID == "" {
|
||||
return fmt.Errorf("model id is required")
|
||||
}
|
||||
if cfg.Provider == "" {
|
||||
return fmt.Errorf("model provider is required")
|
||||
}
|
||||
cfg.UpdatedAt = time.Now()
|
||||
if cfg.Params == nil {
|
||||
cfg.Params = make(map[string]interface{})
|
||||
}
|
||||
if cfg.Tags == nil {
|
||||
cfg.Tags = []string{}
|
||||
}
|
||||
s.config.Models[cfg.ID] = cfg
|
||||
return s.save()
|
||||
}
|
||||
|
||||
func (s *ModelsConfigStore) DeleteModel(id string) error {
|
||||
s.mu.Lock()
|
||||
defer s.mu.Unlock()
|
||||
if _, ok := s.config.Models[id]; !ok {
|
||||
return fmt.Errorf("model not found: %s", id)
|
||||
}
|
||||
delete(s.config.Models, id)
|
||||
return s.save()
|
||||
}
|
||||
|
||||
// ---- Routing ----
|
||||
|
||||
func (s *ModelsConfigStore) ListRouting() []*RoutingRule {
|
||||
s.mu.RLock()
|
||||
defer s.mu.RUnlock()
|
||||
result := make([]*RoutingRule, 0, len(s.config.Routing))
|
||||
for _, r := range s.config.Routing {
|
||||
result = append(result, r)
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
func (s *ModelsConfigStore) GetRouting(purpose string) (*RoutingRule, error) {
|
||||
s.mu.RLock()
|
||||
defer s.mu.RUnlock()
|
||||
r, ok := s.config.Routing[purpose]
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("routing not found: %s", purpose)
|
||||
}
|
||||
return r, nil
|
||||
}
|
||||
|
||||
func (s *ModelsConfigStore) SetRouting(rule *RoutingRule) error {
|
||||
s.mu.Lock()
|
||||
defer s.mu.Unlock()
|
||||
if rule.Purpose == "" {
|
||||
return fmt.Errorf("routing purpose is required")
|
||||
}
|
||||
if len(rule.FallbackChain) == 0 {
|
||||
return fmt.Errorf("routing fallback_chain is required")
|
||||
}
|
||||
s.config.Routing[rule.Purpose] = rule
|
||||
return s.save()
|
||||
}
|
||||
|
||||
func (s *ModelsConfigStore) DeleteRouting(purpose string) error {
|
||||
s.mu.Lock()
|
||||
defer s.mu.Unlock()
|
||||
if _, ok := s.config.Routing[purpose]; !ok {
|
||||
return fmt.Errorf("routing not found: %s", purpose)
|
||||
}
|
||||
delete(s.config.Routing, purpose)
|
||||
return s.save()
|
||||
}
|
||||
|
||||
// GetConfig returns a copy of the full config (for ai-core loader compatibility).
|
||||
func (s *ModelsConfigStore) GetConfig() *ModelsConfig {
|
||||
s.mu.RLock()
|
||||
defer s.mu.RUnlock()
|
||||
// Return shallow copy; callers should treat as read-only.
|
||||
return s.config
|
||||
}
|
||||
@@ -0,0 +1,43 @@
|
||||
package config
|
||||
|
||||
import "time"
|
||||
|
||||
// ProviderConfig defines an LLM service provider (e.g. deepseek, openai).
|
||||
type ProviderConfig struct {
|
||||
Name string `json:"name"`
|
||||
BaseURL string `json:"base_url"`
|
||||
APIKey string `json:"api_key"`
|
||||
TimeoutSec int `json:"timeout_sec"`
|
||||
MaxRetries int `json:"max_retries"`
|
||||
APIVersion string `json:"api_version,omitempty"`
|
||||
ExtraHeaders map[string]string `json:"extra_headers,omitempty"`
|
||||
UpdatedAt time.Time `json:"updated_at"`
|
||||
}
|
||||
|
||||
// ModelConfig defines a specific model under a provider.
|
||||
type ModelConfig struct {
|
||||
ID string `json:"id"`
|
||||
Name string `json:"name"`
|
||||
Provider string `json:"provider"`
|
||||
Description string `json:"description"`
|
||||
Priority int `json:"priority"`
|
||||
Tags []string `json:"tags"`
|
||||
Params map[string]interface{} `json:"params"`
|
||||
Enabled bool `json:"enabled"`
|
||||
UpdatedAt time.Time `json:"updated_at"`
|
||||
}
|
||||
|
||||
// RoutingRule maps a purpose to an ordered fallback chain of model IDs.
|
||||
type RoutingRule struct {
|
||||
Purpose string `json:"purpose"`
|
||||
FallbackChain []string `json:"fallback_chain"`
|
||||
Required bool `json:"required"`
|
||||
}
|
||||
|
||||
// ModelsConfig is the top-level configuration document.
|
||||
type ModelsConfig struct {
|
||||
Version string `json:"version"`
|
||||
Providers map[string]*ProviderConfig `json:"providers"`
|
||||
Models map[string]*ModelConfig `json:"models"`
|
||||
Routing map[string]*RoutingRule `json:"routing"`
|
||||
}
|
||||
Reference in New Issue
Block a user