Revert "Merge branch 'songquanpeng:main' into main"

This reverts commit bc83d65, reversing changes made to b2cc54f.
songquanpeng · Nov 9, 2024 · e5fff39 · e5fff39
1 parent bc83d65
commit e5fff39
Show file tree

Hide file tree

Showing 13 changed files with 3 additions and 33 deletions.
diff --git a/README.md b/README.md
@@ -90,7 +90,6 @@ _✨ 通过标准的 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,7 +3,6 @@ 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/aws/claude/main.go b/relay/adaptor/aws/claude/main.go
@@ -34,7 +34,6 @@ var AwsModelIDMap = map[string]string{
 	"claude-3-5-sonnet-20241022": "anthropic.claude-3-5-sonnet-20241022-v2:0",
 	"claude-3-opus-20240229":     "anthropic.claude-3-opus-20240229-v1:0",
 	"claude-3-haiku-20240307":    "anthropic.claude-3-haiku-20240307-v1:0",
-	"claude-3-5-haiku-20241022":  "anthropic.claude-3-5-haiku-20241022-v1:0",
 }
 
 func awsModelID(requestModel string) (string, error) {

diff --git a/relay/adaptor/openai/compatible.go b/relay/adaptor/openai/compatible.go
@@ -11,10 +11,9 @@ 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/xai"
+	"github.com/songquanpeng/one-api/relay/adaptor/siliconflow"
 	"github.com/songquanpeng/one-api/relay/channeltype"
 )
 
@@ -33,7 +32,6 @@ var CompatibleChannels = []int{
 	channeltype.TogetherAI,
 	channeltype.Novita,
 	channeltype.SiliconFlow,
-	channeltype.XAI,
 }
 
 func GetCompatibleChannelMeta(channelType int) (string, []string) {
@@ -66,8 +64,6 @@ 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
diff --git a/relay/billing/ratio/model.go b/relay/billing/ratio/model.go
@@ -79,7 +79,6 @@ 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,
@@ -209,8 +208,6 @@ 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{
@@ -375,8 +372,6 @@ 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,6 +46,5 @@ const (
 	VertextAI
 	Proxy
 	SiliconFlow
-	XAI
 	Dummy
 )
diff --git a/relay/channeltype/url.go b/relay/channeltype/url.go
@@ -45,8 +45,7 @@ var ChannelBaseURLs = []string{
 	"https://api.novita.ai/v3/openai",           // 41
 	"",                                          // 42
 	"",                                          // 43
-	"https://api.siliconflow.cn",                // 44
-	"https://api.x.ai",                          // 45
+	"https://api.siliconflow.cn",                 // 44
 }
 
 func init() {

diff --git a/web/air/src/constants/channel.constants.js b/web/air/src/constants/channel.constants.js
@@ -30,7 +30,6 @@ 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-haiku-20241022", "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-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,12 +179,6 @@ 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,9 +223,6 @@ 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,7 +30,6 @@ 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' },
-Original file line number
+Diff line change
@@ Expand Up / @@ -46,6 +46,5 @@ const ( @@
     	VertextAI
     	Proxy
     	SiliconFlow
-    	XAI
     	Dummy
     )