Merge branch 'main' into patch/claude-35-haiku

songquanpeng · Nov 9, 2024 · 0aed4ec · 0aed4ec
2 parents 2f57dad + 8ec092b
commit 0aed4ec
Show file tree

Hide file tree

Showing 12 changed files with 32 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -90,6 +90,7 @@ _✨ 通过标准的 OpenAI API 格式访问所有的大模型，开箱即用
    + [x] [together.ai](https://www.together.ai/)
    + [x] [novita.ai](https://www.novita.ai/)
    + [x] [硅基流动 SiliconCloud](https://siliconflow.cn/siliconcloud)
+   + [x] [xAI](https://x.ai/)
 2. 支持配置镜像以及众多[第三方代理服务](https://iamazing.cn/page/openai-api-third-party-services)。
 3. 支持通过**负载均衡**的方式访问多个渠道。
 4. 支持 **stream 模式**，可以通过流式传输实现打字机效果。

diff --git a/relay/adaptor/anthropic/constants.go b/relay/adaptor/anthropic/constants.go
@@ -3,6 +3,7 @@ package anthropic
 var ModelList = []string{
 	"claude-instant-1.2", "claude-2.0", "claude-2.1",
 	"claude-3-haiku-20240307",
+	"claude-3-5-haiku-20241022",
 	"claude-3-sonnet-20240229",
 	"claude-3-opus-20240229",
 	"claude-3-5-sonnet-20240620",

diff --git a/relay/adaptor/openai/compatible.go b/relay/adaptor/openai/compatible.go
@@ -11,9 +11,10 @@ import (
 	"github.com/songquanpeng/one-api/relay/adaptor/mistral"
 	"github.com/songquanpeng/one-api/relay/adaptor/moonshot"
 	"github.com/songquanpeng/one-api/relay/adaptor/novita"
+	"github.com/songquanpeng/one-api/relay/adaptor/siliconflow"
 	"github.com/songquanpeng/one-api/relay/adaptor/stepfun"
 	"github.com/songquanpeng/one-api/relay/adaptor/togetherai"
-	"github.com/songquanpeng/one-api/relay/adaptor/siliconflow"
+	"github.com/songquanpeng/one-api/relay/adaptor/xai"
 	"github.com/songquanpeng/one-api/relay/channeltype"
 )
 
@@ -32,6 +33,7 @@ var CompatibleChannels = []int{
 	channeltype.TogetherAI,
 	channeltype.Novita,
 	channeltype.SiliconFlow,
+	channeltype.XAI,
 }
 
 func GetCompatibleChannelMeta(channelType int) (string, []string) {
@@ -64,6 +66,8 @@ func GetCompatibleChannelMeta(channelType int) (string, []string) {
 		return "novita", novita.ModelList
 	case channeltype.SiliconFlow:
 		return "siliconflow", siliconflow.ModelList
+	case channeltype.XAI:
+		return "xai", xai.ModelList
 	default:
 		return "openai", ModelList
 	}

diff --git a/relay/adaptor/xai/constants.go b/relay/adaptor/xai/constants.go
@@ -0,0 +1,5 @@
+package xai
+
+var ModelList = []string{
+	"grok-beta",
+}
diff --git a/relay/billing/ratio/model.go b/relay/billing/ratio/model.go
@@ -79,6 +79,7 @@ var ModelRatio = map[string]float64{
 	"claude-2.0":                 8.0 / 1000 * USD,
 	"claude-2.1":                 8.0 / 1000 * USD,
 	"claude-3-haiku-20240307":    0.25 / 1000 * USD,
+	"claude-3-5-haiku-20241022":  1.0 / 1000 * USD,
 	"claude-3-sonnet-20240229":   3.0 / 1000 * USD,
 	"claude-3-5-sonnet-20240620": 3.0 / 1000 * USD,
 	"claude-3-5-sonnet-20241022": 3.0 / 1000 * USD,
@@ -208,6 +209,8 @@ var ModelRatio = map[string]float64{
 	"deepl-zh": 25.0 / 1000 * USD,
 	"deepl-en": 25.0 / 1000 * USD,
 	"deepl-ja": 25.0 / 1000 * USD,
+	// https://console.x.ai/
+	"grok-beta": 5.0 / 1000 * USD,
 }
 
 var CompletionRatio = map[string]float64{
@@ -372,6 +375,8 @@ func GetCompletionRatio(name string, channelType int) float64 {
 		return 3
 	case "command-r-plus":
 		return 5
+	case "grok-beta":
+		return 3
 	}
 	return 1
 }
diff --git a/relay/channeltype/define.go b/relay/channeltype/define.go
@@ -46,5 +46,6 @@ const (
 	VertextAI
 	Proxy
 	SiliconFlow
+	XAI
 	Dummy
 )
diff --git a/relay/channeltype/url.go b/relay/channeltype/url.go
@@ -45,7 +45,8 @@ var ChannelBaseURLs = []string{
 	"https://api.novita.ai/v3/openai",           // 41
 	"",                                          // 42
 	"",                                          // 43
-	"https://api.siliconflow.cn",                 // 44
+	"https://api.siliconflow.cn",                // 44
+	"https://api.x.ai",                          // 45
 }
 
 func init() {

diff --git a/web/air/src/constants/channel.constants.js b/web/air/src/constants/channel.constants.js
@@ -30,6 +30,7 @@ export const CHANNEL_OPTIONS = [
   { key: 42, text: 'VertexAI', value: 42, color: 'blue' },
   { key: 43, text: 'Proxy', value: 43, color: 'blue' },
   { key: 44, text: 'SiliconFlow', value: 44, color: 'blue' },
+  { key: 45, text: 'xAI', value: 45, color: 'blue' },
   { key: 8, text: '自定义渠道', value: 8, color: 'pink' },
   { key: 22, text: '知识库：FastGPT', value: 22, color: 'blue' },
   { key: 21, text: '知识库：AI Proxy', value: 21, color: 'purple' },

diff --git a/web/air/src/pages/Channel/EditChannel.js b/web/air/src/pages/Channel/EditChannel.js
@@ -63,7 +63,7 @@ const EditChannel = (props) => {
             let localModels = [];
             switch (value) {
                 case 14:
-                    localModels = ["claude-instant-1.2", "claude-2", "claude-2.0", "claude-2.1", "claude-3-opus-20240229", "claude-3-sonnet-20240229", "claude-3-haiku-20240307", "claude-3-5-sonnet-20240620", "claude-3-5-sonnet-20241022"];
+                    localModels = ["claude-instant-1.2", "claude-2", "claude-2.0", "claude-2.1", "claude-3-opus-20240229", "claude-3-sonnet-20240229", "claude-3-haiku-20240307", "claude-3-5-haiku-20241022", "claude-3-5-sonnet-20240620", "claude-3-5-sonnet-20241022"];
                     break;
                 case 11:
                     localModels = ['PaLM-2'];

diff --git a/web/berry/src/constants/ChannelConstants.js b/web/berry/src/constants/ChannelConstants.js
@@ -179,6 +179,12 @@ export const CHANNEL_OPTIONS = {
     value: 44,
     color: 'primary'
   },
+  45: {
+    key: 45,
+    text: 'xAI',
+    value: 45,
+    color: 'primary'
+  },
   41: {
     key: 41,
     text: 'Novita',

diff --git a/web/berry/src/views/Channel/type/Config.js b/web/berry/src/views/Channel/type/Config.js
@@ -223,6 +223,9 @@ const typeConfig = {
     },
     modelGroup: 'anthropic'
   },
+  45: {
+    modelGroup: 'xai'
+  },
 };
 
 export { defaultConfig, typeConfig };
diff --git a/web/default/src/constants/channel.constants.js b/web/default/src/constants/channel.constants.js
@@ -30,6 +30,7 @@ export const CHANNEL_OPTIONS = [
     { key: 42, text: 'VertexAI', value: 42, color: 'blue' },
     { key: 43, text: 'Proxy', value: 43, color: 'blue' },
     { key: 44, text: 'SiliconFlow', value: 44, color: 'blue' },
+    { key: 45, text: 'xAI', value: 45, color: 'blue' },
     { key: 8, text: '自定义渠道', value: 8, color: 'pink' },
     { key: 22, text: '知识库：FastGPT', value: 22, color: 'blue' },
     { key: 21, text: '知识库：AI Proxy', value: 21, color: 'purple' },