deps: update Redis to v8

Author: dancing-ui

core/llm_token_ratelimit/identifier_checker.go

@@ -48,12 +48,18 @@ func (f *HeaderChecker) Check(ctx *Context, infos *RequestInfos, identifier Iden
 	if f == nil {
 		return false
 	}
-	if infos == nil || infos.Headers == nil {
+	if infos == nil {
 		logging.Warn("[LLMTokenRateLimit] requestInfos is nil",
 			"requestID", ctx.Get(KeyRequestID),
 		)
 		return true // allow nil for global rate limit
 	}
+	if infos.Headers == nil {
+		logging.Warn("[LLMTokenRateLimit] requestInfos's Headers is nil",
+			"requestID", ctx.Get(KeyRequestID),
+		)
+		return true // allow nil for global rate limit
+	}
 	for key, values := range infos.Headers {
 		if len(values) == 0 {
 			values = []string{pattern}

core/llm_token_ratelimit/redis_client.go

@@ -15,11 +15,12 @@
 package llmtokenratelimit
 
 import (
+	"context"
 	"fmt"
 	"sync"
 	"time"
 
-	redis "github.com/go-redis/redis/v7"
+	redis "github.com/go-redis/redis/v8"
 )
 
 type SafeRedisClient struct {
@@ -33,6 +34,21 @@ func NewGlobalRedisClient() *SafeRedisClient {
 	return &SafeRedisClient{}
 }
 
+func (c *SafeRedisClient) SetRedisClient(client *redis.ClusterClient) error {
+	if c == nil {
+		return fmt.Errorf("safe redis client is nil")
+	}
+	c.mu.Lock()
+	defer c.mu.Unlock()
+
+	if c.client != nil {
+		c.client.Close()
+	}
+
+	c.client = client
+	return nil
+}
+
 func (c *SafeRedisClient) Init(cfg *Redis) error {
 	if c == nil {
 		return fmt.Errorf("safe redis client is nil")
@@ -103,12 +119,12 @@ func (c *SafeRedisClient) Init(cfg *Redis) error {
 		return fmt.Errorf("new redis client is nil")
 	}
 
-	if _, err := newClient.Ping().Result(); err != nil {
+	if _, err := newClient.Ping(context.TODO()).Result(); err != nil {
 		return fmt.Errorf("failed to connect to redis cluster: %v", err)
 	}
 	// Perform lock replacement only after the new client successfully connects;
 	// otherwise, a deadlock will occur if the connection fails
-	return c.updateClient(newClient)
+	return c.SetRedisClient(newClient)
 }
 
 func (c *SafeRedisClient) Eval(script string, keys []string, args ...interface{}) (interface{}, error) {
@@ -122,7 +138,7 @@ func (c *SafeRedisClient) Eval(script string, keys []string, args ...interface{}
 		return nil, fmt.Errorf("redis client is not initialized")
 	}
 
-	return c.client.Eval(script, keys, args...).Result()
+	return c.client.Eval(context.TODO(), script, keys, args...).Result()
 }
 
 func (c *SafeRedisClient) Set(key string, value interface{}, expiration time.Duration) error {
@@ -136,7 +152,7 @@ func (c *SafeRedisClient) Set(key string, value interface{}, expiration time.Dur
 		return fmt.Errorf("redis client is not initialized")
 	}
 
-	return c.client.Set(key, value, expiration).Err()
+	return c.client.Set(context.TODO(), key, value, expiration).Err()
 }
 
 func (c *SafeRedisClient) Get(key string) (*redis.StringCmd, error) {
@@ -150,7 +166,7 @@ func (c *SafeRedisClient) Get(key string) (*redis.StringCmd, error) {
 		return nil, fmt.Errorf("redis client is not initialized")
 	}
 
-	return c.client.Get(key), nil
+	return c.client.Get(context.TODO(), key), nil
 }
 
 func (c *SafeRedisClient) Close() error {
@@ -165,18 +181,3 @@ func (c *SafeRedisClient) Close() error {
 	}
 	return nil
 }
-
-func (c *SafeRedisClient) updateClient(newClient *redis.ClusterClient) error {
-	if c == nil {
-		return fmt.Errorf("safe redis client is nil")
-	}
-	c.mu.Lock()
-	defer c.mu.Unlock()
-
-	if c.client != nil {
-		c.client.Close()
-	}
-
-	c.client = newClient
-	return nil
-}

core/llm_token_ratelimit/script/token_encoder/update.lua

@@ -21,7 +21,7 @@ local expiration = tonumber(ARGV[2])
 
 local ttl = redis.call('TTL', key)
 if ttl < 0 then
-    redis.call('SET', key, difference, 'EX', expiration)
+    redis.call('SET', key, difference, 'EX', expiration + 5)
     return {difference, expiration}
 end
 return {tonumber(redis.call('INCRBY', key, difference)), ttl}

core/llm_token_ratelimit/token_encoder.go

@@ -21,7 +21,7 @@ import (
 	"sync"
 
 	"github.com/alibaba/sentinel-golang/logging"
-	"github.com/go-redis/redis/v7"
+	"github.com/go-redis/redis/v8"
 	"github.com/pkoukk/tiktoken-go"
 )
 

example/llm_token_ratelimit/go.mod

@@ -17,14 +17,15 @@ require (
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/cloudwego/base64x v0.1.4 // indirect
 	github.com/cloudwego/iasm v0.2.0 // indirect
+	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/dlclark/regexp2 v1.10.0 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.3 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/go-playground/validator/v10 v10.20.0 // indirect
-	github.com/go-redis/redis/v7 v7.4.1 // indirect
+	github.com/go-redis/redis/v8 v8.11.0 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/uuid v1.6.0 // indirect