From 43b4ee37d9696765aba92e9fadfc38d01bb76381 Mon Sep 17 00:00:00 2001
From: Buer <42402987+MartialBE@users.noreply.github.com>
Date: Tue, 20 Feb 2024 16:21:26 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix=20some=20bugs=20(#70)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 🐛 fix: moonshot model name error

* 🐛 fix: qwen-vl model name error
---
 common/model-ratio.go                | 2 +-
 providers/ali/base.go                | 2 +-
 providers/ali/chat.go                | 2 +-
 web/src/views/Channel/type/Config.js | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/model-ratio.go b/common/model-ratio.go
index 96256c24..03c87a63 100644
--- a/common/model-ratio.go
+++ b/common/model-ratio.go
@@ -130,8 +130,8 @@ func init() {
 		"qwen-plus":            {[]float64{1.4286, 1.4286}, ChannelTypeAli},
 		"qwen-max":             {[]float64{1.4286, 1.4286}, ChannelTypeAli},
 		"qwen-max-longcontext": {[]float64{1.4286, 1.4286}, ChannelTypeAli},
-		"qwen-vl":              {[]float64{0.5715, 0.5715}, ChannelTypeAli},
 		"qwen-vl-plus":         {[]float64{0.5715, 0.5715}, ChannelTypeAli},
+		"qwen-vl-max":          {[]float64{0.5715, 0.5715}, ChannelTypeAli},
 		// ￥0.0007 / 1k tokens
 		"text-embedding-v1": {[]float64{0.05, 0.05}, ChannelTypeAli},
 
diff --git a/providers/ali/base.go b/providers/ali/base.go
index 41f098ca..ee1e7bea 100644
--- a/providers/ali/base.go
+++ b/providers/ali/base.go
@@ -66,7 +66,7 @@ func errorHandle(aliError *AliError) *types.OpenAIError {
 func (p *AliProvider) GetFullRequestURL(requestURL string, modelName string) string {
 	baseURL := strings.TrimSuffix(p.GetBaseURL(), "/")
 
-	if modelName == "qwen-vl-plus" {
+	if strings.HasPrefix(modelName, "qwen-vl") {
 		requestURL = "/api/v1/services/aigc/multimodal-generation/generation"
 	}
 
diff --git a/providers/ali/chat.go b/providers/ali/chat.go
index 577dc7ae..61b9b1a0 100644
--- a/providers/ali/chat.go
+++ b/providers/ali/chat.go
@@ -114,7 +114,7 @@ func convertFromChatOpenai(request *types.ChatCompletionRequest) *AliChatRequest
 	messages := make([]AliMessage, 0, len(request.Messages))
 	for i := 0; i < len(request.Messages); i++ {
 		message := request.Messages[i]
-		if request.Model != "qwen-vl-plus" {
+		if !strings.HasPrefix(request.Model, "qwen-vl") {
 			messages = append(messages, AliMessage{
 				Content: message.StringContent(),
 				Role:    strings.ToLower(message.Role),
diff --git a/web/src/views/Channel/type/Config.js b/web/src/views/Channel/type/Config.js
index f97b6f98..a54df7f1 100644
--- a/web/src/views/Channel/type/Config.js
+++ b/web/src/views/Channel/type/Config.js
@@ -184,7 +184,7 @@ const typeConfig = {
   },
   29: {
     input: {
-      models: ['moonshot-v1-8k', 'moonshot-v1-16k', 'moonshot-v1-128k'],
+      models: ['moonshot-v1-8k', 'moonshot-v1-32k', 'moonshot-v1-128k'],
       test_model: 'moonshot-v1-8k'
     }
   }