update ai gateway scripts

higress-group · Jan 17, 2025 · dca52ba · dca52ba
1 parent e2e0c6f
commit dca52ba
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 34 deletions.
diff --git a/all-in-one/Dockerfile b/all-in-one/Dockerfile
@@ -1,7 +1,7 @@
 ARG HUB=higress-registry.cn-hangzhou.cr.aliyuncs.com/higress
 ARG BASE_VERSION=2022-10-27T19-02-22
-ARG CORE_VERSION=2.0.6-rc.2
-ARG CONSOLE_VERSION=2.0.1
+ARG CORE_VERSION=2.0.6
+ARG CONSOLE_VERSION=2.0.2
 ARG APISERVER_VERSION=0.0.19
 ARG PROMETHEUS_VERSION=v2.40.7
 ARG PROMTAIL_VERSION=2.9.4

diff --git a/all-in-one/get-ai-gateway.sh b/all-in-one/get-ai-gateway.sh
@@ -146,26 +146,26 @@ runConfigWizard() {
     "OpenAI|OPENAI"
     "Aliyun Dashscope|DASHSCOPE"
     "Moonshot|MOONSHOT"
-    # "Azure OpenAI|AZURE|configureAzureProvider"
-    # "360 Zhinao|AI360"
+    "Azure OpenAI|AZURE|configureAzureProvider"
+    "360 Zhinao|AI360"
     # "Github Models|GITHUB"
     # "Groq|GROQ"
     "Baichuan AI|BAICHUAN"
     "01.AI|YI"
-    # "DeepSeek|DEEPSEEK"
+    "DeepSeek|DEEPSEEK"
     "Zhipu AI|ZHIPUAI"
-    # "Ollama|OLLAMA|configureOllamaProvider"
+    "Ollama|OLLAMA|configureOllamaProvider"
     "Claude|CLAUDE|configureClaudeProvider"
-    # "Baidu AI Cloud|BAIDU"
+    "Baidu AI Cloud|BAIDU"
     # "Tencent Hunyuan|HUNYUAN"
     "Stepfun|STEPFUN"
     "Minimax|MINIMAX|configureMinimaxProvider"
     # "Cloudflare Workers AI|CLOUDFLARE"
     # "iFlyTek Spark|SPARK"
-    # "Google Gemini|GEMINI"
+    "Google Gemini|GEMINI"
     # "DeepL|DEEPL"
-    # "Mistral AI|MISTRAL"
-    # "Cohere|COHERE"
+    "Mistral AI|MISTRAL"
+    "Cohere|COHERE"
     "Doubao|DOUBAO"
     # "Coze|COZE"
   )

