diff --git a/sundynix-mcp-go/go.mod b/sundynix-mcp-go/go.mod index fb3d3d5..2654692 100644 --- a/sundynix-mcp-go/go.mod +++ b/sundynix-mcp-go/go.mod @@ -32,6 +32,7 @@ require ( github.com/blevesearch/zapx/v14 v14.3.10 // indirect github.com/blevesearch/zapx/v15 v15.3.13 // indirect github.com/blevesearch/zapx/v16 v16.1.5 // indirect + github.com/bwmarrin/snowflake v0.3.0 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/cockroachdb/errors v1.9.1 // indirect github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f // indirect diff --git a/sundynix-mcp-go/go.sum b/sundynix-mcp-go/go.sum index b497a41..12c8e3c 100644 --- a/sundynix-mcp-go/go.sum +++ b/sundynix-mcp-go/go.sum @@ -54,6 +54,8 @@ github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs= github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c= github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA= github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0= +github.com/bwmarrin/snowflake v0.3.0 h1:xm67bEhkKh6ij1790JB83OujPR5CzNe8QuQqAgISZN0= +github.com/bwmarrin/snowflake v0.3.0/go.mod h1:NdZxfVWX+oR6y2K0o6qAYv6gIOP9rjG0/E9WsDpxqwE= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= @@ -151,6 +153,7 @@ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -185,6 +188,7 @@ github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/ github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k= github.com/kataras/golog v0.0.10/go.mod h1:yJ8YKCmyL+nWjERB90Qwn+bdyBZsaQwU3bTVFgkFIp8= @@ -239,6 +243,7 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/moul/http2curl v1.0.0/go.mod h1:8UbvGypXm98wA/IqH45anm5Y2Z6ep6O31QGOAZ3H0fQ= github.com/mschoch/smat v0.2.0 h1:8imxQsjDm8yFEAVBe7azKmKSgzSkZXDuKkSq9374khM= github.com/mschoch/smat v0.2.0/go.mod h1:kc9mz7DoBKqDyiRL7VZN8KvXQMWeTaVnttLRXOlotKw= @@ -301,6 +306,7 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/tidwall/gjson v1.14.4 h1:uo0p8EbA09J7RQaflQ1aBRffTR7xedD2bcIVSYxLnkM= github.com/tidwall/gjson v1.14.4/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= @@ -377,6 +383,7 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20211008194852-3b03d305991f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= +golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -484,6 +491,7 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= +google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/sundynix-mcp-go/internal/memory/store.go b/sundynix-mcp-go/internal/memory/store.go index 01e3ef5..863bc49 100644 --- a/sundynix-mcp-go/internal/memory/store.go +++ b/sundynix-mcp-go/internal/memory/store.go @@ -8,17 +8,46 @@ import ( "log" "sort" "strings" + "time" + "github.com/bwmarrin/snowflake" "gorm.io/driver/postgres" "gorm.io/gorm" + "gorm.io/gorm/clause" "gorm.io/gorm/logger" ) +// sfNode 是本服务的雪花 ID 生成器。node=2 与网关(node=1)区分，避免共享 PG 中 ID 冲突。 +var sfNode *snowflake.Node + +func init() { sfNode, _ = snowflake.NewNode(2) } + +// NewID 生成字符串型雪花 ID（项目级 DB 规约：主键统一用它）。 +func NewID() string { return sfNode.Generate().String() } + +// BaseModel 是所有 DB 映射结构体的基础字段（项目级规约）： +// 字符串雪花 ID 主键 + 创建/更新时间 + GORM 软删（带索引）。与网关 store.BaseModel 同规约。 +type BaseModel struct { + ID string `gorm:"primaryKey;size:24" json:"id"` + CreatedAt time.Time `json:"created_at"` + UpdatedAt time.Time `json:"updated_at"` + DeletedAt gorm.DeletedAt `gorm:"index" json:"-"` +} + +// BeforeCreate 在插入前补雪花 ID。 +func (b *BaseModel) BeforeCreate(*gorm.DB) error { + if b.ID == "" { + b.ID = NewID() + } + return nil +} + // Profile 是用户常驻画像的一条 key/value 偏好（always-on memory）。 -// 复合主键 (user_id, key)：同一用户同一键 upsert 覆盖。 +// 套用 BaseModel 规约：雪花 ID 主键；(user_id, key) 唯一索引 —— 同一用户同一键 upsert 覆盖。 type Profile struct { - UserID string `gorm:"primaryKey;column:user_id;size:64"` - Key string `gorm:"primaryKey;size:64"` + BaseModel + UserID string `gorm:"column:user_id;size:64;uniqueIndex:idx_profile_uk"` + Key string `gorm:"size:64;uniqueIndex:idx_profile_uk"` Value string `gorm:"type:text"` } @@ -37,14 +66,46 @@ func Open(dsn string) *Store { log.Printf("[memory] postgres 不可用，记忆降级（召回为空）: %v", err) return &Store{} } + // 一次性迁移：旧表用复合主键 (user_id,key) 无 id/时间戳，与雪花规约不兼容。 + migrateLegacyProfile(db) if err := db.AutoMigrate(&Profile{}); err != nil { log.Printf("[memory] AutoMigrate 失败，记忆降级: %v", err) return &Store{} } - log.Println("[memory] postgres connected, migrated sundynix_user_profile") + log.Println("[memory] postgres connected, migrated sundynix_user_profile (雪花 id + 软删 规约)") return &Store{db: db} } +// migrateLegacyProfile 检测旧 Profile 表（无 id 列）则备份偏好 → 重建为雪花规约 → 回灌。 +func migrateLegacyProfile(db *gorm.DB) { + m := db.Migrator() + if !m.HasTable("sundynix_user_profile") { + return // 全新库，AutoMigrate 直接建新表 + } + if m.HasColumn(&Profile{}, "id") { + return // 已是新规约 + } + log.Println("[memory] 检测到旧 Profile 表（复合主键无 id），迁移到雪花规约（保留偏好）") + var saved []struct { + UserID string `gorm:"column:user_id"` + Key string `gorm:"column:key"` + Value string `gorm:"column:value"` + } + db.Raw(`SELECT user_id, "key", value FROM sundynix_user_profile`).Scan(&saved) + if err := m.DropTable("sundynix_user_profile"); err != nil { + log.Printf("[memory] 迁移 drop 旧表失败: %v", err) + return + } + if err := db.AutoMigrate(&Profile{}); err != nil { + log.Printf("[memory] 迁移建新表失败: %v", err) + return + } + for _, r := range saved { + _ = db.Create(&Profile{UserID: r.UserID, Key: r.Key, Value: r.Value}).Error + } + log.Printf("[memory] 已回灌 %d 条偏好（新雪花 id）", len(saved)) +} + // Get 返回某用户的画像，渲染为可直接注入 prompt 的多行文本（按 key 排序，稳定输出）。 func (s *Store) Get(ctx context.Context, userID string) (string, error) { if s.db == nil || userID == "" { @@ -62,12 +123,15 @@ func (s *Store) Get(ctx context.Context, userID string) (string, error) { return strings.TrimRight(b.String(), "\n"), nil } -// Upsert 写入/更新一条画像偏好（key 冲突即覆盖 value）。 +// Upsert 写入/更新一条画像偏好（(user_id,key) 冲突即覆盖 value，保留原 id）。 func (s *Store) Upsert(ctx context.Context, userID, key, value string) error { if s.db == nil { return fmt.Errorf("memory store disabled") } - return s.db.WithContext(ctx).Save(&Profile{UserID: userID, Key: key, Value: value}).Error + return s.db.WithContext(ctx).Clauses(clause.OnConflict{ + Columns: []clause.Column{{Name: "user_id"}, {Name: "key"}}, + DoUpdates: clause.Assignments(map[string]any{"value": value, "updated_at": time.Now()}), + }).Create(&Profile{UserID: userID, Key: key, Value: value}).Error } // Close 释放连接。 diff --git a/sundynix-mcp-go/internal/memory/store_test.go b/sundynix-mcp-go/internal/memory/store_test.go new file mode 100644 index 0000000..ff83fa0 --- /dev/null +++ b/sundynix-mcp-go/internal/memory/store_test.go @@ -0,0 +1,124 @@ +package memory + +import ( + "context" + "os" + "testing" + + "gorm.io/driver/postgres" + "gorm.io/gorm" + "gorm.io/gorm/logger" +) + +// TestBaseModelID 验证雪花 ID 规约：NewID 非空且不重复；BeforeCreate 补 ID、已有则保留。 +func TestBaseModelID(t *testing.T) { + a, b := NewID(), NewID() + if a == "" || b == "" { + t.Fatal("NewID 不应为空") + } + if a == b { + t.Errorf("两次 NewID 应不同: %s", a) + } + var m BaseModel + if err := m.BeforeCreate(nil); err != nil { + t.Fatal(err) + } + if m.ID == "" { + t.Error("BeforeCreate 应补 ID") + } + m.ID = "fixed" + _ = m.BeforeCreate(nil) + if m.ID != "fixed" { + t.Error("BeforeCreate 不应覆盖已有 ID") + } +} + +// TestProfileStore_Integration 跑真实 Postgres（设 MEMORY_TEST_DSN 才执行）： +// 验证迁移后表含雪花规约字段、Upsert (user_id,key) 冲突覆盖而非新增、Get 渲染。 +func TestProfileStore_Integration(t *testing.T) { + dsn := os.Getenv("MEMORY_TEST_DSN") + if dsn == "" { + t.Skip("设 MEMORY_TEST_DSN 启用 Postgres 集成测试") + } + raw, err := gorm.Open(postgres.New(postgres.Config{DSN: dsn}), &gorm.Config{Logger: logger.Default.LogMode(logger.Silent)}) + if err != nil { + t.Fatalf("连接 Postgres: %v", err) + } + _ = raw.Migrator().DropTable("sundynix_user_profile") // 干净起点 + + s := Open(dsn) // 触发迁移 + AutoMigrate + if s.db == nil { + t.Fatal("Store 不应降级") + } + ctx := context.Background() + + // 新规约字段齐全。 + for _, col := range []string{"id", "created_at", "updated_at", "deleted_at"} { + if !raw.Migrator().HasColumn(&Profile{}, col) { + t.Errorf("表应含规约字段 %s", col) + } + } + + // Upsert 两次同 (user_id,key) → 覆盖，不新增；id 稳定。 + if err := s.Upsert(ctx, "u1", "城市", "北京"); err != nil { + t.Fatal(err) + } + var first Profile + raw.Where("user_id = ? AND key = ?", "u1", "城市").First(&first) + if first.ID == "" || first.CreatedAt.IsZero() { + t.Error("行应有雪花 id 与创建时间") + } + if err := s.Upsert(ctx, "u1", "城市", "上海"); err != nil { + t.Fatal(err) + } + var cnt int64 + raw.Model(&Profile{}).Where("user_id = ?", "u1").Count(&cnt) + if cnt != 1 { + t.Errorf("同键 upsert 应覆盖，期望 1 行，得 %d", cnt) + } + var after Profile + raw.Where("user_id = ? AND key = ?", "u1", "城市").First(&after) + if after.Value != "上海" || after.ID != first.ID { + t.Errorf("应覆盖 value 且保留 id: value=%s id=%s/%s", after.Value, after.ID, first.ID) + } + + // Get 渲染多行（按 key 排序）。 + _ = s.Upsert(ctx, "u1", "爱好", "围棋") + got, _ := s.Get(ctx, "u1") + if got == "" || got != "- 城市：上海\n- 爱好：围棋" { + t.Errorf("Get 渲染不符: %q", got) + } +} + +// TestProfileStore_LegacyMigration 验证旧复合主键表（无 id）→ 雪花规约表的迁移保留数据。 +func TestProfileStore_LegacyMigration(t *testing.T) { + dsn := os.Getenv("MEMORY_TEST_DSN") + if dsn == "" { + t.Skip("设 MEMORY_TEST_DSN 启用 Postgres 集成测试") + } + raw, err := gorm.Open(postgres.New(postgres.Config{DSN: dsn}), &gorm.Config{Logger: logger.Default.LogMode(logger.Silent)}) + if err != nil { + t.Fatalf("连接 Postgres: %v", err) + } + // 造一个旧 schema 表（复合主键、无 id/时间戳）并塞一条偏好。 + raw.Migrator().DropTable("sundynix_user_profile") + if err := raw.Exec(`CREATE TABLE sundynix_user_profile (user_id varchar(64), "key" varchar(64), value text, PRIMARY KEY(user_id, "key"))`).Error; err != nil { + t.Fatalf("建旧表: %v", err) + } + raw.Exec(`INSERT INTO sundynix_user_profile (user_id, "key", value) VALUES ('legacy', '语言', 'Go')`) + + s := Open(dsn) // 应触发 migrateLegacyProfile：备份→重建→回灌 + if s.db == nil { + t.Fatal("Store 不应降级") + } + if !raw.Migrator().HasColumn(&Profile{}, "id") { + t.Error("迁移后应有 id 列") + } + var p Profile + if err := raw.Where("user_id = ? AND key = ?", "legacy", "语言").First(&p).Error; err != nil { + t.Fatalf("迁移后旧数据应保留: %v", err) + } + if p.Value != "Go" || p.ID == "" { + t.Errorf("旧偏好应保留且补新 id: value=%s id=%s", p.Value, p.ID) + } +}