chore: reorganize constant related package

2025-12-28 02:35:56 +08:00 · 2024-04-06 00:44:33 +08:00
parent 880e12c855
commit f9d914873f
30 changed files with 269 additions and 257 deletions
--- a/relay/channel/ali/adaptor.go
+++ b/relay/channel/ali/adaptor.go
@@ -6,8 +6,8 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/songquanpeng/one-api/common"
 	"github.com/songquanpeng/one-api/relay/channel"
-	"github.com/songquanpeng/one-api/relay/constant"
 	"github.com/songquanpeng/one-api/relay/model"
+	"github.com/songquanpeng/one-api/relay/relaymode"
 	"github.com/songquanpeng/one-api/relay/util"
 	"io"
 	"net/http"
@@ -25,9 +25,9 @@ func (a *Adaptor) Init(meta *util.RelayMeta) {
 func (a *Adaptor) GetRequestURL(meta *util.RelayMeta) (string, error) {
 	fullRequestURL := ""
 	switch meta.Mode {
-	case constant.RelayModeEmbeddings:
+	case relaymode.Embeddings:
 		fullRequestURL = fmt.Sprintf("%s/api/v1/services/embeddings/text-embedding/text-embedding", meta.BaseURL)
-	case constant.RelayModeImagesGenerations:
+	case relaymode.ImagesGenerations:
 		fullRequestURL = fmt.Sprintf("%s/api/v1/services/aigc/text2image/image-synthesis", meta.BaseURL)
 	default:
 		fullRequestURL = fmt.Sprintf("%s/api/v1/services/aigc/text-generation/generation", meta.BaseURL)
@@ -44,7 +44,7 @@ func (a *Adaptor) SetupRequestHeader(c *gin.Context, req *http.Request, meta *ut
 	}
 	req.Header.Set("Authorization", "Bearer "+meta.APIKey)

-	if meta.Mode == constant.RelayModeImagesGenerations {
+	if meta.Mode == relaymode.ImagesGenerations {
 		req.Header.Set("X-DashScope-Async", "enable")
 	}
 	if c.GetString(common.ConfigKeyPlugin) != "" {
@@ -58,7 +58,7 @@ func (a *Adaptor) ConvertRequest(c *gin.Context, relayMode int, request *model.G
 		return nil, errors.New("request is nil")
 	}
 	switch relayMode {
-	case constant.RelayModeEmbeddings:
+	case relaymode.Embeddings:
 		aliEmbeddingRequest := ConvertEmbeddingRequest(*request)
 		return aliEmbeddingRequest, nil
 	default:
@@ -85,9 +85,9 @@ func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, meta *util.Rel
 		err, usage = StreamHandler(c, resp)
 	} else {
 		switch meta.Mode {
-		case constant.RelayModeEmbeddings:
+		case relaymode.Embeddings:
 			err, usage = EmbeddingHandler(c, resp)
-		case constant.RelayModeImagesGenerations:
+		case relaymode.ImagesGenerations:
 			err, usage = ImageHandler(c, resp)
 		default:
 			err, usage = Handler(c, resp)
--- a/relay/channel/baidu/adaptor.go
+++ b/relay/channel/baidu/adaptor.go
@@ -3,13 +3,13 @@ package baidu
 import (
 	"errors"
 	"fmt"
+	"github.com/songquanpeng/one-api/relay/relaymode"
 	"io"
 	"net/http"
 	"strings"

 	"github.com/gin-gonic/gin"
 	"github.com/songquanpeng/one-api/relay/channel"
-	"github.com/songquanpeng/one-api/relay/constant"
 	"github.com/songquanpeng/one-api/relay/model"
 	"github.com/songquanpeng/one-api/relay/util"
 )
@@ -100,7 +100,7 @@ func (a *Adaptor) ConvertRequest(c *gin.Context, relayMode int, request *model.G
 		return nil, errors.New("request is nil")
 	}
 	switch relayMode {
-	case constant.RelayModeEmbeddings:
+	case relaymode.Embeddings:
 		baiduEmbeddingRequest := ConvertEmbeddingRequest(*request)
 		return baiduEmbeddingRequest, nil
 	default:
@@ -125,7 +125,7 @@ func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, meta *util.Rel
 		err, usage = StreamHandler(c, resp)
 	} else {
 		switch meta.Mode {
-		case constant.RelayModeEmbeddings:
+		case relaymode.Embeddings:
 			err, usage = EmbeddingHandler(c, resp)
 		default:
 			err, usage = Handler(c, resp)
--- a/relay/channel/minimax/main.go
+++ b/relay/channel/minimax/main.go
@@ -2,13 +2,13 @@ package minimax

 import (
 	"fmt"
-	"github.com/songquanpeng/one-api/relay/constant"
+	"github.com/songquanpeng/one-api/relay/relaymode"
 	"github.com/songquanpeng/one-api/relay/util"
 )

 func GetRequestURL(meta *util.RelayMeta) (string, error) {
-	if meta.Mode == constant.RelayModeChatCompletions {
+	if meta.Mode == relaymode.ChatCompletions {
 		return fmt.Sprintf("%s/v1/text/chatcompletion_v2", meta.BaseURL), nil
 	}
-	return "", fmt.Errorf("unsupported relay mode %d for minimax", meta.Mode)
+	return "", fmt.Errorf("unsupported relay relaymode %d for minimax", meta.Mode)
 }
--- a/relay/channel/ollama/adaptor.go
+++ b/relay/channel/ollama/adaptor.go
@@ -3,12 +3,12 @@ package ollama
 import (
 	"errors"
 	"fmt"
+	"github.com/songquanpeng/one-api/relay/relaymode"
 	"io"
 	"net/http"

 	"github.com/gin-gonic/gin"
 	"github.com/songquanpeng/one-api/relay/channel"
-	"github.com/songquanpeng/one-api/relay/constant"
 	"github.com/songquanpeng/one-api/relay/model"
 	"github.com/songquanpeng/one-api/relay/util"
 )
@@ -23,7 +23,7 @@ func (a *Adaptor) Init(meta *util.RelayMeta) {
 func (a *Adaptor) GetRequestURL(meta *util.RelayMeta) (string, error) {
 	// https://github.com/ollama/ollama/blob/main/docs/api.md
 	fullRequestURL := fmt.Sprintf("%s/api/chat", meta.BaseURL)
-	if meta.Mode == constant.RelayModeEmbeddings {
+	if meta.Mode == relaymode.Embeddings {
 		fullRequestURL = fmt.Sprintf("%s/api/embeddings", meta.BaseURL)
 	}
 	return fullRequestURL, nil
@@ -40,7 +40,7 @@ func (a *Adaptor) ConvertRequest(c *gin.Context, relayMode int, request *model.G
 		return nil, errors.New("request is nil")
 	}
 	switch relayMode {
-	case constant.RelayModeEmbeddings:
+	case relaymode.Embeddings:
 		ollamaEmbeddingRequest := ConvertEmbeddingRequest(*request)
 		return ollamaEmbeddingRequest, nil
 	default:
@@ -64,7 +64,7 @@ func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, meta *util.Rel
 		err, usage = StreamHandler(c, resp)
 	} else {
 		switch meta.Mode {
-		case constant.RelayModeEmbeddings:
+		case relaymode.Embeddings:
 			err, usage = EmbeddingHandler(c, resp)
 		default:
 			err, usage = Handler(c, resp)
--- a/relay/channel/openai/adaptor.go
+++ b/relay/channel/openai/adaptor.go
@@ -4,11 +4,11 @@ import (
 	"errors"
 	"fmt"
 	"github.com/gin-gonic/gin"
-	"github.com/songquanpeng/one-api/common"
 	"github.com/songquanpeng/one-api/relay/channel"
 	"github.com/songquanpeng/one-api/relay/channel/minimax"
-	"github.com/songquanpeng/one-api/relay/constant"
+	"github.com/songquanpeng/one-api/relay/channeltype"
 	"github.com/songquanpeng/one-api/relay/model"
+	"github.com/songquanpeng/one-api/relay/relaymode"
 	"github.com/songquanpeng/one-api/relay/util"
 	"io"
 	"net/http"
@@ -25,8 +25,8 @@ func (a *Adaptor) Init(meta *util.RelayMeta) {

 func (a *Adaptor) GetRequestURL(meta *util.RelayMeta) (string, error) {
 	switch meta.ChannelType {
-	case common.ChannelTypeAzure:
-		if meta.Mode == constant.RelayModeImagesGenerations {
+	case channeltype.Azure:
+		if meta.Mode == relaymode.ImagesGenerations {
 			// https://learn.microsoft.com/en-us/azure/ai-services/openai/dall-e-quickstart?tabs=dalle3%2Ccommand-line&pivots=rest-api
 			// https://{resource_name}.openai.azure.com/openai/deployments/dall-e-3/images/generations?api-version=2024-03-01-preview
 			fullRequestURL := fmt.Sprintf("%s/openai/deployments/%s/images/generations?api-version=%s", meta.BaseURL, meta.ActualModelName, meta.APIVersion)
@@ -43,7 +43,7 @@ func (a *Adaptor) GetRequestURL(meta *util.RelayMeta) (string, error) {
 		// {your endpoint}/openai/deployments/{your azure_model}/chat/completions?api-version={api_version}
 		requestURL = fmt.Sprintf("/openai/deployments/%s/%s", model_, task)
 		return util.GetFullRequestURL(meta.BaseURL, requestURL, meta.ChannelType), nil
-	case common.ChannelTypeMinimax:
+	case channeltype.Minimax:
 		return minimax.GetRequestURL(meta)
 	default:
 		return util.GetFullRequestURL(meta.BaseURL, meta.RequestURLPath, meta.ChannelType), nil
@@ -52,12 +52,12 @@ func (a *Adaptor) GetRequestURL(meta *util.RelayMeta) (string, error) {

 func (a *Adaptor) SetupRequestHeader(c *gin.Context, req *http.Request, meta *util.RelayMeta) error {
 	channel.SetupCommonRequestHeader(c, req, meta)
-	if meta.ChannelType == common.ChannelTypeAzure {
+	if meta.ChannelType == channeltype.Azure {
 		req.Header.Set("api-key", meta.APIKey)
 		return nil
 	}
 	req.Header.Set("Authorization", "Bearer "+meta.APIKey)
-	if meta.ChannelType == common.ChannelTypeOpenRouter {
+	if meta.ChannelType == channeltype.OpenRouter {
 		req.Header.Set("HTTP-Referer", "https://github.com/songquanpeng/one-api")
 		req.Header.Set("X-Title", "One API")
 	}
@@ -91,7 +91,7 @@ func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, meta *util.Rel
 		}
 	} else {
 		switch meta.Mode {
-		case constant.RelayModeImagesGenerations:
+		case relaymode.ImagesGenerations:
 			err, _ = ImageHandler(c, resp)
 		default:
 			err, usage = Handler(c, resp, meta.PromptTokens, meta.ActualModelName)
--- a/relay/channel/openai/compatible.go
+++ b/relay/channel/openai/compatible.go
@@ -1,7 +1,6 @@
 package openai

 import (
-	"github.com/songquanpeng/one-api/common"
 	"github.com/songquanpeng/one-api/relay/channel/ai360"
 	"github.com/songquanpeng/one-api/relay/channel/baichuan"
 	"github.com/songquanpeng/one-api/relay/channel/groq"
@@ -10,39 +9,40 @@ import (
 	"github.com/songquanpeng/one-api/relay/channel/mistral"
 	"github.com/songquanpeng/one-api/relay/channel/moonshot"
 	"github.com/songquanpeng/one-api/relay/channel/stepfun"
+	"github.com/songquanpeng/one-api/relay/channeltype"
 )

 var CompatibleChannels = []int{
-	common.ChannelTypeAzure,
-	common.ChannelType360,
-	common.ChannelTypeMoonshot,
-	common.ChannelTypeBaichuan,
-	common.ChannelTypeMinimax,
-	common.ChannelTypeMistral,
-	common.ChannelTypeGroq,
-	common.ChannelTypeLingYiWanWu,
-	common.ChannelTypeStepFun,
+	channeltype.Azure,
+	channeltype.AI360,
+	channeltype.Moonshot,
+	channeltype.Baichuan,
+	channeltype.Minimax,
+	channeltype.Mistral,
+	channeltype.Groq,
+	channeltype.LingYiWanWu,
+	channeltype.StepFun,
 }

 func GetCompatibleChannelMeta(channelType int) (string, []string) {
 	switch channelType {
-	case common.ChannelTypeAzure:
+	case channeltype.Azure:
 		return "azure", ModelList
-	case common.ChannelType360:
+	case channeltype.AI360:
 		return "360", ai360.ModelList
-	case common.ChannelTypeMoonshot:
+	case channeltype.Moonshot:
 		return "moonshot", moonshot.ModelList
-	case common.ChannelTypeBaichuan:
+	case channeltype.Baichuan:
 		return "baichuan", baichuan.ModelList
-	case common.ChannelTypeMinimax:
+	case channeltype.Minimax:
 		return "minimax", minimax.ModelList
-	case common.ChannelTypeMistral:
+	case channeltype.Mistral:
 		return "mistralai", mistral.ModelList
-	case common.ChannelTypeGroq:
+	case channeltype.Groq:
 		return "groq", groq.ModelList
-	case common.ChannelTypeLingYiWanWu:
+	case channeltype.LingYiWanWu:
 		return "lingyiwanwu", lingyiwanwu.ModelList
-	case common.ChannelTypeStepFun:
+	case channeltype.StepFun:
 		return "stepfun", stepfun.ModelList
 	default:
 		return "openai", ModelList
--- a/relay/channel/openai/main.go
+++ b/relay/channel/openai/main.go
@@ -8,8 +8,8 @@ import (
 	"github.com/songquanpeng/one-api/common"
 	"github.com/songquanpeng/one-api/common/conv"
 	"github.com/songquanpeng/one-api/common/logger"
-	"github.com/songquanpeng/one-api/relay/constant"
 	"github.com/songquanpeng/one-api/relay/model"
+	"github.com/songquanpeng/one-api/relay/relaymode"
 	"io"
 	"net/http"
 	"strings"
@@ -46,7 +46,7 @@ func StreamHandler(c *gin.Context, resp *http.Response, relayMode int) (*model.E
 			data = data[6:]
 			if !strings.HasPrefix(data, "[DONE]") {
 				switch relayMode {
-				case constant.RelayModeChatCompletions:
+				case relaymode.ChatCompletions:
 					var streamResponse ChatCompletionsStreamResponse
 					err := json.Unmarshal([]byte(data), &streamResponse)
 					if err != nil {
@@ -59,7 +59,7 @@ func StreamHandler(c *gin.Context, resp *http.Response, relayMode int) (*model.E
 					if streamResponse.Usage != nil {
 						usage = streamResponse.Usage
 					}
-				case constant.RelayModeCompletions:
+				case relaymode.Completions:
 					var streamResponse CompletionsStreamResponse
 					err := json.Unmarshal([]byte(data), &streamResponse)
 					if err != nil {
--- a/relay/channel/zhipu/adaptor.go
+++ b/relay/channel/zhipu/adaptor.go
@@ -6,8 +6,8 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/songquanpeng/one-api/relay/channel"
 	"github.com/songquanpeng/one-api/relay/channel/openai"
-	"github.com/songquanpeng/one-api/relay/constant"
 	"github.com/songquanpeng/one-api/relay/model"
+	"github.com/songquanpeng/one-api/relay/relaymode"
 	"github.com/songquanpeng/one-api/relay/util"
 	"io"
 	"math"
@@ -33,9 +33,9 @@ func (a *Adaptor) SetVersionByModeName(modelName string) {

 func (a *Adaptor) GetRequestURL(meta *util.RelayMeta) (string, error) {
 	switch meta.Mode {
-	case constant.RelayModeImagesGenerations:
+	case relaymode.ImagesGenerations:
 		return fmt.Sprintf("%s/api/paas/v4/images/generations", meta.BaseURL), nil
-	case constant.RelayModeEmbeddings:
+	case relaymode.Embeddings:
 		return fmt.Sprintf("%s/api/paas/v4/embeddings", meta.BaseURL), nil
 	}
 	a.SetVersionByModeName(meta.ActualModelName)
@@ -61,7 +61,7 @@ func (a *Adaptor) ConvertRequest(c *gin.Context, relayMode int, request *model.G
 		return nil, errors.New("request is nil")
 	}
 	switch relayMode {
-	case constant.RelayModeEmbeddings:
+	case relaymode.Embeddings:
 		baiduEmbeddingRequest := ConvertEmbeddingRequest(*request)
 		return baiduEmbeddingRequest, nil
 	default:
@@ -107,10 +107,10 @@ func (a *Adaptor) DoResponseV4(c *gin.Context, resp *http.Response, meta *util.R

 func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, meta *util.RelayMeta) (usage *model.Usage, err *model.ErrorWithStatusCode) {
 	switch meta.Mode {
-	case constant.RelayModeEmbeddings:
+	case relaymode.Embeddings:
 		err, usage = EmbeddingsHandler(c, resp)
 		return
-	case constant.RelayModeImagesGenerations:
+	case relaymode.ImagesGenerations:
 		err, usage = openai.ImageHandler(c, resp)
 		return
 	}
@@ -120,7 +120,7 @@ func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, meta *util.Rel
 	if meta.IsStream {
 		err, usage = StreamHandler(c, resp)
 	} else {
-		if meta.Mode == constant.RelayModeEmbeddings {
+		if meta.Mode == relaymode.Embeddings {
 			err, usage = EmbeddingsHandler(c, resp)
 		} else {
 			err, usage = Handler(c, resp)