-
@@ -103,7 +100,7 @@ New API提供了丰富的功能，详细特性请参考[特性说明](https://do
详细配置说明请参考[安装指南-环境变量配置](https://docs.newapi.pro/installation/environment-variables)：
- `GENERATE_DEFAULT_TOKEN`：是否为新注册用户生成初始令牌，默认为 `false`
-- `STREAMING_TIMEOUT`：流式回复超时时间，默认60秒
+- `STREAMING_TIMEOUT`：流式回复超时时间，默认120秒
- `DIFY_DEBUG`：Dify渠道是否输出工作流和节点信息，默认 `true`
- `FORCE_STREAM_OPTION`：是否覆盖客户端stream_options参数，默认 `true`
- `GET_MEDIA_TOKEN`：是否统计图片token，默认 `true`
diff --git a/common/api_type.go b/common/api_type.go
new file mode 100644
index 00000000..d9071236
--- /dev/null
+++ b/common/api_type.go
@@ -0,0 +1,71 @@
+package common
+
+import "one-api/constant"
+
+func ChannelType2APIType(channelType int) (int, bool) {
+ apiType := -1
+ switch channelType {
+ case constant.ChannelTypeOpenAI:
+ apiType = constant.APITypeOpenAI
+ case constant.ChannelTypeAnthropic:
+ apiType = constant.APITypeAnthropic
+ case constant.ChannelTypeBaidu:
+ apiType = constant.APITypeBaidu
+ case constant.ChannelTypePaLM:
+ apiType = constant.APITypePaLM
+ case constant.ChannelTypeZhipu:
+ apiType = constant.APITypeZhipu
+ case constant.ChannelTypeAli:
+ apiType = constant.APITypeAli
+ case constant.ChannelTypeXunfei:
+ apiType = constant.APITypeXunfei
+ case constant.ChannelTypeAIProxyLibrary:
+ apiType = constant.APITypeAIProxyLibrary
+ case constant.ChannelTypeTencent:
+ apiType = constant.APITypeTencent
+ case constant.ChannelTypeGemini:
+ apiType = constant.APITypeGemini
+ case constant.ChannelTypeZhipu_v4:
+ apiType = constant.APITypeZhipuV4
+ case constant.ChannelTypeOllama:
+ apiType = constant.APITypeOllama
+ case constant.ChannelTypePerplexity:
+ apiType = constant.APITypePerplexity
+ case constant.ChannelTypeAws:
+ apiType = constant.APITypeAws
+ case constant.ChannelTypeCohere:
+ apiType = constant.APITypeCohere
+ case constant.ChannelTypeDify:
+ apiType = constant.APITypeDify
+ case constant.ChannelTypeJina:
+ apiType = constant.APITypeJina
+ case constant.ChannelCloudflare:
+ apiType = constant.APITypeCloudflare
+ case constant.ChannelTypeSiliconFlow:
+ apiType = constant.APITypeSiliconFlow
+ case constant.ChannelTypeVertexAi:
+ apiType = constant.APITypeVertexAi
+ case constant.ChannelTypeMistral:
+ apiType = constant.APITypeMistral
+ case constant.ChannelTypeDeepSeek:
+ apiType = constant.APITypeDeepSeek
+ case constant.ChannelTypeMokaAI:
+ apiType = constant.APITypeMokaAI
+ case constant.ChannelTypeVolcEngine:
+ apiType = constant.APITypeVolcEngine
+ case constant.ChannelTypeBaiduV2:
+ apiType = constant.APITypeBaiduV2
+ case constant.ChannelTypeOpenRouter:
+ apiType = constant.APITypeOpenRouter
+ case constant.ChannelTypeXinference:
+ apiType = constant.APITypeXinference
+ case constant.ChannelTypeXai:
+ apiType = constant.APITypeXai
+ case constant.ChannelTypeCoze:
+ apiType = constant.APITypeCoze
+ }
+ if apiType == -1 {
+ return constant.APITypeOpenAI, false
+ }
+ return apiType, true
+}
diff --git a/common/constants.go b/common/constants.go
index bee00506..e4f5f047 100644
--- a/common/constants.go
+++ b/common/constants.go
@@ -193,107 +193,3 @@ const (
ChannelStatusManuallyDisabled = 2 // also don't use 0
ChannelStatusAutoDisabled = 3
)
-
-const (
- ChannelTypeUnknown = 0
- ChannelTypeOpenAI = 1
- ChannelTypeMidjourney = 2
- ChannelTypeAzure = 3
- ChannelTypeOllama = 4
- ChannelTypeMidjourneyPlus = 5
- ChannelTypeOpenAIMax = 6
- ChannelTypeOhMyGPT = 7
- ChannelTypeCustom = 8
- ChannelTypeAILS = 9
- ChannelTypeAIProxy = 10
- ChannelTypePaLM = 11
- ChannelTypeAPI2GPT = 12
- ChannelTypeAIGC2D = 13
- ChannelTypeAnthropic = 14
- ChannelTypeBaidu = 15
- ChannelTypeZhipu = 16
- ChannelTypeAli = 17
- ChannelTypeXunfei = 18
- ChannelType360 = 19
- ChannelTypeOpenRouter = 20
- ChannelTypeAIProxyLibrary = 21
- ChannelTypeFastGPT = 22
- ChannelTypeTencent = 23
- ChannelTypeGemini = 24
- ChannelTypeMoonshot = 25
- ChannelTypeZhipu_v4 = 26
- ChannelTypePerplexity = 27
- ChannelTypeLingYiWanWu = 31
- ChannelTypeAws = 33
- ChannelTypeCohere = 34
- ChannelTypeMiniMax = 35
- ChannelTypeSunoAPI = 36
- ChannelTypeDify = 37
- ChannelTypeJina = 38
- ChannelCloudflare = 39
- ChannelTypeSiliconFlow = 40
- ChannelTypeVertexAi = 41
- ChannelTypeMistral = 42
- ChannelTypeDeepSeek = 43
- ChannelTypeMokaAI = 44
- ChannelTypeVolcEngine = 45
- ChannelTypeBaiduV2 = 46
- ChannelTypeXinference = 47
- ChannelTypeXai = 48
- ChannelTypeCoze = 49
- ChannelTypeDummy // this one is only for count, do not add any channel after this
-
-)
-
-var ChannelBaseURLs = []string{
- "", // 0
- "https://api.openai.com", // 1
- "https://oa.api2d.net", // 2
- "", // 3
- "http://localhost:11434", // 4
- "https://api.openai-sb.com", // 5
- "https://api.openaimax.com", // 6
- "https://api.ohmygpt.com", // 7
- "", // 8
- "https://api.caipacity.com", // 9
- "https://api.aiproxy.io", // 10
- "", // 11
- "https://api.api2gpt.com", // 12
- "https://api.aigc2d.com", // 13
- "https://api.anthropic.com", // 14
- "https://aip.baidubce.com", // 15
- "https://open.bigmodel.cn", // 16
- "https://dashscope.aliyuncs.com", // 17
- "", // 18
- "https://api.360.cn", // 19
- "https://openrouter.ai/api", // 20
- "https://api.aiproxy.io", // 21
- "https://fastgpt.run/api/openapi", // 22
- "https://hunyuan.tencentcloudapi.com", //23
- "https://generativelanguage.googleapis.com", //24
- "https://api.moonshot.cn", //25
- "https://open.bigmodel.cn", //26
- "https://api.perplexity.ai", //27
- "", //28
- "", //29
- "", //30
- "https://api.lingyiwanwu.com", //31
- "", //32
- "", //33
- "https://api.cohere.ai", //34
- "https://api.minimax.chat", //35
- "", //36
- "https://api.dify.ai", //37
- "https://api.jina.ai", //38
- "https://api.cloudflare.com", //39
- "https://api.siliconflow.cn", //40
- "", //41
- "https://api.mistral.ai", //42
- "https://api.deepseek.com", //43
- "https://api.moka.ai", //44
- "https://ark.cn-beijing.volces.com", //45
- "https://qianfan.baidubce.com", //46
- "", //47
- "https://api.x.ai", //48
- "https://api.coze.cn", //49
-}
diff --git a/common/endpoint_type.go b/common/endpoint_type.go
new file mode 100644
index 00000000..a0ca73ea
--- /dev/null
+++ b/common/endpoint_type.go
@@ -0,0 +1,41 @@
+package common
+
+import "one-api/constant"
+
+// GetEndpointTypesByChannelType 获取渠道最优先端点类型（所有的渠道都支持 OpenAI 端点）
+func GetEndpointTypesByChannelType(channelType int, modelName string) []constant.EndpointType {
+ var endpointTypes []constant.EndpointType
+ switch channelType {
+ case constant.ChannelTypeJina:
+ endpointTypes = []constant.EndpointType{constant.EndpointTypeJinaRerank}
+ //case constant.ChannelTypeMidjourney, constant.ChannelTypeMidjourneyPlus:
+ // endpointTypes = []constant.EndpointType{constant.EndpointTypeMidjourney}
+ //case constant.ChannelTypeSunoAPI:
+ // endpointTypes = []constant.EndpointType{constant.EndpointTypeSuno}
+ //case constant.ChannelTypeKling:
+ // endpointTypes = []constant.EndpointType{constant.EndpointTypeKling}
+ //case constant.ChannelTypeJimeng:
+ // endpointTypes = []constant.EndpointType{constant.EndpointTypeJimeng}
+ case constant.ChannelTypeAws:
+ fallthrough
+ case constant.ChannelTypeAnthropic:
+ endpointTypes = []constant.EndpointType{constant.EndpointTypeAnthropic, constant.EndpointTypeOpenAI}
+ case constant.ChannelTypeVertexAi:
+ fallthrough
+ case constant.ChannelTypeGemini:
+ endpointTypes = []constant.EndpointType{constant.EndpointTypeGemini, constant.EndpointTypeOpenAI}
+ case constant.ChannelTypeOpenRouter: // OpenRouter 只支持 OpenAI 端点
+ endpointTypes = []constant.EndpointType{constant.EndpointTypeOpenAI}
+ default:
+ if IsOpenAIResponseOnlyModel(modelName) {
+ endpointTypes = []constant.EndpointType{constant.EndpointTypeOpenAIResponse}
+ } else {
+ endpointTypes = []constant.EndpointType{constant.EndpointTypeOpenAI}
+ }
+ }
+ if IsImageGenerationModel(modelName) {
+ // add to first
+ endpointTypes = append([]constant.EndpointType{constant.EndpointTypeImageGeneration}, endpointTypes...)
+ }
+ return endpointTypes
+}
diff --git a/common/gin.go b/common/gin.go
index 4a909dfc..62c4c692 100644
--- a/common/gin.go
+++ b/common/gin.go
@@ -2,10 +2,11 @@ package common
import (
"bytes"
- "encoding/json"
"github.com/gin-gonic/gin"
"io"
+ "one-api/constant"
"strings"
+ "time"
)
const KeyRequestBody = "key_request_body"
@@ -31,7 +32,7 @@ func UnmarshalBodyReusable(c *gin.Context, v any) error {
}
contentType := c.Request.Header.Get("Content-Type")
if strings.HasPrefix(contentType, "application/json") {
- err = json.Unmarshal(requestBody, &v)
+ err = UnmarshalJson(requestBody, &v)
} else {
// skip for now
// TODO: someday non json request have variant model, we will need to implementation this
@@ -43,3 +44,35 @@ func UnmarshalBodyReusable(c *gin.Context, v any) error {
c.Request.Body = io.NopCloser(bytes.NewBuffer(requestBody))
return nil
}
+
+func SetContextKey(c *gin.Context, key constant.ContextKey, value any) {
+ c.Set(string(key), value)
+}
+
+func GetContextKey(c *gin.Context, key constant.ContextKey) (any, bool) {
+ return c.Get(string(key))
+}
+
+func GetContextKeyString(c *gin.Context, key constant.ContextKey) string {
+ return c.GetString(string(key))
+}
+
+func GetContextKeyInt(c *gin.Context, key constant.ContextKey) int {
+ return c.GetInt(string(key))
+}
+
+func GetContextKeyBool(c *gin.Context, key constant.ContextKey) bool {
+ return c.GetBool(string(key))
+}
+
+func GetContextKeyStringSlice(c *gin.Context, key constant.ContextKey) []string {
+ return c.GetStringSlice(string(key))
+}
+
+func GetContextKeyStringMap(c *gin.Context, key constant.ContextKey) map[string]any {
+ return c.GetStringMap(string(key))
+}
+
+func GetContextKeyTime(c *gin.Context, key constant.ContextKey) time.Time {
+ return c.GetTime(string(key))
+}
diff --git a/common/http.go b/common/http.go
new file mode 100644
index 00000000..d2e824ef
--- /dev/null
+++ b/common/http.go
@@ -0,0 +1,57 @@
+package common
+
+import (
+ "bytes"
+ "fmt"
+ "io"
+ "net/http"
+
+ "github.com/gin-gonic/gin"
+)
+
+func CloseResponseBodyGracefully(httpResponse *http.Response) {
+ if httpResponse == nil || httpResponse.Body == nil {
+ return
+ }
+ err := httpResponse.Body.Close()
+ if err != nil {
+ SysError("failed to close response body: " + err.Error())
+ }
+}
+
+func IOCopyBytesGracefully(c *gin.Context, src *http.Response, data []byte) {
+ if c.Writer == nil {
+ return
+ }
+
+ body := io.NopCloser(bytes.NewBuffer(data))
+
+ // We shouldn't set the header before we parse the response body, because the parse part may fail.
+ // And then we will have to send an error response, but in this case, the header has already been set.
+ // So the httpClient will be confused by the response.
+ // For example, Postman will report error, and we cannot check the response at all.
+ if src != nil {
+ for k, v := range src.Header {
+ // avoid setting Content-Length
+ if k == "Content-Length" {
+ continue
+ }
+ c.Writer.Header().Set(k, v[0])
+ }
+ }
+
+ // set Content-Length header manually BEFORE calling WriteHeader
+ c.Writer.Header().Set("Content-Length", fmt.Sprintf("%d", len(data)))
+
+ // Write header with status code (this sends the headers)
+ if src != nil {
+ c.Writer.WriteHeader(src.StatusCode)
+ } else {
+ c.Writer.WriteHeader(http.StatusOK)
+ }
+
+ _, err := io.Copy(c.Writer, body)
+ if err != nil {
+ LogError(c, fmt.Sprintf("failed to copy response body: %s", err.Error()))
+ }
+}
diff --git a/common/init.go b/common/init.go
index c0caf0a1..d70a09dd 100644
--- a/common/init.go
+++ b/common/init.go
@@ -4,6 +4,7 @@ import (
"flag"
"fmt"
"log"
+ "one-api/constant"
"os"
"path/filepath"
"strconv"
@@ -24,7 +25,7 @@ func printHelp() {
fmt.Println("Usage: one-api [--port