ben/coze-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: add a redis abstraction to support different versions of the redis sdk (#549)

Browse Source
This commit is contained in:
Ryo
2025-08-05 16:09:54 +08:00
committed by GitHub
parent d4d0ba6b9a
commit ab0ce50df5
11 changed files with 316 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
backend/domain/memory/database/service/database_impl.go
View File

@@ -28,7 +28,6 @@ import (
"strconv"
"time"
"github.com/redis/go-redis/v9"
"github.com/tealeg/xlsx/v3"
"gorm.io/gorm"
@@ -1921,22 +1920,22 @@ func (d databaseService) GetDatabaseFileProgressData(ctx context.Context, req *G
currentFileName = draftCurrentFileName
}
totalNum, err := d.cache.Get(ctx, fmt.Sprintf(totalKey, req.DatabaseID, req.UserID)).Int64()
if err != nil && !errors.Is(err, redis.Nil) {
if err != nil && !errors.Is(err, cache.Nil) {
return nil, err
}
progressNum, err := d.cache.Get(ctx, fmt.Sprintf(progressKey, req.DatabaseID, req.UserID)).Int64()
if err != nil && !errors.Is(err, redis.Nil) {
if err != nil && !errors.Is(err, cache.Nil) {
return nil, err
}
failReason, err := d.cache.Get(ctx, fmt.Sprintf(failKey, req.DatabaseID, req.UserID)).Result()
if err != nil && !errors.Is(err, redis.Nil) {
if err != nil && !errors.Is(err, cache.Nil) {
return nil, err
}
fileName, err := d.cache.Get(ctx, fmt.Sprintf(currentFileName, req.DatabaseID, req.UserID)).Result()
if err != nil && !errors.Is(err, redis.Nil) {
if err != nil && !errors.Is(err, cache.Nil) {
return nil, err
}

2
backend/domain/workflow/internal/canvas/adaptor/to_schema.go
View File

@@ -438,7 +438,7 @@ func PruneIsolatedNodes(nodes []*vo.Node, edges []*vo.Edge, parentNode *vo.Node)
func parseBatchMode(n *vo.Node) (
batchN *vo.Node, // the new batch node
enabled bool, // whether the node has enabled batch mode
enabled bool, // whether the node has enabled batch mode
err error) {
if n.Data == nil || n.Data.Inputs == nil {
return nil, false, nil

6
backend/domain/workflow/internal/compose/test/question_answer_test.go
View File

@@ -31,7 +31,6 @@ import (
model2 "github.com/cloudwego/eino/components/model"
"github.com/cloudwego/eino/compose"
"github.com/cloudwego/eino/schema"
"github.com/redis/go-redis/v9"
"github.com/stretchr/testify/assert"
"go.uber.org/mock/gomock"
"gorm.io/driver/mysql"
@@ -47,6 +46,7 @@ import (
"github.com/coze-dev/coze-studio/backend/domain/workflow/internal/nodes/exit"
"github.com/coze-dev/coze-studio/backend/domain/workflow/internal/nodes/qa"
repo2 "github.com/coze-dev/coze-studio/backend/domain/workflow/internal/repo"
"github.com/coze-dev/coze-studio/backend/infra/impl/cache/redis"
schema2 "github.com/coze-dev/coze-studio/backend/domain/workflow/internal/schema"
"github.com/coze-dev/coze-studio/backend/infra/impl/checkpoint"
mock "github.com/coze-dev/coze-studio/backend/internal/mock/infra/contract/idgen"
@@ -96,9 +96,7 @@ func TestQuestionAnswer(t *testing.T) {
}
defer s.Close()
redisClient := redis.NewClient(&redis.Options{
Addr: s.Addr(),
})
redisClient := redis.NewWithAddrAndPassword(s.Addr(), "")
mockIDGen := mock.NewMockIDGenerator(ctrl)
mockIDGen.EXPECT().GenID(gomock.Any()).Return(time.Now().UnixNano(), nil).AnyTimes()

7
backend/domain/workflow/internal/repo/execute_history_store_test.go
View File

@@ -25,7 +25,6 @@ import (
"github.com/DATA-DOG/go-sqlmock"
"github.com/alicebob/miniredis/v2"
"github.com/redis/go-redis/v9"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/suite"
"gorm.io/driver/mysql"
@@ -33,12 +32,14 @@ import (
"github.com/coze-dev/coze-studio/backend/domain/workflow/entity"
"github.com/coze-dev/coze-studio/backend/domain/workflow/internal/repo/dal/query"
"github.com/coze-dev/coze-studio/backend/infra/contract/cache"
"github.com/coze-dev/coze-studio/backend/infra/impl/cache/redis"
)
type ExecuteHistoryStoreSuite struct {
suite.Suite
db *gorm.DB
redis *redis.Client
redis cache.Cmdable
mock sqlmock.Sqlmock
store *executeHistoryStoreImpl
}
@@ -47,7 +48,7 @@ func (s *ExecuteHistoryStoreSuite) SetupTest() {
var err error
mr, err := miniredis.Run()
assert.NoError(s.T(), err)
s.redis = redis.NewClient(&redis.Options{Addr: mr.Addr()})
s.redis = redis.NewWithAddrAndPassword(mr.Addr(), "")
mockDB, mock, err := sqlmock.New()
assert.NoError(s.T(), err)