后端:
1.阶段 6 CP4/CP5 目录收口与共享边界纯化
- 将 backend 根目录收口为 services、client、gateway、cmd、shared 五个一级目录
- 收拢 bootstrap、inits、infra/kafka、infra/outbox、conv、respond、pkg、middleware,移除根目录旧实现与空目录
- 将 utils 下沉到 services/userauth/internal/auth,将 logic 下沉到 services/schedule/core/planning
- 将迁移期 runtime 桥接实现统一收拢到 services/runtime/{conv,dao,eventsvc,model},删除 shared/legacy 与未再被 import 的旧 service 实现
- 将 gateway/shared/respond 收口为 HTTP/Gin 错误写回适配,shared/respond 仅保留共享错误语义与状态映射
- 将 HTTP IdempotencyMiddleware 与 RateLimitMiddleware 收口到 gateway/middleware
- 将 GormCachePlugin 下沉到 shared/infra/gormcache,将共享 RateLimiter 下沉到 shared/infra/ratelimit,将 agent token budget 下沉到 services/agent/shared
- 删除 InitEino 兼容壳,收缩 cmd/internal/coreinit 仅保留旧组合壳残留域初始化语义
- 更新微服务迁移计划与桌面 checklist,补齐 CP4/CP5 当前切流点、目录终态与验证结果
- 完成 go test ./...、git diff --check 与最终真实 smoke;health、register/login、task/create+get、schedule/today、task-class/list、memory/items、agent chat/meta/timeline/context-stats 全部 200,SSE 合并结果为 CP5_OK 且 [DONE] 只有 1 个
122 lines
4.0 KiB
Go
122 lines
4.0 KiB
Go
package sv
|
||
|
||
import (
|
||
"context"
|
||
"errors"
|
||
|
||
memorymodel "github.com/LoveLosita/smartflow/backend/services/memory/model"
|
||
memoryobserve "github.com/LoveLosita/smartflow/backend/services/memory/observe"
|
||
memorycontracts "github.com/LoveLosita/smartflow/backend/shared/contracts/memory"
|
||
)
|
||
|
||
// MemoryRPCReaderClient 描述 agent 读取 memory zrpc 所需的最小能力。
|
||
//
|
||
// 职责边界:
|
||
// 1. 只读取候选记忆,不暴露管理写接口;
|
||
// 2. 不要求调用方知道 backend/client/memory 的具体实现;
|
||
// 3. 错误原样返回给预取链路,由 agent 侧负责软降级和观测记录。
|
||
type MemoryRPCReaderClient interface {
|
||
Retrieve(ctx context.Context, req memorycontracts.RetrieveRequest) ([]memorycontracts.ItemDTO, error)
|
||
}
|
||
|
||
type memoryRPCReader struct {
|
||
client MemoryRPCReaderClient
|
||
observer memoryobserve.Observer
|
||
metrics memoryobserve.MetricsRecorder
|
||
}
|
||
|
||
// NewMemoryRPCReader 创建跨进程 memory reader 适配器。
|
||
//
|
||
// 职责边界:
|
||
// 1. 只把 agent 内部的 memorymodel.RetrieveRequest 转成共享契约;
|
||
// 2. 不持有 memory.Module,避免 CP3 后 agent 主链路继续直连本进程记忆服务;
|
||
// 3. observer / metrics 只用于 agent 注入观测,不参与 retrieve 业务调用;
|
||
// 4. client 为空时返回 nil,让 SetMemoryReader 保持既有“无 reader 则不注入”的降级语义。
|
||
func NewMemoryRPCReader(
|
||
client MemoryRPCReaderClient,
|
||
observer memoryobserve.Observer,
|
||
metrics memoryobserve.MetricsRecorder,
|
||
) MemoryReader {
|
||
if client == nil {
|
||
return nil
|
||
}
|
||
if observer == nil {
|
||
observer = memoryobserve.NewNopObserver()
|
||
}
|
||
if metrics == nil {
|
||
metrics = memoryobserve.NewNopMetrics()
|
||
}
|
||
return &memoryRPCReader{
|
||
client: client,
|
||
observer: observer,
|
||
metrics: metrics,
|
||
}
|
||
}
|
||
|
||
// Retrieve 通过 memory zrpc 读取候选记忆并转换回 agent 内部 DTO。
|
||
func (r *memoryRPCReader) Retrieve(ctx context.Context, req memorymodel.RetrieveRequest) ([]memorymodel.ItemDTO, error) {
|
||
if r == nil || r.client == nil {
|
||
return nil, errors.New("memory rpc reader client is nil")
|
||
}
|
||
items, err := r.client.Retrieve(ctx, memorycontracts.RetrieveRequest{
|
||
Query: req.Query,
|
||
UserID: req.UserID,
|
||
ConversationID: req.ConversationID,
|
||
AssistantID: req.AssistantID,
|
||
RunID: req.RunID,
|
||
MemoryTypes: append([]string(nil), req.MemoryTypes...),
|
||
Limit: req.Limit,
|
||
Now: req.Now,
|
||
})
|
||
if err != nil {
|
||
return nil, err
|
||
}
|
||
return toMemoryModelItems(items), nil
|
||
}
|
||
|
||
// MemoryObserver 暴露 agent 注入链路使用的 observer,保持 CP3 切流前后的注入观测连续。
|
||
func (r *memoryRPCReader) MemoryObserver() memoryobserve.Observer {
|
||
if r == nil || r.observer == nil {
|
||
return memoryobserve.NewNopObserver()
|
||
}
|
||
return r.observer
|
||
}
|
||
|
||
// MemoryMetrics 暴露 agent 注入链路使用的 metrics,避免 RPC reader 切流后指标静默丢失。
|
||
func (r *memoryRPCReader) MemoryMetrics() memoryobserve.MetricsRecorder {
|
||
if r == nil || r.metrics == nil {
|
||
return memoryobserve.NewNopMetrics()
|
||
}
|
||
return r.metrics
|
||
}
|
||
|
||
// toMemoryModelItems 只做跨层 DTO 字段搬运,不改变排序、过滤和记忆内容。
|
||
func toMemoryModelItems(items []memorycontracts.ItemDTO) []memorymodel.ItemDTO {
|
||
if len(items) == 0 {
|
||
return nil
|
||
}
|
||
result := make([]memorymodel.ItemDTO, 0, len(items))
|
||
for _, item := range items {
|
||
result = append(result, memorymodel.ItemDTO{
|
||
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,
|
||
})
|
||
}
|
||
return result
|
||
}
|