Version: 0.9.23.dev.260416
后端: 1. Memory 管理面 API 落地(“我的记忆”增删改查 + 恢复) - 补齐 List/Get/Create/Update/Delete/Restore 的 handler、请求模型与返回视图 - 注册 `/api/v1/memory/items*` 路由并接入 MemoryHandler - 新增 memory item not found / invalid memory type / invalid memory content 三类管理面错误码 2. Memory Module / Service / Repo 扩展为“可管理 + 可治理”门面 - 新增 NewModuleWithObserve / ObserveDeps,导出 GetItem / CreateItem / UpdateItem / DeleteItem / RestoreItem / RunDedupCleanup / MemoryObserver / MemoryMetrics - 新增手动新增、修改、恢复能力;删除链路切到 SoftDeleteByID;所有管理动作统一事务内写 audit,并桥接向量同步与管理面观测 - 补齐 CreateItemFields / UpdateItemFields、单条 Create、管理侧字段更新、软删/恢复,以及 dedup 扫描/归档所需 repo 能力 - 审计操作补齐 archive / restore 3. Memory 读侧与注入侧观测补齐 - HybridRetrieve 返回 telemetry,统一记录 pinned hit / semantic hit / dedup drop / degraded / RAG fallback,并上报读取命中、去重丢弃、RAG 降级指标 - AgentService 持有 memory observer / metrics;injectMemoryContext 对读取失败、空注入、成功注入补齐结构化日志与注入计数 4. Worker / 决策 / 向量同步链路治理增强 - 召回结果显式携带 fallbackMode;hash 精确命中、rag→mysql 降级、最终动作统一写入决策观测 - 接入 vectorSyncer / observer / metrics;为 job 重试、任务成功/失败、决策分布与 fallback 补齐打点;向量 upsert/delete 统一改走公共 Syncer,并收敛 parseMemoryID 解析逻辑 5. 启动层接入 Memory 观测依赖 - 启动时创建 LoggerObserver + MetricsRegistry,并通过 NewModuleWithObserve 注入 memory 模块 前端:无 仓库:无
This commit is contained in:
@@ -7,4 +7,5 @@ type ApiHandlers struct {
|
||||
TaskClassHandler *TaskClassHandler
|
||||
ScheduleHandler *ScheduleAPI
|
||||
AgentHandler *AgentHandler
|
||||
MemoryHandler *MemoryHandler
|
||||
}
|
||||
|
||||
290
backend/api/memory.go
Normal file
290
backend/api/memory.go
Normal file
@@ -0,0 +1,290 @@
|
||||
package api
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"net/http"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
memorypkg "github.com/LoveLosita/smartflow/backend/memory"
|
||||
memorymodel "github.com/LoveLosita/smartflow/backend/memory/model"
|
||||
"github.com/LoveLosita/smartflow/backend/model"
|
||||
"github.com/LoveLosita/smartflow/backend/respond"
|
||||
"github.com/gin-gonic/gin"
|
||||
)
|
||||
|
||||
type MemoryHandler struct {
|
||||
module *memorypkg.Module
|
||||
}
|
||||
|
||||
var errMemoryHandlerNotReady = errors.New("memory handler is not initialized")
|
||||
|
||||
func NewMemoryHandler(module *memorypkg.Module) *MemoryHandler {
|
||||
return &MemoryHandler{module: module}
|
||||
}
|
||||
|
||||
func (h *MemoryHandler) ListItems(c *gin.Context) {
|
||||
if h == nil || h.module == nil {
|
||||
c.JSON(http.StatusInternalServerError, respond.InternalError(errMemoryHandlerNotReady))
|
||||
return
|
||||
}
|
||||
|
||||
limit, ok := parseOptionalInt(c.Query("limit"))
|
||||
if !ok {
|
||||
c.JSON(http.StatusBadRequest, respond.WrongParamType)
|
||||
return
|
||||
}
|
||||
statusesRaw := c.Query("statuses")
|
||||
if strings.TrimSpace(statusesRaw) == "" {
|
||||
statusesRaw = c.Query("status")
|
||||
}
|
||||
memoryTypesRaw := c.Query("memory_types")
|
||||
if strings.TrimSpace(memoryTypesRaw) == "" {
|
||||
memoryTypesRaw = c.Query("memory_type")
|
||||
}
|
||||
|
||||
ctx, cancel := context.WithTimeout(c.Request.Context(), 2*time.Second)
|
||||
defer cancel()
|
||||
|
||||
items, err := h.module.ListItems(ctx, memorymodel.ListItemsRequest{
|
||||
UserID: c.GetInt("user_id"),
|
||||
ConversationID: strings.TrimSpace(c.Query("conversation_id")),
|
||||
Statuses: splitCSV(statusesRaw),
|
||||
MemoryTypes: splitCSV(memoryTypesRaw),
|
||||
Limit: limit,
|
||||
})
|
||||
if err != nil {
|
||||
respond.DealWithError(c, err)
|
||||
return
|
||||
}
|
||||
|
||||
c.JSON(http.StatusOK, respond.RespWithData(respond.Ok, toMemoryItemViews(items)))
|
||||
}
|
||||
|
||||
func (h *MemoryHandler) GetItem(c *gin.Context) {
|
||||
if h == nil || h.module == nil {
|
||||
c.JSON(http.StatusInternalServerError, respond.InternalError(errMemoryHandlerNotReady))
|
||||
return
|
||||
}
|
||||
|
||||
memoryID, ok := parseMemoryIDParam(c)
|
||||
if !ok {
|
||||
c.JSON(http.StatusBadRequest, respond.WrongParamType)
|
||||
return
|
||||
}
|
||||
|
||||
ctx, cancel := context.WithTimeout(c.Request.Context(), 2*time.Second)
|
||||
defer cancel()
|
||||
|
||||
item, err := h.module.GetItem(ctx, model.MemoryGetItemRequest{
|
||||
UserID: c.GetInt("user_id"),
|
||||
MemoryID: memoryID,
|
||||
})
|
||||
if err != nil {
|
||||
respond.DealWithError(c, err)
|
||||
return
|
||||
}
|
||||
c.JSON(http.StatusOK, respond.RespWithData(respond.Ok, toMemoryItemView(item)))
|
||||
}
|
||||
|
||||
func (h *MemoryHandler) CreateItem(c *gin.Context) {
|
||||
if h == nil || h.module == nil {
|
||||
c.JSON(http.StatusInternalServerError, respond.InternalError(errMemoryHandlerNotReady))
|
||||
return
|
||||
}
|
||||
|
||||
var req model.MemoryCreateItemRequest
|
||||
if err := c.ShouldBindJSON(&req); err != nil {
|
||||
c.JSON(http.StatusBadRequest, respond.WrongParamType)
|
||||
return
|
||||
}
|
||||
req.UserID = c.GetInt("user_id")
|
||||
req.OperatorType = "user"
|
||||
|
||||
ctx, cancel := context.WithTimeout(c.Request.Context(), 2*time.Second)
|
||||
defer cancel()
|
||||
|
||||
item, err := h.module.CreateItem(ctx, req)
|
||||
if err != nil {
|
||||
respond.DealWithError(c, err)
|
||||
return
|
||||
}
|
||||
c.JSON(http.StatusOK, respond.RespWithData(respond.Ok, toMemoryItemView(item)))
|
||||
}
|
||||
|
||||
func (h *MemoryHandler) UpdateItem(c *gin.Context) {
|
||||
if h == nil || h.module == nil {
|
||||
c.JSON(http.StatusInternalServerError, respond.InternalError(errMemoryHandlerNotReady))
|
||||
return
|
||||
}
|
||||
|
||||
memoryID, ok := parseMemoryIDParam(c)
|
||||
if !ok {
|
||||
c.JSON(http.StatusBadRequest, respond.WrongParamType)
|
||||
return
|
||||
}
|
||||
|
||||
var req model.MemoryUpdateItemRequest
|
||||
if err := c.ShouldBindJSON(&req); err != nil {
|
||||
c.JSON(http.StatusBadRequest, respond.WrongParamType)
|
||||
return
|
||||
}
|
||||
req.UserID = c.GetInt("user_id")
|
||||
req.MemoryID = memoryID
|
||||
req.OperatorType = "user"
|
||||
|
||||
ctx, cancel := context.WithTimeout(c.Request.Context(), 2*time.Second)
|
||||
defer cancel()
|
||||
|
||||
item, err := h.module.UpdateItem(ctx, req)
|
||||
if err != nil {
|
||||
respond.DealWithError(c, err)
|
||||
return
|
||||
}
|
||||
c.JSON(http.StatusOK, respond.RespWithData(respond.Ok, toMemoryItemView(item)))
|
||||
}
|
||||
|
||||
func (h *MemoryHandler) DeleteItem(c *gin.Context) {
|
||||
if h == nil || h.module == nil {
|
||||
c.JSON(http.StatusInternalServerError, respond.InternalError(errMemoryHandlerNotReady))
|
||||
return
|
||||
}
|
||||
|
||||
memoryID, ok := parseMemoryIDParam(c)
|
||||
if !ok {
|
||||
c.JSON(http.StatusBadRequest, respond.WrongParamType)
|
||||
return
|
||||
}
|
||||
|
||||
var body struct {
|
||||
Reason string `json:"reason"`
|
||||
}
|
||||
_ = c.ShouldBindJSON(&body)
|
||||
|
||||
ctx, cancel := context.WithTimeout(c.Request.Context(), 2*time.Second)
|
||||
defer cancel()
|
||||
|
||||
item, err := h.module.DeleteItem(ctx, model.MemoryDeleteItemRequest{
|
||||
UserID: c.GetInt("user_id"),
|
||||
MemoryID: memoryID,
|
||||
Reason: strings.TrimSpace(body.Reason),
|
||||
OperatorType: "user",
|
||||
})
|
||||
if err != nil {
|
||||
respond.DealWithError(c, err)
|
||||
return
|
||||
}
|
||||
c.JSON(http.StatusOK, respond.RespWithData(respond.Ok, toMemoryItemView(item)))
|
||||
}
|
||||
|
||||
func (h *MemoryHandler) RestoreItem(c *gin.Context) {
|
||||
if h == nil || h.module == nil {
|
||||
c.JSON(http.StatusInternalServerError, respond.InternalError(errMemoryHandlerNotReady))
|
||||
return
|
||||
}
|
||||
|
||||
memoryID, ok := parseMemoryIDParam(c)
|
||||
if !ok {
|
||||
c.JSON(http.StatusBadRequest, respond.WrongParamType)
|
||||
return
|
||||
}
|
||||
|
||||
var body struct {
|
||||
Reason string `json:"reason"`
|
||||
}
|
||||
_ = c.ShouldBindJSON(&body)
|
||||
|
||||
ctx, cancel := context.WithTimeout(c.Request.Context(), 2*time.Second)
|
||||
defer cancel()
|
||||
|
||||
item, err := h.module.RestoreItem(ctx, model.MemoryRestoreItemRequest{
|
||||
UserID: c.GetInt("user_id"),
|
||||
MemoryID: memoryID,
|
||||
Reason: strings.TrimSpace(body.Reason),
|
||||
OperatorType: "user",
|
||||
})
|
||||
if err != nil {
|
||||
respond.DealWithError(c, err)
|
||||
return
|
||||
}
|
||||
c.JSON(http.StatusOK, respond.RespWithData(respond.Ok, toMemoryItemView(item)))
|
||||
}
|
||||
|
||||
func parseMemoryIDParam(c *gin.Context) (int64, bool) {
|
||||
raw := strings.TrimSpace(c.Param("id"))
|
||||
if raw == "" {
|
||||
return 0, false
|
||||
}
|
||||
value, err := strconv.ParseInt(raw, 10, 64)
|
||||
if err != nil || value <= 0 {
|
||||
return 0, false
|
||||
}
|
||||
return value, true
|
||||
}
|
||||
|
||||
func parseOptionalInt(raw string) (int, bool) {
|
||||
raw = strings.TrimSpace(raw)
|
||||
if raw == "" {
|
||||
return 0, true
|
||||
}
|
||||
value, err := strconv.Atoi(raw)
|
||||
if err != nil {
|
||||
return 0, false
|
||||
}
|
||||
return value, true
|
||||
}
|
||||
|
||||
func splitCSV(raw string) []string {
|
||||
raw = strings.TrimSpace(raw)
|
||||
if raw == "" {
|
||||
return nil
|
||||
}
|
||||
parts := strings.Split(raw, ",")
|
||||
result := make([]string, 0, len(parts))
|
||||
for _, part := range parts {
|
||||
part = strings.TrimSpace(part)
|
||||
if part == "" {
|
||||
continue
|
||||
}
|
||||
result = append(result, part)
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
func toMemoryItemViews(items []memorymodel.ItemDTO) []model.MemoryItemView {
|
||||
if len(items) == 0 {
|
||||
return nil
|
||||
}
|
||||
result := make([]model.MemoryItemView, 0, len(items))
|
||||
for _, item := range items {
|
||||
result = append(result, toMemoryItemView(&item))
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
func toMemoryItemView(item *memorymodel.ItemDTO) model.MemoryItemView {
|
||||
if item == nil {
|
||||
return model.MemoryItemView{}
|
||||
}
|
||||
return model.MemoryItemView{
|
||||
ID: item.ID,
|
||||
UserID: item.UserID,
|
||||
ConversationID: item.ConversationID,
|
||||
AssistantID: item.AssistantID,
|
||||
RunID: item.RunID,
|
||||
MemoryType: item.MemoryType,
|
||||
Title: item.Title,
|
||||
Content: item.Content,
|
||||
ContentHash: item.ContentHash,
|
||||
Confidence: item.Confidence,
|
||||
Importance: item.Importance,
|
||||
SensitivityLevel: item.SensitivityLevel,
|
||||
IsExplicit: item.IsExplicit,
|
||||
Status: item.Status,
|
||||
TTLAt: item.TTLAt,
|
||||
CreatedAt: item.CreatedAt,
|
||||
UpdatedAt: item.UpdatedAt,
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user