mirror of
https://github.com/YspCoder/clawgo.git
synced 2026-04-13 06:47:30 +08:00
Fix provider hot reload and restore memory API
This commit is contained in:
@@ -48,7 +48,7 @@ type Server struct {
|
||||
logFilePath string
|
||||
onChat func(ctx context.Context, sessionKey, content string) (string, error)
|
||||
onChatHistory func(sessionKey string) []map[string]interface{}
|
||||
onConfigAfter func() error
|
||||
onConfigAfter func(forceRuntimeReload bool) error
|
||||
onCron func(action string, args map[string]interface{}) (interface{}, error)
|
||||
onToolsCatalog func() interface{}
|
||||
whatsAppBridge *channels.WhatsAppBridgeService
|
||||
@@ -85,7 +85,7 @@ func (s *Server) SetChatHandler(fn func(ctx context.Context, sessionKey, content
|
||||
func (s *Server) SetChatHistoryHandler(fn func(sessionKey string) []map[string]interface{}) {
|
||||
s.onChatHistory = fn
|
||||
}
|
||||
func (s *Server) SetConfigAfterHook(fn func() error) { s.onConfigAfter = fn }
|
||||
func (s *Server) SetConfigAfterHook(fn func(forceRuntimeReload bool) error) { s.onConfigAfter = fn }
|
||||
func (s *Server) SetCronHandler(fn func(action string, args map[string]interface{}) (interface{}, error)) {
|
||||
s.onCron = fn
|
||||
}
|
||||
@@ -414,7 +414,7 @@ func (s *Server) persistWebUIConfig(cfg *cfgpkg.Config) error {
|
||||
return err
|
||||
}
|
||||
if s.onConfigAfter != nil {
|
||||
return s.onConfigAfter()
|
||||
return s.onConfigAfter(false)
|
||||
}
|
||||
return requestSelfReloadSignal()
|
||||
}
|
||||
@@ -978,7 +978,9 @@ func (s *Server) saveProviderConfig(cfg *cfgpkg.Config, name string, pc cfgpkg.P
|
||||
return err
|
||||
}
|
||||
if s.onConfigAfter != nil {
|
||||
if err := s.onConfigAfter(); err != nil {
|
||||
// Provider updates can take effect through external credential files
|
||||
// even when config.json remains structurally identical.
|
||||
if err := s.onConfigAfter(true); err != nil {
|
||||
return err
|
||||
}
|
||||
} else {
|
||||
@@ -3118,12 +3120,15 @@ func (s *Server) handleWebUIMemory(w http.ResponseWriter, r *http.Request) {
|
||||
case http.MethodGet:
|
||||
path := strings.TrimSpace(r.URL.Query().Get("path"))
|
||||
if path == "" {
|
||||
files := make([]string, 0, 16)
|
||||
if _, err := os.Stat(filepath.Join(s.workspacePath, "MEMORY.md")); err == nil {
|
||||
files = append(files, "MEMORY.md")
|
||||
}
|
||||
entries, err := os.ReadDir(memoryDir)
|
||||
if err != nil {
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
files := make([]string, 0, len(entries))
|
||||
for _, e := range entries {
|
||||
if e.IsDir() {
|
||||
continue
|
||||
@@ -3133,7 +3138,11 @@ func (s *Server) handleWebUIMemory(w http.ResponseWriter, r *http.Request) {
|
||||
writeJSON(w, map[string]interface{}{"ok": true, "files": files})
|
||||
return
|
||||
}
|
||||
clean, content, found, err := readRelativeTextFile(memoryDir, path)
|
||||
baseDir := memoryDir
|
||||
if strings.EqualFold(path, "MEMORY.md") {
|
||||
baseDir = strings.TrimSpace(s.workspacePath)
|
||||
}
|
||||
clean, content, found, err := readRelativeTextFile(baseDir, path)
|
||||
if err != nil {
|
||||
http.Error(w, err.Error(), http.StatusBadRequest)
|
||||
return
|
||||
|
||||
@@ -100,7 +100,10 @@ func TestHandleWebUIConfigPostSavesRawConfig(t *testing.T) {
|
||||
srv := NewServer("127.0.0.1", 0, "")
|
||||
srv.SetConfigPath(cfgPath)
|
||||
hookCalled := 0
|
||||
srv.SetConfigAfterHook(func() error {
|
||||
srv.SetConfigAfterHook(func(forceRuntimeReload bool) error {
|
||||
if forceRuntimeReload {
|
||||
t.Fatalf("expected raw config save to use non-forced reload")
|
||||
}
|
||||
hookCalled++
|
||||
return nil
|
||||
})
|
||||
@@ -150,7 +153,12 @@ func TestHandleWebUIConfigPostSavesNormalizedConfig(t *testing.T) {
|
||||
|
||||
srv := NewServer("127.0.0.1", 0, "")
|
||||
srv.SetConfigPath(cfgPath)
|
||||
srv.SetConfigAfterHook(func() error { return nil })
|
||||
srv.SetConfigAfterHook(func(forceRuntimeReload bool) error {
|
||||
if forceRuntimeReload {
|
||||
t.Fatalf("expected normalized config save to use non-forced reload")
|
||||
}
|
||||
return nil
|
||||
})
|
||||
|
||||
req := httptest.NewRequest(http.MethodPost, "/api/config?mode=normalized", strings.NewReader(`{"core":{"gateway":{"host":"127.0.0.1","port":18790},"tools":{"shell_enabled":false,"mcp_enabled":true}},"runtime":{"router":{"enabled":true,"strategy":"rules_first","max_hops":2,"default_timeout_sec":90},"providers":{"openai":{"api_base":"https://api.openai.com/v1","auth":"bearer","timeout_sec":150}}}}`))
|
||||
req.Header.Set("Content-Type", "application/json")
|
||||
@@ -249,6 +257,98 @@ func TestHandleWebUISessionsHidesInternalSessionsByDefault(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestSaveProviderConfigForcesRuntimeReload(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
tmp := t.TempDir()
|
||||
cfgPath := filepath.Join(tmp, "config.json")
|
||||
cfg := cfgpkg.DefaultConfig()
|
||||
cfg.Logging.Enabled = false
|
||||
cfg.Models.Providers["openai"] = cfgpkg.ProviderConfig{
|
||||
APIBase: "https://api.openai.com/v1",
|
||||
Auth: "oauth",
|
||||
Models: []string{"gpt-5"},
|
||||
TimeoutSec: 120,
|
||||
OAuth: cfgpkg.ProviderOAuthConfig{
|
||||
Provider: "codex",
|
||||
CredentialFile: filepath.Join(tmp, "auth.json"),
|
||||
},
|
||||
}
|
||||
if err := cfgpkg.SaveConfig(cfgPath, cfg); err != nil {
|
||||
t.Fatalf("save config: %v", err)
|
||||
}
|
||||
|
||||
srv := NewServer("127.0.0.1", 0, "")
|
||||
srv.SetConfigPath(cfgPath)
|
||||
|
||||
forced := false
|
||||
srv.SetConfigAfterHook(func(forceRuntimeReload bool) error {
|
||||
forced = forceRuntimeReload
|
||||
return nil
|
||||
})
|
||||
|
||||
pc := cfg.Models.Providers["openai"]
|
||||
if err := srv.saveProviderConfig(cfg, "openai", pc); err != nil {
|
||||
t.Fatalf("save provider config: %v", err)
|
||||
}
|
||||
if !forced {
|
||||
t.Fatalf("expected provider config save to force runtime reload")
|
||||
}
|
||||
}
|
||||
|
||||
func TestHandleWebUIMemoryListsAndReadsWorkspaceMemoryFile(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
tmp := t.TempDir()
|
||||
if err := os.WriteFile(filepath.Join(tmp, "MEMORY.md"), []byte("# long-term\n"), 0o644); err != nil {
|
||||
t.Fatalf("write workspace memory: %v", err)
|
||||
}
|
||||
if err := os.MkdirAll(filepath.Join(tmp, "memory"), 0o755); err != nil {
|
||||
t.Fatalf("mkdir memory dir: %v", err)
|
||||
}
|
||||
if err := os.WriteFile(filepath.Join(tmp, "memory", "2026-03-19.md"), []byte("daily\n"), 0o644); err != nil {
|
||||
t.Fatalf("write daily memory: %v", err)
|
||||
}
|
||||
|
||||
srv := NewServer("127.0.0.1", 0, "")
|
||||
srv.SetWorkspacePath(tmp)
|
||||
|
||||
listReq := httptest.NewRequest(http.MethodGet, "/api/memory", nil)
|
||||
listRec := httptest.NewRecorder()
|
||||
srv.handleWebUIMemory(listRec, listReq)
|
||||
if listRec.Code != http.StatusOK {
|
||||
t.Fatalf("expected 200, got %d: %s", listRec.Code, listRec.Body.String())
|
||||
}
|
||||
var listPayload struct {
|
||||
OK bool `json:"ok"`
|
||||
Files []string `json:"files"`
|
||||
}
|
||||
if err := json.Unmarshal(listRec.Body.Bytes(), &listPayload); err != nil {
|
||||
t.Fatalf("decode list payload: %v", err)
|
||||
}
|
||||
if len(listPayload.Files) < 2 || listPayload.Files[0] != "MEMORY.md" {
|
||||
t.Fatalf("expected MEMORY.md in memory file list, got %+v", listPayload.Files)
|
||||
}
|
||||
|
||||
readReq := httptest.NewRequest(http.MethodGet, "/api/memory?path=MEMORY.md", nil)
|
||||
readRec := httptest.NewRecorder()
|
||||
srv.handleWebUIMemory(readRec, readReq)
|
||||
if readRec.Code != http.StatusOK {
|
||||
t.Fatalf("expected 200, got %d: %s", readRec.Code, readRec.Body.String())
|
||||
}
|
||||
var readPayload struct {
|
||||
OK bool `json:"ok"`
|
||||
Path string `json:"path"`
|
||||
Content string `json:"content"`
|
||||
}
|
||||
if err := json.Unmarshal(readRec.Body.Bytes(), &readPayload); err != nil {
|
||||
t.Fatalf("decode read payload: %v", err)
|
||||
}
|
||||
if readPayload.Path != "MEMORY.md" || readPayload.Content != "# long-term\n" {
|
||||
t.Fatalf("unexpected memory payload: %+v", readPayload)
|
||||
}
|
||||
}
|
||||
|
||||
func TestHandleWebUIChatLive(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user