diff --git a/all-in-one/scripts/config-template/ai-gateway.sh b/all-in-one/scripts/config-template/ai-gateway.sh
@@ -16,35 +16,35 @@ function initializeLlmProviderConfigs() {
 
   initializeLlmProviderConfig aliyun qwen DASHSCOPE dashscope.aliyuncs.com "443" "https" "" "PRE" 'qwen-'
   initializeLlmProviderConfig moonshot moonshot MOONSHOT api.moonshot.cn "443" "https" "" "PRE" 'moonshot-'
-  initializeLlmProviderConfig openai openai OPENAI api.openai.com "443" "https" "" "REGULAR" 'gpt\\-.*|o1\\-.*'
-  # initializeLlmProviderConfig ai360 ai360 AI360 api.360.cn "443" "https" "" "PRE" ""
+  initializeLlmProviderConfig openai openai OPENAI api.openai.com "443" "https" "" "REGULAR" 'gpt-.*|o1-.*|o3-.*'
+  initializeLlmProviderConfig ai360 ai360 AI360 api.360.cn "443" "https" "" "PRE" "360GPT"
   # initializeLlmProviderConfig github github GITHUB models.inference.ai.azure.com "443" "https" "" "PRE" ""
   # initializeLlmProviderConfig groq groq GROQ api.groq.com "443" "https" "" "PRE" ""
   initializeLlmProviderConfig baichuan baichuan BAICHUAN api.baichuan-ai.com "443" "https" "" "PRE" "Baichuan"
   initializeLlmProviderConfig yi yi YI api.lingyiwanwu.com "443" "https" "" "PRE" 'yi-'
   initializeLlmProviderConfig deepseek deepseek DEEPSEEK api.deepseek.com "443" "https" "" "PRE" "deepseek"
   initializeLlmProviderConfig zhipuai zhipuai ZHIPUAI open.bigmodel.cn "443" "https" "" "PRE" "GLM-"
-  # initializeLlmProviderConfig baidu baidu BAIDU aip.baidubce.com "443" "https" "" "PRE" "ERNIE-"
+  initializeLlmProviderConfig baidu baidu BAIDU qianfan.baidubce.com "443" "https" "" "PRE" "ERNIE-"
   # initializeLlmProviderConfig hunyuan hunyuan HUNYUAN hunyuan.tencentcloudapi.com "443" "https" "" "PRE" "hunyuan-" "${EXTRA_CONFIGS[@]}"
   initializeLlmProviderConfig stepfun stepfun STEPFUN api.stepfun.com "443" "https" "" "PRE" "step-"
   # initializeLlmProviderConfig cloudflare cloudflare CLOUDFLARE api.cloudflare.com "443" "https" "" "PRE" "" "${EXTRA_CONFIGS[@]}"
   # initializeLlmProviderConfig spark spark SPARK spark-api-open.xf-yun.com "443" "https" "" "PRE" "" "${EXTRA_CONFIGS[@]}"
-  # initializeLlmProviderConfig gemini gemini GEMINI generativelanguage.googleapis.com "443" "https" "" "PRE" "gemini-"
+  initializeLlmProviderConfig gemini gemini GEMINI generativelanguage.googleapis.com "443" "https" "" "PRE" "gemini-"
   # initializeLlmProviderConfig deepl deepl DEEPL "443" "https" "" "PRE" "" "${EXTRA_CONFIGS[@]}"
-  # initializeLlmProviderConfig mistral mistral MISTRAL api.mistral.ai "443" "https" "" "PRE" ""
-  # initializeLlmProviderConfig cohere cohere COHERE api.cohere.com "443" "https" "" "PRE" ""
+  initializeLlmProviderConfig mistral mistral MISTRAL api.mistral.ai "443" "https" "" "REGULAR" 'open-mistral-.*|mistral-.*'
+  initializeLlmProviderConfig cohere cohere COHERE api.cohere.com "443" "https" "" "REGULAR" 'command|command-.*'
   initializeLlmProviderConfig doubao doubao DOUBAO ark.cn-beijing.volces.com "443" "https" "" "PRE" "doubao-"
   # initializeLlmProviderConfig coze coze COZE api.coze.cn "443" "https" "" "PRE" ""
 
-  # if [ -z "$AZURE_SERVICE_URL" ]; then
-  #   AZURE_SERVICE_URL="https://YOUR_RESOURCE_NAME.openai.azure.com/openai/deployments/YOUR_DEPLOYMENT_NAME/chat/completions?api-version=2024-06-01"
-  # fi
-  # extractHostFromUrl "$AZURE_SERVICE_URL"
-  # local AZURE_SERVICE_DOMAIN="$HOST"
-  # EXTRA_CONFIGS=(
-  #   "azureServiceUrl=$AZURE_SERVICE_URL"
-  # )
-  # initializeLlmProviderConfig azure azure AZURE "$AZURE_SERVICE_DOMAIN" "443" "https" "" "PRE" "" "${EXTRA_CONFIGS[@]}"
+  if [ -z "$AZURE_SERVICE_URL" ]; then
+    AZURE_SERVICE_URL="https://YOUR_RESOURCE_NAME.openai.azure.com/openai/deployments/YOUR_DEPLOYMENT_NAME/chat/completions?api-version=2024-06-01"
+  fi
+  extractHostFromUrl "$AZURE_SERVICE_URL"
+  local AZURE_SERVICE_DOMAIN="$HOST"
+  EXTRA_CONFIGS=(
+    "azureServiceUrl=$AZURE_SERVICE_URL"
+  )
+  initializeLlmProviderConfig azure azure AZURE "$AZURE_SERVICE_DOMAIN" "443" "https" "" "REGULAR" 'gpt-.*|o1-.*|o3-.*' "${EXTRA_CONFIGS[@]}"
 
   if [ -z "$CLAUDE_VERSION" ]; then
     CLAUDE_VERSION="2023-06-01"
@@ -54,15 +54,15 @@ function initializeLlmProviderConfigs() {
   )
   initializeLlmProviderConfig claude claude CLAUDE api.anthropic.com "443" "https" "" "PRE" "claude-" "${EXTRA_CONFIGS[@]}"
 
-  # if [ -z "$OLLAMA_SERVER_HOST" ]; then
-  #   OLLAMA_SERVER_HOST="YOUR_OLLAMA_SERVER_HOST"
-  # fi
-  # OLLAMA_SERVER_PORT="${OLLAMA_SERVER_PORT:-11434}"
-  # EXTRA_CONFIGS=(
-  #   "ollamaServerHost=\"$OLLAMA_SERVER_HOST\""
-  #   "ollamaServerPort=$OLLAMA_SERVER_PORT"
-  # )
-  # initializeLlmProviderConfig ollama ollama OLLAMA "$OLLAMA_SERVER_HOST" "$OLLAMA_SERVER_PORT" "http" "" "PRE" "" "${EXTRA_CONFIGS[@]}"
+  if [ -z "$OLLAMA_SERVER_HOST" ]; then
+    OLLAMA_SERVER_HOST="YOUR_OLLAMA_SERVER_HOST"
+  fi
+  OLLAMA_SERVER_PORT="${OLLAMA_SERVER_PORT:-11434}"
+  EXTRA_CONFIGS=(
+    "ollamaServerHost=\"$OLLAMA_SERVER_HOST\""
+    "ollamaServerPort=$OLLAMA_SERVER_PORT"
+  )
+  initializeLlmProviderConfig ollama ollama OLLAMA "$OLLAMA_SERVER_HOST" "$OLLAMA_SERVER_PORT" "http" "" "REGULAR" 'codellama.*|llama.*' "${EXTRA_CONFIGS[@]}"
 
   EXTRA_CONFIGS=(
     "minimaxGroupId=\"$MINIMAX_GROUP_ID\""