fix(api): check SoftDelete error returns at all 5 call sites
SoftDelete returns error but call sites discarded it, so a failed soft-delete was silent — same class as the no-op implementations. Now logged explicitly at: - server.go: ephemeral_expired cleanup (x2) - admin.go: auto_forget_fragment / auto_forget - feedback.go: Deprecate endpoint
This commit is contained in:
@@ -5,6 +5,7 @@ import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"log"
|
||||
"net/http"
|
||||
"os"
|
||||
"os/exec"
|
||||
@@ -83,7 +84,9 @@ func (aa *AdminAPI) Forget(w http.ResponseWriter, r *http.Request) {
|
||||
// 2026-09-07 方案A 碎片快速道(与 server.go decay trigger 一致):
|
||||
// <30 字且 >20 天未访问 → 直接遗忘(碎片 recall_count 可能虚高, 绕过保命)
|
||||
if len([]rune(content)) < 30 && time.Since(lastAccess).Hours()/24 > 20 {
|
||||
aa.LanceDB.SoftDelete(strVal(mem["id"]), "auto_forget_fragment")
|
||||
if err := aa.LanceDB.SoftDelete(strVal(mem["id"]), "auto_forget_fragment"); err != nil {
|
||||
log.Printf("[softdelete] failed id: %v", err)
|
||||
}
|
||||
forgotten++
|
||||
continue
|
||||
}
|
||||
@@ -92,7 +95,9 @@ func (aa *AdminAPI) Forget(w http.ResponseWriter, r *http.Request) {
|
||||
degree := extractTopEntityDegree(content, aa.GraphStore)
|
||||
|
||||
if aa.Forgetter.ShouldForget(lastAccess, recallCnt, tier, degree) {
|
||||
aa.LanceDB.SoftDelete(strVal(mem["id"]), "auto_forget")
|
||||
if err := aa.LanceDB.SoftDelete(strVal(mem["id"]), "auto_forget"); err != nil {
|
||||
log.Printf("[softdelete] failed id: %v", err)
|
||||
}
|
||||
forgotten++
|
||||
}
|
||||
}
|
||||
@@ -257,9 +262,9 @@ func (aa *AdminAPI) Restore(w http.ResponseWriter, r *http.Request) {
|
||||
aa.startServices()
|
||||
|
||||
respond(w, 200, map[string]string{
|
||||
"status": "ok",
|
||||
"restored": req.Timestamp,
|
||||
"data_dir": dataDir,
|
||||
"status": "ok",
|
||||
"restored": req.Timestamp,
|
||||
"data_dir": dataDir,
|
||||
})
|
||||
}
|
||||
|
||||
@@ -307,10 +312,14 @@ func parseTimeStr(s interface{}) time.Time {
|
||||
|
||||
func intVal(v interface{}) int {
|
||||
switch n := v.(type) {
|
||||
case int: return n
|
||||
case int32: return int(n)
|
||||
case int64: return int(n)
|
||||
case float64: return int(n)
|
||||
case int:
|
||||
return n
|
||||
case int32:
|
||||
return int(n)
|
||||
case int64:
|
||||
return int(n)
|
||||
case float64:
|
||||
return int(n)
|
||||
case json.Number:
|
||||
i, _ := n.Int64()
|
||||
return int(i)
|
||||
@@ -323,8 +332,10 @@ func strVal(v interface{}) string {
|
||||
return ""
|
||||
}
|
||||
switch s := v.(type) {
|
||||
case string: return s
|
||||
case json.Number: return s.String()
|
||||
case string:
|
||||
return s
|
||||
case json.Number:
|
||||
return s.String()
|
||||
}
|
||||
return fmt.Sprintf("%v", v)
|
||||
}
|
||||
@@ -458,12 +469,12 @@ func (aa *AdminAPI) ListMemories(w http.ResponseWriter, r *http.Request) {
|
||||
}
|
||||
// 去掉向量字段,减少响应体积
|
||||
type memoryItem struct {
|
||||
ID string `json:"id"`
|
||||
Content string `json:"content"`
|
||||
Category string `json:"category"`
|
||||
Namespace string `json:"namespace,omitempty"`
|
||||
ID string `json:"id"`
|
||||
Content string `json:"content"`
|
||||
Category string `json:"category"`
|
||||
Namespace string `json:"namespace,omitempty"`
|
||||
Importance float64 `json:"importance"`
|
||||
CreatedAt int64 `json:"created_at"`
|
||||
CreatedAt int64 `json:"created_at"`
|
||||
}
|
||||
items := make([]memoryItem, 0, len(results))
|
||||
for _, m := range results {
|
||||
@@ -528,4 +539,4 @@ func orDefault(s, def string) string {
|
||||
return def
|
||||
}
|
||||
return s
|
||||
}
|
||||
}
|
||||
|
||||
@@ -114,7 +114,9 @@ func (fa *FeedbackAPI) Deprecate(w http.ResponseWriter, r *http.Request) {
|
||||
}
|
||||
|
||||
selfoptimize.Dash.RecordDeprecation()
|
||||
fa.LanceDB.SoftDelete(req.MemoryID, req.Reason)
|
||||
if err := fa.LanceDB.SoftDelete(req.MemoryID, req.Reason); err != nil {
|
||||
log.Printf("[softdelete] failed id: %v", err)
|
||||
}
|
||||
respond(w, 200, map[string]string{"status": "deprecated", "memory_id": req.MemoryID})
|
||||
}
|
||||
|
||||
|
||||
@@ -1223,7 +1223,9 @@ func NewServer() http.Handler {
|
||||
zeroVec := make([]float32, 1024)
|
||||
memories, _ := ldb.Search("memories", zeroVec, 1000, ns)
|
||||
for _, mem := range memories {
|
||||
ldb.SoftDelete(mem.ID, "ephemeral_expired")
|
||||
if err := ldb.SoftDelete(mem.ID, "ephemeral_expired"); err != nil {
|
||||
log.Printf("[softdelete] failed id: %v", err)
|
||||
}
|
||||
}
|
||||
if len(memories) > 0 {
|
||||
cleaned = append(cleaned, ns)
|
||||
@@ -1330,7 +1332,9 @@ func NewServer() http.Handler {
|
||||
zeroVec := make([]float32, 1024)
|
||||
memories, _ := ldb.Search("memories", zeroVec, 1000, ns)
|
||||
for _, mem := range memories {
|
||||
ldb.SoftDelete(mem.ID, "ephemeral_expired")
|
||||
if err := ldb.SoftDelete(mem.ID, "ephemeral_expired"); err != nil {
|
||||
log.Printf("[softdelete] failed id: %v", err)
|
||||
}
|
||||
}
|
||||
if len(memories) > 0 {
|
||||
log.Printf("[ephemeral] cleaned %d memories from %s (inactive for %ds)",
|
||||
|
||||
Reference in New Issue
Block a user