Merge branch 'main' into patch/images-edits

common/ctxkey/config.go

@@ -1,13 +0,0 @@
-package ctxkey
-
-const (
-	ConfigPrefix = "cfg_"
-
-	ConfigAPIVersion = ConfigPrefix + "api_version"
-	ConfigLibraryID  = ConfigPrefix + "library_id"
-	ConfigPlugin     = ConfigPrefix + "plugin"
-	ConfigSK         = ConfigPrefix + "sk"
-	ConfigAK         = ConfigPrefix + "ak"
-	ConfigRegion     = ConfigPrefix + "region"
-	ConfigUserID     = ConfigPrefix + "user_id"
-)

common/ctxkey/key.go

@@ -1,6 +1,7 @@
 package ctxkey
 
 const (
+	Config            = "config"
 	Id                = "id"
 	RequestId         = "X-Oneapi-Request-Id"
 	Username          = "username"

common/helper/helper.go

@@ -2,6 +2,7 @@ package helper
 
 import (
 	"fmt"
+	"github.com/gin-gonic/gin"
 	"github.com/songquanpeng/one-api/common/random"
 	"html/template"
 	"log"
@@ -105,6 +106,11 @@ func GenRequestID() string {
 	return GetTimeString() + random.GetRandomNumberString(8)
 }
 
+func GetResponseID(c *gin.Context) string {
+	logID := c.GetString(RequestIdKey)
+	return fmt.Sprintf("chatcmpl-%s", logID)
+}
+
 func Max(a int, b int) int {
 	if a >= b {
 		return a

common/helper/key.go

@@ -0,0 +1,5 @@
+package helper
+
+const (
+	RequestIdKey = "X-Oneapi-Request-Id"
+)

common/logger/logger.go

@@ -88,7 +88,7 @@ func logHelper(ctx context.Context, level string, msg string) {
 	if level == loggerINFO {
 		writer = gin.DefaultWriter
 	}
-	id := ctx.Value(ctxkey.RequestId)
+	id := ctx.Value(helper.RequestIdKey)
 	if id == nil {
 		id = helper.GenRequestID()
 	}