From 77df84923482dfcf70b2da1a24355bca9b2a2352 Mon Sep 17 00:00:00 2001
From: sigoden <sigoden@gmail.com>
Date: Sun, 28 Jul 2024 13:28:49 +0800
Subject: [PATCH] refactor: udpate models.yaml and Argcfile.sh (#761)

---
 Argcfile.sh |  7 +++----
 models.yaml | 42 ++++++++++++++++++++++--------------------
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/Argcfile.sh b/Argcfile.sh
index 315a26c..6cadc29 100755
--- a/Argcfile.sh
+++ b/Argcfile.sh
@@ -452,10 +452,9 @@ _build_body() {
         file="${BODY_FILE:-"tmp/body/$1.json"}"
         if [[ -f "$file" ]]; then
             cat "$file" | \
-            sed \
-                -e 's/"model": ".*"/"model": "'"$argc_model"'"/' \
-                -e 's/"stream": \(true\|false\)/"stream": '$stream'/' \
-
+            sed -E \
+                -e 's%"model": ".*"%"model": "'"$argc_model"'"%' \
+                -e 's%"stream": (true|false)%"stream": '$stream'%' \
 
         fi
     else
diff --git a/models.yaml b/models.yaml
index fc78583..ba7dc01 100644
--- a/models.yaml
+++ b/models.yaml
@@ -556,23 +556,10 @@
 
 - platform: qianwen
   # docs:
-  #   - https://help.aliyun.com/zh/dashscope/developer-reference/tongyiqianwen-large-language-models/
-  #   - https://help.aliyun.com/zh/dashscope/developer-reference/qwen-vl-plus/
+  #   - https://help.aliyun.com/zh/dashscope/developer-reference/model-introduction
+  #   - https://help.aliyun.com/zh/dashscope/developer-reference/tongyi-thousand-questions-metering-and-billing
+  #   - https://help.aliyun.com/zh/dashscope/developer-reference/use-qwen-by-api
   models:
-    - name: qwen-long
-      max_input_tokens: 1000000
-      input_price: 0.07
-      output_price: 0.28
-    - name: qwen-turbo
-      max_input_tokens: 8000
-      input_price: 0.28
-      output_price: 0.84
-      supports_function_calling: true
-    - name: qwen-plus
-      max_input_tokens: 32000
-      input_price: 0.56
-      output_price: 1.68
-      supports_function_calling: true
     - name: qwen-max
       max_input_tokens: 8000
       input_price: 5.6
@@ -582,14 +569,29 @@
       input_price: 5.6
       output_price: 16.8
       max_input_tokens: 30000
-    - name: qwen-vl-plus
-      input_price: 1.12
-      output_price: 1.12
-      supports_vision: true
+      supports_function_calling: true
+    - name: qwen-plus
+      max_input_tokens: 32000
+      input_price: 0.56
+      output_price: 1.68
+      supports_function_calling: true
+    - name: qwen-turbo
+      max_input_tokens: 8000
+      input_price: 0.28
+      output_price: 0.84
+      supports_function_calling: true
+    - name: qwen-long
+      max_input_tokens: 1000000
+      input_price: 0.07
+      output_price: 0.28
     - name: qwen-vl-max
       input_price: 2.8
       output_price: 2.8
       supports_vision: true
+    - name: qwen-vl-plus
+      input_price: 1.12
+      output_price: 1.12
+      supports_vision: true
     - name: text-embedding-v2
       type: embedding
       max_input_tokens: 2048