From 2cd1a782039a151fa18fde1efb1bd34fcdc98942 Mon Sep 17 00:00:00 2001 From: JustSong Date: Sun, 28 Jan 2024 19:38:58 +0800 Subject: [PATCH] chore: update module name --- common/config/config.go | 2 +- common/database.go | 2 +- common/email.go | 2 +- common/group-ratio.go | 2 +- common/helper/helper.go | 2 +- common/image/image_test.go | 2 +- common/init.go | 4 ++-- common/model-ratio.go | 2 +- common/redis.go | 2 +- common/utils.go | 2 +- controller/billing.go | 6 +++--- controller/channel-billing.go | 10 +++++----- controller/channel-test.go | 12 ++++++------ controller/channel.go | 6 +++--- controller/github.go | 10 +++++----- controller/group.go | 2 +- controller/log.go | 4 ++-- controller/misc.go | 6 +++--- controller/model.go | 2 +- controller/option.go | 6 +++--- controller/redemption.go | 6 +++--- controller/relay.go | 14 +++++++------- controller/token.go | 8 ++++---- controller/user.go | 8 ++++---- controller/wechat.go | 6 +++--- go.mod | 2 +- main.go | 16 ++++++++-------- middleware/auth.go | 4 ++-- middleware/distributor.go | 6 +++--- middleware/logger.go | 2 +- middleware/rate-limit.go | 4 ++-- middleware/recover.go | 2 +- middleware/request-id.go | 4 ++-- middleware/turnstile-check.go | 4 ++-- middleware/utils.go | 4 ++-- model/ability.go | 2 +- model/cache.go | 6 +++--- model/channel.go | 8 ++++---- model/log.go | 8 ++++---- model/main.go | 8 ++++---- model/option.go | 6 +++--- model/redemption.go | 4 ++-- model/token.go | 8 ++++---- model/user.go | 8 ++++---- model/utils.go | 4 ++-- relay/channel/aiproxy/adaptor.go | 2 +- relay/channel/aiproxy/main.go | 10 +++++----- relay/channel/ali/adaptor.go | 2 +- relay/channel/ali/main.go | 8 ++++---- relay/channel/anthropic/adaptor.go | 2 +- relay/channel/anthropic/main.go | 8 ++++---- relay/channel/baidu/adaptor.go | 2 +- relay/channel/baidu/main.go | 10 +++++----- relay/channel/baidu/model.go | 2 +- relay/channel/google/adaptor.go | 2 +- relay/channel/google/gemini.go | 14 +++++++------- relay/channel/google/model.go | 2 +- relay/channel/google/palm.go | 10 +++++----- relay/channel/interface.go | 2 +- relay/channel/openai/main.go | 6 +++--- relay/channel/openai/token.go | 8 ++++---- relay/channel/tencent/adaptor.go | 2 +- relay/channel/tencent/main.go | 10 +++++----- relay/channel/tencent/model.go | 2 +- relay/channel/xunfei/adaptor.go | 2 +- relay/channel/xunfei/main.go | 10 +++++----- relay/channel/xunfei/model.go | 2 +- relay/channel/zhipu/adaptor.go | 2 +- relay/channel/zhipu/main.go | 10 +++++----- relay/channel/zhipu/model.go | 2 +- relay/constant/api_type.go | 2 +- relay/controller/audio.go | 14 +++++++------- relay/controller/helper.go | 14 +++++++------- relay/controller/image.go | 10 +++++----- relay/controller/temp.go | 26 +++++++++++++------------- relay/controller/text.go | 10 +++++----- relay/util/billing.go | 4 ++-- relay/util/common.go | 10 +++++----- relay/util/init.go | 2 +- relay/util/relay_meta.go | 4 ++-- relay/util/validation.go | 4 ++-- router/api-router.go | 4 ++-- router/dashboard.go | 4 ++-- router/main.go | 4 ++-- router/relay-router.go | 4 ++-- router/web-router.go | 8 ++++---- 86 files changed, 247 insertions(+), 247 deletions(-) diff --git a/common/config/config.go b/common/config/config.go index 34d871fe..dd0236b4 100644 --- a/common/config/config.go +++ b/common/config/config.go @@ -1,7 +1,7 @@ package config import ( - "one-api/common/helper" + "github.com/songquanpeng/one-api/common/helper" "os" "strconv" "sync" diff --git a/common/database.go b/common/database.go index 4c2c2717..9b52a0d5 100644 --- a/common/database.go +++ b/common/database.go @@ -1,6 +1,6 @@ package common -import "one-api/common/helper" +import "github.com/songquanpeng/one-api/common/helper" var UsingSQLite = false var UsingPostgreSQL = false diff --git a/common/email.go b/common/email.go index 28719742..2689da6a 100644 --- a/common/email.go +++ b/common/email.go @@ -5,8 +5,8 @@ import ( "crypto/tls" "encoding/base64" "fmt" + "github.com/songquanpeng/one-api/common/config" "net/smtp" - "one-api/common/config" "strings" "time" ) diff --git a/common/group-ratio.go b/common/group-ratio.go index 86e9e1f6..2de6e810 100644 --- a/common/group-ratio.go +++ b/common/group-ratio.go @@ -2,7 +2,7 @@ package common import ( "encoding/json" - "one-api/common/logger" + "github.com/songquanpeng/one-api/common/logger" ) var GroupRatio = map[string]float64{ diff --git a/common/helper/helper.go b/common/helper/helper.go index 09f1df29..12c66d18 100644 --- a/common/helper/helper.go +++ b/common/helper/helper.go @@ -3,11 +3,11 @@ package helper import ( "fmt" "github.com/google/uuid" + "github.com/songquanpeng/one-api/common/logger" "html/template" "log" "math/rand" "net" - "one-api/common/logger" "os" "os/exec" "runtime" diff --git a/common/image/image_test.go b/common/image/image_test.go index 8e47b109..15ed78bc 100644 --- a/common/image/image_test.go +++ b/common/image/image_test.go @@ -12,7 +12,7 @@ import ( "strings" "testing" - img "one-api/common/image" + img "github.com/songquanpeng/one-api/common/image" "github.com/stretchr/testify/assert" _ "golang.org/x/image/webp" diff --git a/common/init.go b/common/init.go index abc71108..b392bfee 100644 --- a/common/init.go +++ b/common/init.go @@ -3,9 +3,9 @@ package common import ( "flag" "fmt" + "github.com/songquanpeng/one-api/common/config" + "github.com/songquanpeng/one-api/common/logger" "log" - "one-api/common/config" - "one-api/common/logger" "os" "path/filepath" ) diff --git a/common/model-ratio.go b/common/model-ratio.go index a6819494..08cde8c7 100644 --- a/common/model-ratio.go +++ b/common/model-ratio.go @@ -2,7 +2,7 @@ package common import ( "encoding/json" - "one-api/common/logger" + "github.com/songquanpeng/one-api/common/logger" "strings" "time" ) diff --git a/common/redis.go b/common/redis.go index ed3fcd9d..f3205567 100644 --- a/common/redis.go +++ b/common/redis.go @@ -3,7 +3,7 @@ package common import ( "context" "github.com/go-redis/redis/v8" - "one-api/common/logger" + "github.com/songquanpeng/one-api/common/logger" "os" "time" ) diff --git a/common/utils.go b/common/utils.go index 41de9367..24615225 100644 --- a/common/utils.go +++ b/common/utils.go @@ -2,7 +2,7 @@ package common import ( "fmt" - "one-api/common/config" + "github.com/songquanpeng/one-api/common/config" ) func LogQuota(quota int) string { diff --git a/controller/billing.go b/controller/billing.go index 1003bf10..c08f2a2d 100644 --- a/controller/billing.go +++ b/controller/billing.go @@ -2,9 +2,9 @@ package controller import ( "github.com/gin-gonic/gin" - "one-api/common/config" - "one-api/model" - "one-api/relay/channel/openai" + "github.com/songquanpeng/one-api/common/config" + "github.com/songquanpeng/one-api/model" + "github.com/songquanpeng/one-api/relay/channel/openai" ) func GetSubscription(c *gin.Context) { diff --git a/controller/channel-billing.go b/controller/channel-billing.go index 49c76760..abeab26a 100644 --- a/controller/channel-billing.go +++ b/controller/channel-billing.go @@ -4,13 +4,13 @@ import ( "encoding/json" "errors" "fmt" + "github.com/songquanpeng/one-api/common" + "github.com/songquanpeng/one-api/common/config" + "github.com/songquanpeng/one-api/common/logger" + "github.com/songquanpeng/one-api/model" + "github.com/songquanpeng/one-api/relay/util" "io" "net/http" - "one-api/common" - "one-api/common/config" - "one-api/common/logger" - "one-api/model" - "one-api/relay/util" "strconv" "time" diff --git a/controller/channel-test.go b/controller/channel-test.go index 88d6e3f2..c8007031 100644 --- a/controller/channel-test.go +++ b/controller/channel-test.go @@ -5,14 +5,14 @@ import ( "encoding/json" "errors" "fmt" + "github.com/songquanpeng/one-api/common" + "github.com/songquanpeng/one-api/common/config" + "github.com/songquanpeng/one-api/common/logger" + "github.com/songquanpeng/one-api/model" + "github.com/songquanpeng/one-api/relay/channel/openai" + "github.com/songquanpeng/one-api/relay/util" "io" "net/http" - "one-api/common" - "one-api/common/config" - "one-api/common/logger" - "one-api/model" - "one-api/relay/channel/openai" - "one-api/relay/util" "strconv" "sync" "time" diff --git a/controller/channel.go b/controller/channel.go index 6d368066..bdfa00d9 100644 --- a/controller/channel.go +++ b/controller/channel.go @@ -2,10 +2,10 @@ package controller import ( "github.com/gin-gonic/gin" + "github.com/songquanpeng/one-api/common/config" + "github.com/songquanpeng/one-api/common/helper" + "github.com/songquanpeng/one-api/model" "net/http" - "one-api/common/config" - "one-api/common/helper" - "one-api/model" "strconv" "strings" ) diff --git a/controller/github.go b/controller/github.go index f6049ddb..7d7fa106 100644 --- a/controller/github.go +++ b/controller/github.go @@ -7,12 +7,12 @@ import ( "fmt" "github.com/gin-contrib/sessions" "github.com/gin-gonic/gin" + "github.com/songquanpeng/one-api/common" + "github.com/songquanpeng/one-api/common/config" + "github.com/songquanpeng/one-api/common/helper" + "github.com/songquanpeng/one-api/common/logger" + "github.com/songquanpeng/one-api/model" "net/http" - "one-api/common" - "one-api/common/config" - "one-api/common/helper" - "one-api/common/logger" - "one-api/model" "strconv" "time" ) diff --git a/controller/group.go b/controller/group.go index 2b2f6006..205b6894 100644 --- a/controller/group.go +++ b/controller/group.go @@ -2,8 +2,8 @@ package controller import ( "github.com/gin-gonic/gin" + "github.com/songquanpeng/one-api/common" "net/http" - "one-api/common" ) func GetGroups(c *gin.Context) { diff --git a/controller/log.go b/controller/log.go index 418c6859..9377b338 100644 --- a/controller/log.go +++ b/controller/log.go @@ -2,9 +2,9 @@ package controller import ( "github.com/gin-gonic/gin" + "github.com/songquanpeng/one-api/common/config" + "github.com/songquanpeng/one-api/model" "net/http" - "one-api/common/config" - "one-api/model" "strconv" ) diff --git a/controller/misc.go b/controller/misc.go index df7c0728..036bdbd1 100644 --- a/controller/misc.go +++ b/controller/misc.go @@ -3,10 +3,10 @@ package controller import ( "encoding/json" "fmt" + "github.com/songquanpeng/one-api/common" + "github.com/songquanpeng/one-api/common/config" + "github.com/songquanpeng/one-api/model" "net/http" - "one-api/common" - "one-api/common/config" - "one-api/model" "strings" "github.com/gin-gonic/gin" diff --git a/controller/model.go b/controller/model.go index 19425466..e3e83fcd 100644 --- a/controller/model.go +++ b/controller/model.go @@ -3,7 +3,7 @@ package controller import ( "fmt" "github.com/gin-gonic/gin" - "one-api/relay/channel/openai" + "github.com/songquanpeng/one-api/relay/channel/openai" ) // https://platform.openai.com/docs/api-reference/models/list diff --git a/controller/option.go b/controller/option.go index 593ac2ae..f86e3a64 100644 --- a/controller/option.go +++ b/controller/option.go @@ -2,10 +2,10 @@ package controller import ( "encoding/json" + "github.com/songquanpeng/one-api/common/config" + "github.com/songquanpeng/one-api/common/helper" + "github.com/songquanpeng/one-api/model" "net/http" - "one-api/common/config" - "one-api/common/helper" - "one-api/model" "strings" "github.com/gin-gonic/gin" diff --git a/controller/redemption.go b/controller/redemption.go index 9eeeb943..31c9348d 100644 --- a/controller/redemption.go +++ b/controller/redemption.go @@ -2,10 +2,10 @@ package controller import ( "github.com/gin-gonic/gin" + "github.com/songquanpeng/one-api/common/config" + "github.com/songquanpeng/one-api/common/helper" + "github.com/songquanpeng/one-api/model" "net/http" - "one-api/common/config" - "one-api/common/helper" - "one-api/model" "strconv" ) diff --git a/controller/relay.go b/controller/relay.go index 3f5b67fc..cfe37984 100644 --- a/controller/relay.go +++ b/controller/relay.go @@ -3,14 +3,14 @@ package controller import ( "fmt" "github.com/gin-gonic/gin" + "github.com/songquanpeng/one-api/common/config" + "github.com/songquanpeng/one-api/common/helper" + "github.com/songquanpeng/one-api/common/logger" + "github.com/songquanpeng/one-api/relay/channel/openai" + "github.com/songquanpeng/one-api/relay/constant" + "github.com/songquanpeng/one-api/relay/controller" + "github.com/songquanpeng/one-api/relay/util" "net/http" - "one-api/common/config" - "one-api/common/helper" - "one-api/common/logger" - "one-api/relay/channel/openai" - "one-api/relay/constant" - "one-api/relay/controller" - "one-api/relay/util" "strconv" ) diff --git a/controller/token.go b/controller/token.go index d6554abe..de0e65eb 100644 --- a/controller/token.go +++ b/controller/token.go @@ -2,11 +2,11 @@ package controller import ( "github.com/gin-gonic/gin" + "github.com/songquanpeng/one-api/common" + "github.com/songquanpeng/one-api/common/config" + "github.com/songquanpeng/one-api/common/helper" + "github.com/songquanpeng/one-api/model" "net/http" - "one-api/common" - "one-api/common/config" - "one-api/common/helper" - "one-api/model" "strconv" ) diff --git a/controller/user.go b/controller/user.go index d13acddd..c11b940e 100644 --- a/controller/user.go +++ b/controller/user.go @@ -3,11 +3,11 @@ package controller import ( "encoding/json" "fmt" + "github.com/songquanpeng/one-api/common" + "github.com/songquanpeng/one-api/common/config" + "github.com/songquanpeng/one-api/common/helper" + "github.com/songquanpeng/one-api/model" "net/http" - "one-api/common" - "one-api/common/config" - "one-api/common/helper" - "one-api/model" "strconv" "time" diff --git a/controller/wechat.go b/controller/wechat.go index fc231a24..74be5604 100644 --- a/controller/wechat.go +++ b/controller/wechat.go @@ -5,10 +5,10 @@ import ( "errors" "fmt" "github.com/gin-gonic/gin" + "github.com/songquanpeng/one-api/common" + "github.com/songquanpeng/one-api/common/config" + "github.com/songquanpeng/one-api/model" "net/http" - "one-api/common" - "one-api/common/config" - "one-api/model" "strconv" "time" ) diff --git a/go.mod b/go.mod index 68dd5eb6..4ab23003 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module one-api +module github.com/songquanpeng/one-api // +heroku goVersion go1.18 go 1.18 diff --git a/main.go b/main.go index b79c7bf7..1f43a45f 100644 --- a/main.go +++ b/main.go @@ -6,14 +6,14 @@ import ( "github.com/gin-contrib/sessions" "github.com/gin-contrib/sessions/cookie" "github.com/gin-gonic/gin" - "one-api/common" - "one-api/common/config" - "one-api/common/logger" - "one-api/controller" - "one-api/middleware" - "one-api/model" - "one-api/relay/channel/openai" - "one-api/router" + "github.com/songquanpeng/one-api/common" + "github.com/songquanpeng/one-api/common/config" + "github.com/songquanpeng/one-api/common/logger" + "github.com/songquanpeng/one-api/controller" + "github.com/songquanpeng/one-api/middleware" + "github.com/songquanpeng/one-api/model" + "github.com/songquanpeng/one-api/relay/channel/openai" + "github.com/songquanpeng/one-api/router" "os" "strconv" ) diff --git a/middleware/auth.go b/middleware/auth.go index ad7e64b7..42a599d0 100644 --- a/middleware/auth.go +++ b/middleware/auth.go @@ -3,9 +3,9 @@ package middleware import ( "github.com/gin-contrib/sessions" "github.com/gin-gonic/gin" + "github.com/songquanpeng/one-api/common" + "github.com/songquanpeng/one-api/model" "net/http" - "one-api/common" - "one-api/model" "strings" ) diff --git a/middleware/distributor.go b/middleware/distributor.go index 6b607d68..0ed250fd 100644 --- a/middleware/distributor.go +++ b/middleware/distributor.go @@ -2,10 +2,10 @@ package middleware import ( "fmt" + "github.com/songquanpeng/one-api/common" + "github.com/songquanpeng/one-api/common/logger" + "github.com/songquanpeng/one-api/model" "net/http" - "one-api/common" - "one-api/common/logger" - "one-api/model" "strconv" "strings" diff --git a/middleware/logger.go b/middleware/logger.go index ca372c52..6aae4f23 100644 --- a/middleware/logger.go +++ b/middleware/logger.go @@ -3,7 +3,7 @@ package middleware import ( "fmt" "github.com/gin-gonic/gin" - "one-api/common/logger" + "github.com/songquanpeng/one-api/common/logger" ) func SetUpLogger(server *gin.Engine) { diff --git a/middleware/rate-limit.go b/middleware/rate-limit.go index e89ef8d6..0f300f2b 100644 --- a/middleware/rate-limit.go +++ b/middleware/rate-limit.go @@ -4,9 +4,9 @@ import ( "context" "fmt" "github.com/gin-gonic/gin" + "github.com/songquanpeng/one-api/common" + "github.com/songquanpeng/one-api/common/config" "net/http" - "one-api/common" - "one-api/common/config" "time" ) diff --git a/middleware/recover.go b/middleware/recover.go index 9d3edc27..02e3e3bb 100644 --- a/middleware/recover.go +++ b/middleware/recover.go @@ -3,8 +3,8 @@ package middleware import ( "fmt" "github.com/gin-gonic/gin" + "github.com/songquanpeng/one-api/common/logger" "net/http" - "one-api/common/logger" "runtime/debug" ) diff --git a/middleware/request-id.go b/middleware/request-id.go index 811a7ad8..7cb66e93 100644 --- a/middleware/request-id.go +++ b/middleware/request-id.go @@ -3,8 +3,8 @@ package middleware import ( "context" "github.com/gin-gonic/gin" - "one-api/common/helper" - "one-api/common/logger" + "github.com/songquanpeng/one-api/common/helper" + "github.com/songquanpeng/one-api/common/logger" ) func RequestId() func(c *gin.Context) { diff --git a/middleware/turnstile-check.go b/middleware/turnstile-check.go index 629395e7..403bcb34 100644 --- a/middleware/turnstile-check.go +++ b/middleware/turnstile-check.go @@ -4,10 +4,10 @@ import ( "encoding/json" "github.com/gin-contrib/sessions" "github.com/gin-gonic/gin" + "github.com/songquanpeng/one-api/common/config" + "github.com/songquanpeng/one-api/common/logger" "net/http" "net/url" - "one-api/common/config" - "one-api/common/logger" ) type turnstileCheckResponse struct { diff --git a/middleware/utils.go b/middleware/utils.go index d866d75b..bc14c367 100644 --- a/middleware/utils.go +++ b/middleware/utils.go @@ -2,8 +2,8 @@ package middleware import ( "github.com/gin-gonic/gin" - "one-api/common/helper" - "one-api/common/logger" + "github.com/songquanpeng/one-api/common/helper" + "github.com/songquanpeng/one-api/common/logger" ) func abortWithMessage(c *gin.Context, statusCode int, message string) { diff --git a/model/ability.go b/model/ability.go index 3da83be8..7127abc3 100644 --- a/model/ability.go +++ b/model/ability.go @@ -1,7 +1,7 @@ package model import ( - "one-api/common" + "github.com/songquanpeng/one-api/common" "strings" ) diff --git a/model/cache.go b/model/cache.go index a81bdddd..297df153 100644 --- a/model/cache.go +++ b/model/cache.go @@ -4,10 +4,10 @@ import ( "encoding/json" "errors" "fmt" + "github.com/songquanpeng/one-api/common" + "github.com/songquanpeng/one-api/common/config" + "github.com/songquanpeng/one-api/common/logger" "math/rand" - "one-api/common" - "one-api/common/config" - "one-api/common/logger" "sort" "strconv" "strings" diff --git a/model/channel.go b/model/channel.go index 966b7c39..0503a620 100644 --- a/model/channel.go +++ b/model/channel.go @@ -3,11 +3,11 @@ package model import ( "encoding/json" "fmt" + "github.com/songquanpeng/one-api/common" + "github.com/songquanpeng/one-api/common/config" + "github.com/songquanpeng/one-api/common/helper" + "github.com/songquanpeng/one-api/common/logger" "gorm.io/gorm" - "one-api/common" - "one-api/common/config" - "one-api/common/helper" - "one-api/common/logger" ) type Channel struct { diff --git a/model/log.go b/model/log.go index 78b6d9b3..9615c237 100644 --- a/model/log.go +++ b/model/log.go @@ -3,10 +3,10 @@ package model import ( "context" "fmt" - "one-api/common" - "one-api/common/config" - "one-api/common/helper" - "one-api/common/logger" + "github.com/songquanpeng/one-api/common" + "github.com/songquanpeng/one-api/common/config" + "github.com/songquanpeng/one-api/common/helper" + "github.com/songquanpeng/one-api/common/logger" "gorm.io/gorm" ) diff --git a/model/main.go b/model/main.go index 2ed6f0e3..18ed01d0 100644 --- a/model/main.go +++ b/model/main.go @@ -2,14 +2,14 @@ package model import ( "fmt" + "github.com/songquanpeng/one-api/common" + "github.com/songquanpeng/one-api/common/config" + "github.com/songquanpeng/one-api/common/helper" + "github.com/songquanpeng/one-api/common/logger" "gorm.io/driver/mysql" "gorm.io/driver/postgres" "gorm.io/driver/sqlite" "gorm.io/gorm" - "one-api/common" - "one-api/common/config" - "one-api/common/helper" - "one-api/common/logger" "os" "strings" "time" diff --git a/model/option.go b/model/option.go index 4b316278..6002c795 100644 --- a/model/option.go +++ b/model/option.go @@ -1,9 +1,9 @@ package model import ( - "one-api/common" - "one-api/common/config" - "one-api/common/logger" + "github.com/songquanpeng/one-api/common" + "github.com/songquanpeng/one-api/common/config" + "github.com/songquanpeng/one-api/common/logger" "strconv" "strings" "time" diff --git a/model/redemption.go b/model/redemption.go index 026794e0..2c5a4141 100644 --- a/model/redemption.go +++ b/model/redemption.go @@ -3,9 +3,9 @@ package model import ( "errors" "fmt" + "github.com/songquanpeng/one-api/common" + "github.com/songquanpeng/one-api/common/helper" "gorm.io/gorm" - "one-api/common" - "one-api/common/helper" ) type Redemption struct { diff --git a/model/token.go b/model/token.go index 2087225b..d0a0648a 100644 --- a/model/token.go +++ b/model/token.go @@ -3,11 +3,11 @@ package model import ( "errors" "fmt" + "github.com/songquanpeng/one-api/common" + "github.com/songquanpeng/one-api/common/config" + "github.com/songquanpeng/one-api/common/helper" + "github.com/songquanpeng/one-api/common/logger" "gorm.io/gorm" - "one-api/common" - "one-api/common/config" - "one-api/common/helper" - "one-api/common/logger" ) type Token struct { diff --git a/model/user.go b/model/user.go index 82e9707b..6979c70b 100644 --- a/model/user.go +++ b/model/user.go @@ -3,11 +3,11 @@ package model import ( "errors" "fmt" + "github.com/songquanpeng/one-api/common" + "github.com/songquanpeng/one-api/common/config" + "github.com/songquanpeng/one-api/common/helper" + "github.com/songquanpeng/one-api/common/logger" "gorm.io/gorm" - "one-api/common" - "one-api/common/config" - "one-api/common/helper" - "one-api/common/logger" "strings" ) diff --git a/model/utils.go b/model/utils.go index e0826e0d..d481973a 100644 --- a/model/utils.go +++ b/model/utils.go @@ -1,8 +1,8 @@ package model import ( - "one-api/common/config" - "one-api/common/logger" + "github.com/songquanpeng/one-api/common/config" + "github.com/songquanpeng/one-api/common/logger" "sync" "time" ) diff --git a/relay/channel/aiproxy/adaptor.go b/relay/channel/aiproxy/adaptor.go index 44b6f58d..7e737e8f 100644 --- a/relay/channel/aiproxy/adaptor.go +++ b/relay/channel/aiproxy/adaptor.go @@ -2,8 +2,8 @@ package aiproxy import ( "github.com/gin-gonic/gin" + "github.com/songquanpeng/one-api/relay/channel/openai" "net/http" - "one-api/relay/channel/openai" ) type Adaptor struct { diff --git a/relay/channel/aiproxy/main.go b/relay/channel/aiproxy/main.go index af9cd6f6..4168ede2 100644 --- a/relay/channel/aiproxy/main.go +++ b/relay/channel/aiproxy/main.go @@ -5,13 +5,13 @@ import ( "encoding/json" "fmt" "github.com/gin-gonic/gin" + "github.com/songquanpeng/one-api/common" + "github.com/songquanpeng/one-api/common/helper" + "github.com/songquanpeng/one-api/common/logger" + "github.com/songquanpeng/one-api/relay/channel/openai" + "github.com/songquanpeng/one-api/relay/constant" "io" "net/http" - "one-api/common" - "one-api/common/helper" - "one-api/common/logger" - "one-api/relay/channel/openai" - "one-api/relay/constant" "strconv" "strings" ) diff --git a/relay/channel/ali/adaptor.go b/relay/channel/ali/adaptor.go index 49022cfc..9470eff0 100644 --- a/relay/channel/ali/adaptor.go +++ b/relay/channel/ali/adaptor.go @@ -2,8 +2,8 @@ package ali import ( "github.com/gin-gonic/gin" + "github.com/songquanpeng/one-api/relay/channel/openai" "net/http" - "one-api/relay/channel/openai" ) type Adaptor struct { diff --git a/relay/channel/ali/main.go b/relay/channel/ali/main.go index 81dc5370..70476d2e 100644 --- a/relay/channel/ali/main.go +++ b/relay/channel/ali/main.go @@ -4,12 +4,12 @@ import ( "bufio" "encoding/json" "github.com/gin-gonic/gin" + "github.com/songquanpeng/one-api/common" + "github.com/songquanpeng/one-api/common/helper" + "github.com/songquanpeng/one-api/common/logger" + "github.com/songquanpeng/one-api/relay/channel/openai" "io" "net/http" - "one-api/common" - "one-api/common/helper" - "one-api/common/logger" - "one-api/relay/channel/openai" "strings" ) diff --git a/relay/channel/anthropic/adaptor.go b/relay/channel/anthropic/adaptor.go index 55577228..ee02fab5 100644 --- a/relay/channel/anthropic/adaptor.go +++ b/relay/channel/anthropic/adaptor.go @@ -2,8 +2,8 @@ package anthropic import ( "github.com/gin-gonic/gin" + "github.com/songquanpeng/one-api/relay/channel/openai" "net/http" - "one-api/relay/channel/openai" ) type Adaptor struct { diff --git a/relay/channel/anthropic/main.go b/relay/channel/anthropic/main.go index 060fcde8..c1e39494 100644 --- a/relay/channel/anthropic/main.go +++ b/relay/channel/anthropic/main.go @@ -5,12 +5,12 @@ import ( "encoding/json" "fmt" "github.com/gin-gonic/gin" + "github.com/songquanpeng/one-api/common" + "github.com/songquanpeng/one-api/common/helper" + "github.com/songquanpeng/one-api/common/logger" + "github.com/songquanpeng/one-api/relay/channel/openai" "io" "net/http" - "one-api/common" - "one-api/common/helper" - "one-api/common/logger" - "one-api/relay/channel/openai" "strings" ) diff --git a/relay/channel/baidu/adaptor.go b/relay/channel/baidu/adaptor.go index 498b664a..c6304a74 100644 --- a/relay/channel/baidu/adaptor.go +++ b/relay/channel/baidu/adaptor.go @@ -2,8 +2,8 @@ package baidu import ( "github.com/gin-gonic/gin" + "github.com/songquanpeng/one-api/relay/channel/openai" "net/http" - "one-api/relay/channel/openai" ) type Adaptor struct { diff --git a/relay/channel/baidu/main.go b/relay/channel/baidu/main.go index f5b98155..00391602 100644 --- a/relay/channel/baidu/main.go +++ b/relay/channel/baidu/main.go @@ -6,13 +6,13 @@ import ( "errors" "fmt" "github.com/gin-gonic/gin" + "github.com/songquanpeng/one-api/common" + "github.com/songquanpeng/one-api/common/logger" + "github.com/songquanpeng/one-api/relay/channel/openai" + "github.com/songquanpeng/one-api/relay/constant" + "github.com/songquanpeng/one-api/relay/util" "io" "net/http" - "one-api/common" - "one-api/common/logger" - "one-api/relay/channel/openai" - "one-api/relay/constant" - "one-api/relay/util" "strings" "sync" "time" diff --git a/relay/channel/baidu/model.go b/relay/channel/baidu/model.go index e182f5dd..524418e1 100644 --- a/relay/channel/baidu/model.go +++ b/relay/channel/baidu/model.go @@ -1,7 +1,7 @@ package baidu import ( - "one-api/relay/channel/openai" + "github.com/songquanpeng/one-api/relay/channel/openai" "time" ) diff --git a/relay/channel/google/adaptor.go b/relay/channel/google/adaptor.go index b328db32..ad45bc48 100644 --- a/relay/channel/google/adaptor.go +++ b/relay/channel/google/adaptor.go @@ -2,8 +2,8 @@ package google import ( "github.com/gin-gonic/gin" + "github.com/songquanpeng/one-api/relay/channel/openai" "net/http" - "one-api/relay/channel/openai" ) type Adaptor struct { diff --git a/relay/channel/google/gemini.go b/relay/channel/google/gemini.go index 3adc3fdd..13e6a4e8 100644 --- a/relay/channel/google/gemini.go +++ b/relay/channel/google/gemini.go @@ -4,15 +4,15 @@ import ( "bufio" "encoding/json" "fmt" + "github.com/songquanpeng/one-api/common" + "github.com/songquanpeng/one-api/common/config" + "github.com/songquanpeng/one-api/common/helper" + "github.com/songquanpeng/one-api/common/image" + "github.com/songquanpeng/one-api/common/logger" + "github.com/songquanpeng/one-api/relay/channel/openai" + "github.com/songquanpeng/one-api/relay/constant" "io" "net/http" - "one-api/common" - "one-api/common/config" - "one-api/common/helper" - "one-api/common/image" - "one-api/common/logger" - "one-api/relay/channel/openai" - "one-api/relay/constant" "strings" "github.com/gin-gonic/gin" diff --git a/relay/channel/google/model.go b/relay/channel/google/model.go index 694c2dd1..e69a9445 100644 --- a/relay/channel/google/model.go +++ b/relay/channel/google/model.go @@ -1,7 +1,7 @@ package google import ( - "one-api/relay/channel/openai" + "github.com/songquanpeng/one-api/relay/channel/openai" ) type GeminiChatRequest struct { diff --git a/relay/channel/google/palm.go b/relay/channel/google/palm.go index 3c86a432..7b9ee600 100644 --- a/relay/channel/google/palm.go +++ b/relay/channel/google/palm.go @@ -4,13 +4,13 @@ import ( "encoding/json" "fmt" "github.com/gin-gonic/gin" + "github.com/songquanpeng/one-api/common" + "github.com/songquanpeng/one-api/common/helper" + "github.com/songquanpeng/one-api/common/logger" + "github.com/songquanpeng/one-api/relay/channel/openai" + "github.com/songquanpeng/one-api/relay/constant" "io" "net/http" - "one-api/common" - "one-api/common/helper" - "one-api/common/logger" - "one-api/relay/channel/openai" - "one-api/relay/constant" ) // https://developers.generativeai.google/api/rest/generativelanguage/models/generateMessage#request-body diff --git a/relay/channel/interface.go b/relay/channel/interface.go index 7a0fcbd3..2a28abb8 100644 --- a/relay/channel/interface.go +++ b/relay/channel/interface.go @@ -2,8 +2,8 @@ package channel import ( "github.com/gin-gonic/gin" + "github.com/songquanpeng/one-api/relay/channel/openai" "net/http" - "one-api/relay/channel/openai" ) type Adaptor interface { diff --git a/relay/channel/openai/main.go b/relay/channel/openai/main.go index 5f464249..f56028a2 100644 --- a/relay/channel/openai/main.go +++ b/relay/channel/openai/main.go @@ -5,11 +5,11 @@ import ( "bytes" "encoding/json" "github.com/gin-gonic/gin" + "github.com/songquanpeng/one-api/common" + "github.com/songquanpeng/one-api/common/logger" + "github.com/songquanpeng/one-api/relay/constant" "io" "net/http" - "one-api/common" - "one-api/common/logger" - "one-api/relay/constant" "strings" ) diff --git a/relay/channel/openai/token.go b/relay/channel/openai/token.go index 6803770e..5a05570d 100644 --- a/relay/channel/openai/token.go +++ b/relay/channel/openai/token.go @@ -4,11 +4,11 @@ import ( "errors" "fmt" "github.com/pkoukk/tiktoken-go" + "github.com/songquanpeng/one-api/common" + "github.com/songquanpeng/one-api/common/config" + "github.com/songquanpeng/one-api/common/image" + "github.com/songquanpeng/one-api/common/logger" "math" - "one-api/common" - "one-api/common/config" - "one-api/common/image" - "one-api/common/logger" "strings" ) diff --git a/relay/channel/tencent/adaptor.go b/relay/channel/tencent/adaptor.go index e9f86aff..c90509ca 100644 --- a/relay/channel/tencent/adaptor.go +++ b/relay/channel/tencent/adaptor.go @@ -2,8 +2,8 @@ package tencent import ( "github.com/gin-gonic/gin" + "github.com/songquanpeng/one-api/relay/channel/openai" "net/http" - "one-api/relay/channel/openai" ) type Adaptor struct { diff --git a/relay/channel/tencent/main.go b/relay/channel/tencent/main.go index 64091d62..bca815b6 100644 --- a/relay/channel/tencent/main.go +++ b/relay/channel/tencent/main.go @@ -9,13 +9,13 @@ import ( "errors" "fmt" "github.com/gin-gonic/gin" + "github.com/songquanpeng/one-api/common" + "github.com/songquanpeng/one-api/common/helper" + "github.com/songquanpeng/one-api/common/logger" + "github.com/songquanpeng/one-api/relay/channel/openai" + "github.com/songquanpeng/one-api/relay/constant" "io" "net/http" - "one-api/common" - "one-api/common/helper" - "one-api/common/logger" - "one-api/relay/channel/openai" - "one-api/relay/constant" "sort" "strconv" "strings" diff --git a/relay/channel/tencent/model.go b/relay/channel/tencent/model.go index 511f3d97..b8aa7698 100644 --- a/relay/channel/tencent/model.go +++ b/relay/channel/tencent/model.go @@ -1,7 +1,7 @@ package tencent import ( - "one-api/relay/channel/openai" + "github.com/songquanpeng/one-api/relay/channel/openai" ) type Message struct { diff --git a/relay/channel/xunfei/adaptor.go b/relay/channel/xunfei/adaptor.go index 89e58485..d2c80c64 100644 --- a/relay/channel/xunfei/adaptor.go +++ b/relay/channel/xunfei/adaptor.go @@ -2,8 +2,8 @@ package xunfei import ( "github.com/gin-gonic/gin" + "github.com/songquanpeng/one-api/relay/channel/openai" "net/http" - "one-api/relay/channel/openai" ) type Adaptor struct { diff --git a/relay/channel/xunfei/main.go b/relay/channel/xunfei/main.go index 906d2844..ff5cdbea 100644 --- a/relay/channel/xunfei/main.go +++ b/relay/channel/xunfei/main.go @@ -8,14 +8,14 @@ import ( "fmt" "github.com/gin-gonic/gin" "github.com/gorilla/websocket" + "github.com/songquanpeng/one-api/common" + "github.com/songquanpeng/one-api/common/helper" + "github.com/songquanpeng/one-api/common/logger" + "github.com/songquanpeng/one-api/relay/channel/openai" + "github.com/songquanpeng/one-api/relay/constant" "io" "net/http" "net/url" - "one-api/common" - "one-api/common/helper" - "one-api/common/logger" - "one-api/relay/channel/openai" - "one-api/relay/constant" "strings" "time" ) diff --git a/relay/channel/xunfei/model.go b/relay/channel/xunfei/model.go index 0ca42818..e015d164 100644 --- a/relay/channel/xunfei/model.go +++ b/relay/channel/xunfei/model.go @@ -1,7 +1,7 @@ package xunfei import ( - "one-api/relay/channel/openai" + "github.com/songquanpeng/one-api/relay/channel/openai" ) type Message struct { diff --git a/relay/channel/zhipu/adaptor.go b/relay/channel/zhipu/adaptor.go index 6d901bc3..ae0f6faa 100644 --- a/relay/channel/zhipu/adaptor.go +++ b/relay/channel/zhipu/adaptor.go @@ -2,8 +2,8 @@ package zhipu import ( "github.com/gin-gonic/gin" + "github.com/songquanpeng/one-api/relay/channel/openai" "net/http" - "one-api/relay/channel/openai" ) type Adaptor struct { diff --git a/relay/channel/zhipu/main.go b/relay/channel/zhipu/main.go index d831f57a..fe7b7b4b 100644 --- a/relay/channel/zhipu/main.go +++ b/relay/channel/zhipu/main.go @@ -5,13 +5,13 @@ import ( "encoding/json" "github.com/gin-gonic/gin" "github.com/golang-jwt/jwt" + "github.com/songquanpeng/one-api/common" + "github.com/songquanpeng/one-api/common/helper" + "github.com/songquanpeng/one-api/common/logger" + "github.com/songquanpeng/one-api/relay/channel/openai" + "github.com/songquanpeng/one-api/relay/constant" "io" "net/http" - "one-api/common" - "one-api/common/helper" - "one-api/common/logger" - "one-api/relay/channel/openai" - "one-api/relay/constant" "strings" "sync" "time" diff --git a/relay/channel/zhipu/model.go b/relay/channel/zhipu/model.go index 08a5ec5f..67f1caeb 100644 --- a/relay/channel/zhipu/model.go +++ b/relay/channel/zhipu/model.go @@ -1,7 +1,7 @@ package zhipu import ( - "one-api/relay/channel/openai" + "github.com/songquanpeng/one-api/relay/channel/openai" "time" ) diff --git a/relay/constant/api_type.go b/relay/constant/api_type.go index 658bfb90..e0458279 100644 --- a/relay/constant/api_type.go +++ b/relay/constant/api_type.go @@ -1,7 +1,7 @@ package constant import ( - "one-api/common" + "github.com/songquanpeng/one-api/common" ) const ( diff --git a/relay/controller/audio.go b/relay/controller/audio.go index 822d7e39..cbbd8a04 100644 --- a/relay/controller/audio.go +++ b/relay/controller/audio.go @@ -8,15 +8,15 @@ import ( "errors" "fmt" "github.com/gin-gonic/gin" + "github.com/songquanpeng/one-api/common" + "github.com/songquanpeng/one-api/common/config" + "github.com/songquanpeng/one-api/common/logger" + "github.com/songquanpeng/one-api/model" + "github.com/songquanpeng/one-api/relay/channel/openai" + "github.com/songquanpeng/one-api/relay/constant" + "github.com/songquanpeng/one-api/relay/util" "io" "net/http" - "one-api/common" - "one-api/common/config" - "one-api/common/logger" - "one-api/model" - "one-api/relay/channel/openai" - "one-api/relay/constant" - "one-api/relay/util" "strings" ) diff --git a/relay/controller/helper.go b/relay/controller/helper.go index 46e57969..6154f291 100644 --- a/relay/controller/helper.go +++ b/relay/controller/helper.go @@ -5,16 +5,16 @@ import ( "errors" "fmt" "github.com/gin-gonic/gin" + "github.com/songquanpeng/one-api/common" + "github.com/songquanpeng/one-api/common/config" + "github.com/songquanpeng/one-api/common/logger" + "github.com/songquanpeng/one-api/model" + "github.com/songquanpeng/one-api/relay/channel/openai" + "github.com/songquanpeng/one-api/relay/constant" + "github.com/songquanpeng/one-api/relay/util" "io" "math" "net/http" - "one-api/common" - "one-api/common/config" - "one-api/common/logger" - "one-api/model" - "one-api/relay/channel/openai" - "one-api/relay/constant" - "one-api/relay/util" ) func getAndValidateTextRequest(c *gin.Context, relayMode int) (*openai.GeneralOpenAIRequest, error) { diff --git a/relay/controller/image.go b/relay/controller/image.go index 9502a4d7..e5c70080 100644 --- a/relay/controller/image.go +++ b/relay/controller/image.go @@ -6,13 +6,13 @@ import ( "encoding/json" "errors" "fmt" + "github.com/songquanpeng/one-api/common" + "github.com/songquanpeng/one-api/common/logger" + "github.com/songquanpeng/one-api/model" + "github.com/songquanpeng/one-api/relay/channel/openai" + "github.com/songquanpeng/one-api/relay/util" "io" "net/http" - "one-api/common" - "one-api/common/logger" - "one-api/model" - "one-api/relay/channel/openai" - "one-api/relay/util" "strings" "github.com/gin-gonic/gin" diff --git a/relay/controller/temp.go b/relay/controller/temp.go index 7161cfb9..6339bdab 100644 --- a/relay/controller/temp.go +++ b/relay/controller/temp.go @@ -6,21 +6,21 @@ import ( "errors" "fmt" "github.com/gin-gonic/gin" + "github.com/songquanpeng/one-api/common" + "github.com/songquanpeng/one-api/common/helper" + "github.com/songquanpeng/one-api/relay/channel/aiproxy" + "github.com/songquanpeng/one-api/relay/channel/ali" + "github.com/songquanpeng/one-api/relay/channel/anthropic" + "github.com/songquanpeng/one-api/relay/channel/baidu" + "github.com/songquanpeng/one-api/relay/channel/google" + "github.com/songquanpeng/one-api/relay/channel/openai" + "github.com/songquanpeng/one-api/relay/channel/tencent" + "github.com/songquanpeng/one-api/relay/channel/xunfei" + "github.com/songquanpeng/one-api/relay/channel/zhipu" + "github.com/songquanpeng/one-api/relay/constant" + "github.com/songquanpeng/one-api/relay/util" "io" "net/http" - "one-api/common" - "one-api/common/helper" - "one-api/relay/channel/aiproxy" - "one-api/relay/channel/ali" - "one-api/relay/channel/anthropic" - "one-api/relay/channel/baidu" - "one-api/relay/channel/google" - "one-api/relay/channel/openai" - "one-api/relay/channel/tencent" - "one-api/relay/channel/xunfei" - "one-api/relay/channel/zhipu" - "one-api/relay/constant" - "one-api/relay/util" "strings" ) diff --git a/relay/controller/text.go b/relay/controller/text.go index 335d53be..0445aa90 100644 --- a/relay/controller/text.go +++ b/relay/controller/text.go @@ -3,12 +3,12 @@ package controller import ( "fmt" "github.com/gin-gonic/gin" + "github.com/songquanpeng/one-api/common" + "github.com/songquanpeng/one-api/common/logger" + "github.com/songquanpeng/one-api/relay/channel/openai" + "github.com/songquanpeng/one-api/relay/constant" + "github.com/songquanpeng/one-api/relay/util" "net/http" - "one-api/common" - "one-api/common/logger" - "one-api/relay/channel/openai" - "one-api/relay/constant" - "one-api/relay/util" "strings" ) diff --git a/relay/util/billing.go b/relay/util/billing.go index 35fb28a4..1e2b09ea 100644 --- a/relay/util/billing.go +++ b/relay/util/billing.go @@ -2,8 +2,8 @@ package util import ( "context" - "one-api/common/logger" - "one-api/model" + "github.com/songquanpeng/one-api/common/logger" + "github.com/songquanpeng/one-api/model" ) func ReturnPreConsumedQuota(ctx context.Context, preConsumedQuota int, tokenId int) { diff --git a/relay/util/common.go b/relay/util/common.go index be31857b..3a28b09e 100644 --- a/relay/util/common.go +++ b/relay/util/common.go @@ -4,13 +4,13 @@ import ( "context" "encoding/json" "fmt" + "github.com/songquanpeng/one-api/common" + "github.com/songquanpeng/one-api/common/config" + "github.com/songquanpeng/one-api/common/logger" + "github.com/songquanpeng/one-api/model" + "github.com/songquanpeng/one-api/relay/channel/openai" "io" "net/http" - "one-api/common" - "one-api/common/config" - "one-api/common/logger" - "one-api/model" - "one-api/relay/channel/openai" "strconv" "strings" diff --git a/relay/util/init.go b/relay/util/init.go index 62d44d15..03dad31b 100644 --- a/relay/util/init.go +++ b/relay/util/init.go @@ -1,8 +1,8 @@ package util import ( + "github.com/songquanpeng/one-api/common/config" "net/http" - "one-api/common/config" "time" ) diff --git a/relay/util/relay_meta.go b/relay/util/relay_meta.go index bea5a406..27757dcf 100644 --- a/relay/util/relay_meta.go +++ b/relay/util/relay_meta.go @@ -2,8 +2,8 @@ package util import ( "github.com/gin-gonic/gin" - "one-api/common" - "one-api/relay/constant" + "github.com/songquanpeng/one-api/common" + "github.com/songquanpeng/one-api/relay/constant" "strings" ) diff --git a/relay/util/validation.go b/relay/util/validation.go index 48b42d94..8848af8e 100644 --- a/relay/util/validation.go +++ b/relay/util/validation.go @@ -2,9 +2,9 @@ package util import ( "errors" + "github.com/songquanpeng/one-api/relay/channel/openai" + "github.com/songquanpeng/one-api/relay/constant" "math" - "one-api/relay/channel/openai" - "one-api/relay/constant" ) func ValidateTextRequest(textRequest *openai.GeneralOpenAIRequest, relayMode int) error { diff --git a/router/api-router.go b/router/api-router.go index 162675ce..6d143da7 100644 --- a/router/api-router.go +++ b/router/api-router.go @@ -1,8 +1,8 @@ package router import ( - "one-api/controller" - "one-api/middleware" + "github.com/songquanpeng/one-api/controller" + "github.com/songquanpeng/one-api/middleware" "github.com/gin-contrib/gzip" "github.com/gin-gonic/gin" diff --git a/router/dashboard.go b/router/dashboard.go index 39ed1f93..0b539d44 100644 --- a/router/dashboard.go +++ b/router/dashboard.go @@ -3,8 +3,8 @@ package router import ( "github.com/gin-contrib/gzip" "github.com/gin-gonic/gin" - "one-api/controller" - "one-api/middleware" + "github.com/songquanpeng/one-api/controller" + "github.com/songquanpeng/one-api/middleware" ) func SetDashboardRouter(router *gin.Engine) { diff --git a/router/main.go b/router/main.go index 6504b312..39d8c04f 100644 --- a/router/main.go +++ b/router/main.go @@ -4,9 +4,9 @@ import ( "embed" "fmt" "github.com/gin-gonic/gin" + "github.com/songquanpeng/one-api/common/config" + "github.com/songquanpeng/one-api/common/logger" "net/http" - "one-api/common/config" - "one-api/common/logger" "os" "strings" ) diff --git a/router/relay-router.go b/router/relay-router.go index 56ab9b28..65072c86 100644 --- a/router/relay-router.go +++ b/router/relay-router.go @@ -1,8 +1,8 @@ package router import ( - "one-api/controller" - "one-api/middleware" + "github.com/songquanpeng/one-api/controller" + "github.com/songquanpeng/one-api/middleware" "github.com/gin-gonic/gin" ) diff --git a/router/web-router.go b/router/web-router.go index 95d8fcb9..3c9b4643 100644 --- a/router/web-router.go +++ b/router/web-router.go @@ -6,11 +6,11 @@ import ( "github.com/gin-contrib/gzip" "github.com/gin-contrib/static" "github.com/gin-gonic/gin" + "github.com/songquanpeng/one-api/common" + "github.com/songquanpeng/one-api/common/config" + "github.com/songquanpeng/one-api/controller" + "github.com/songquanpeng/one-api/middleware" "net/http" - "one-api/common" - "one-api/common/config" - "one-api/controller" - "one-api/middleware" "strings" )