Merge commit '2369025842b828ac38f4427fd1ebab8d03b1fe7f'

common/config/config.go

@@ -10,7 +10,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/songquanpeng/one-api/common/env"
+	"github.com/Laisky/one-api/common/env"
 )
 
 func init() {

common/config/key.go

@@ -6,4 +6,7 @@ const (
 	KeyAPIVersion = KeyPrefix + "api_version"
 	KeyLibraryID  = KeyPrefix + "library_id"
 	KeyPlugin     = KeyPrefix + "plugin"
+	KeySK         = KeyPrefix + "sk"
+	KeyAK         = KeyPrefix + "ak"
+	KeyRegion     = KeyPrefix + "region"
 )

common/ctxkey/key.go

@@ -0,0 +1,7 @@
+package ctxkey
+
+var (
+	RequestModel     = "request_model"
+	ConvertedRequest = "converted_request"
+	OriginalModel    = "original_model"
+)

common/database.go

@@ -1,7 +1,7 @@
 package common
 
 import (
-	"github.com/songquanpeng/one-api/common/env"
+	"github.com/Laisky/one-api/common/env"
 )
 
 var UsingSQLite = false

common/helper/helper.go

@@ -10,7 +10,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/songquanpeng/one-api/common/random"
+	"github.com/Laisky/one-api/common/random"
 )
 
 func OpenBrowser(url string) {

common/image/image_test.go

@@ -12,7 +12,7 @@ import (
 	"strings"
 	"testing"
 
-	img "github.com/songquanpeng/one-api/common/image"
+	img "github.com/Laisky/one-api/common/image"
 
 	"github.com/stretchr/testify/assert"
 	_ "golang.org/x/image/webp"

common/init.go

@@ -3,8 +3,8 @@ package common
 import (
 	"flag"
 	"fmt"
-	"github.com/songquanpeng/one-api/common/config"
-	"github.com/songquanpeng/one-api/common/logger"
+	"github.com/Laisky/one-api/common/config"
+	"github.com/Laisky/one-api/common/logger"
 	"log"
 	"os"
 	"path/filepath"
@@ -20,7 +20,7 @@ var (
 func printHelp() {
 	fmt.Println("One API " + Version + " - All in one API service for OpenAI API.")
 	fmt.Println("Copyright (C) 2023 JustSong. All rights reserved.")
-	fmt.Println("GitHub: https://github.com/songquanpeng/one-api")
+	fmt.Println("GitHub: https://github.com/Laisky/one-api")
 	fmt.Println("Usage: one-api [--port <port>] [--log-dir <log directory>] [--version] [--help]")
 }
 

common/logger/logger.go

@@ -3,9 +3,9 @@ package logger
 import (
 	"context"
 	"fmt"
+	"github.com/Laisky/one-api/common/config"
+	"github.com/Laisky/one-api/common/helper"
 	"github.com/gin-gonic/gin"
-	"github.com/songquanpeng/one-api/common/config"
-	"github.com/songquanpeng/one-api/common/helper"
 	"io"
 	"log"
 	"os"

common/message/email.go

@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/Laisky/errors/v2"
-	"github.com/songquanpeng/one-api/common/config"
+	"github.com/Laisky/one-api/common/config"
 )
 
 func SendEmail(subject string, receiver string, content string) error {

common/message/main.go

@@ -2,7 +2,7 @@ package message
 
 import (
 	"github.com/Laisky/errors/v2"
-	"github.com/songquanpeng/one-api/common/config"
+	"github.com/Laisky/one-api/common/config"
 )
 
 const (

common/message/message-pusher.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"github.com/Laisky/errors/v2"
-	"github.com/songquanpeng/one-api/common/config"
+	"github.com/Laisky/one-api/common/config"
 	"net/http"
 )
 

common/network/ip.go

@@ -3,7 +3,7 @@ package network
 import (
 	"context"
 	"fmt"
-	"github.com/songquanpeng/one-api/common/logger"
+	"github.com/Laisky/one-api/common/logger"
 	"net"
 	"strings"
 )

common/redis.go

@@ -2,8 +2,8 @@ package common
 
 import (
 	"context"
+	"github.com/Laisky/one-api/common/logger"
 	"github.com/go-redis/redis/v8"
-	"github.com/songquanpeng/one-api/common/logger"
 	"os"
 	"time"
 )

common/utils.go

@@ -2,7 +2,7 @@ package common
 
 import (
 	"fmt"
-	"github.com/songquanpeng/one-api/common/config"
+	"github.com/Laisky/one-api/common/config"
 )
 
 func LogQuota(quota int64) string {