feat: Add ai-proxy config template support to the AiO image (higress-…

…group#80)
CH3CHO · May 9, 2024 · 79ce26c · 79ce26c
1 parent 7601765
commit 79ce26c
Show file tree

Hide file tree

Showing 5 changed files with 253 additions and 4 deletions.
diff --git a/all-in-one/Dockerfile b/all-in-one/Dockerfile
@@ -51,7 +51,7 @@ COPY ./supervisord/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 # Initialize configurations
 COPY ./meshConfig /etc/istio/config
 COPY ./gateway/podinfo /etc/istio/pod
-COPY ./scripts/*.* /usr/local/bin
+COPY ./scripts /usr/local/bin
 COPY ./apiserver/config /app/kubeconfig
 COPY ./config /opt/data/defaultConfig
 

diff --git a/all-in-one/config/mcpbridges/default.yaml b/all-in-one/config/mcpbridges/default.yaml
@@ -7,8 +7,9 @@ metadata:
   resourceVersion: "1"
 spec:
   registries:
-  - domain: 127.0.0.1:8080
+  - domain: 127.0.0.1:8001
     name: higress-console
     port: 80
     type: static
+  # INSERTION_POINT
 status: {}
diff --git a/all-in-one/scripts/config-template/ai-proxy.sh b/all-in-one/scripts/config-template/ai-proxy.sh
@@ -0,0 +1,238 @@
+#!/bin/bash
+
+AZ_PROXY_VERSION=${AI_PROXY_VERSION:-0.0.1}
+
+if [ -n "$AZURE_OPENAI_SERVICE_URL" ]; then
+    AZURE_OPENAI_SERVICE_DOMAIN=$(echo "$AZURE_OPENAI_SERVICE_URL" | awk -F[/:] '{print $4}')
+else
+    AZURE_OPENAI_SERVICE_DOMAIN="YOUR_RESOURCE_NAME.openai.azure.com"
+fi
+
+function initializeWasmPlugins() {
+    mkdir -p /data/wasmplugins
+    WASM_PLUGIN_CONFIG_FILE="/data/wasmplugins/ai-proxy-$AZ_PROXY_VERSION.yaml"
+
+    if [ -f "$WASM_PLUGIN_CONFIG_FILE" ]; then
+        return
+    fi
+
+    cat <<EOF > "$WASM_PLUGIN_CONFIG_FILE"
+apiVersion: extensions.higress.io/v1alpha1
+kind: WasmPlugin
+metadata:
+  annotations:
+    higress.io/wasm-plugin-title: AI Proxy
+  labels:
+    higress.io/resource-definer: higress
+    higress.io/wasm-plugin-built-in: "false"
+    higress.io/wasm-plugin-category: custom
+    higress.io/wasm-plugin-name: ai-proxy
+    higress.io/wasm-plugin-version: $AZ_PROXY_VERSION
+  name: ai-proxy-$AZ_PROXY_VERSION
+  namespace: higress-system
+spec:
+  defaultConfig: {}
+  defaultConfigDisable: true
+  matchRules:
+  - config:
+      provider:
+        type: qwen
+        apiToken: "${DASHSCOPE_API_KEY:-YOUR_DASHSCOPE_API_KEY}"
+        modelMapping:
+          '*': "qwen-turbo"
+          'gpt-3': "qwen-turbo"
+          'gpt-35-turbo': "qwen-plus"
+          'gpt-4-turbo': "qwen-max"
+    configDisable: false
+    ingress:
+    - qwen
+  - config:
+      provider:
+        type: azure
+        apiToken: "${AZURE_OPENAI_API_KEY:-YOUR_AZURE_OPENAI_API_KEY}"
+        azureServiceUrl: "${AZURE_OPENAI_SERVICE_URL:-https://YOUR_RESOURCE_NAME.openai.azure.com/openai/deployments/YOUR_DEPLOYMENT_NAME/chat/completions?api-version=2024-02-01}"
+    configDisable: false
+    ingress:
+    - azure-openai
+  - config:
+      provider:
+        type: openai
+        apiToken: "${OPENAI_API_KEY:-YOUR_OPENAI_API_KEY}"
+    configDisable: false
+    ingress:
+    - openai
+  - config:
+      provider:
+        type: moonshot
+        apiToken: "${MOONSHOT_API_KEY:-YOUR_MOONSHOT_API_KEY}"
+        modelMapping:
+          '*': "moonshot-v1-8k"
+          'gpt-3': "moonshot-v1-8k"
+          'gpt-35-turbo': "moonshot-v1-32k"
+          'gpt-4-turbo': "moonshot-v1-128k"
+    configDisable: false
+    ingress:
+    - moonshot
+  phase: UNSPECIFIED_PHASE
+  priority: "100"
+  #url: oci://higress-registry.cn-hangzhou.cr.aliyuncs.com/plugins/ai-proxy:$AZ_PROXY_VERSION
+  url: oci://docker.io/ch3cho/ai-proxy:$AZ_PROXY_VERSION
+EOF
+}
+
+function initializeMcpBridge() {
+    read -r -d '' AI_REGISTRIES <<EOF
+  - domain: api.moonshot.cn
+    name: moonshot
+    port: 443
+    type: dns
+  - domain: $AZURE_OPENAI_SERVICE_DOMAIN
+    name: azure-openai
+    port: 443
+    type: dns
+  - domain: dashscope.aliyuncs.com
+    name: qwen
+    port: 443
+    type: dns
+  - domain: api.openai.com
+    name: openai
+    port: 443
+    type: dns
+EOF
+    cd /data/mcpbridges
+    awk -v r="$AI_REGISTRIES" '{gsub(/# INSERTION_POINT/,r)}1' default.yaml > default-new.yaml
+    mv default-new.yaml default.yaml
+    cd -
+}
+
+function initializeIngresses() {
+    mkdir -p /data/ingresses
+
+    if [ ! -f /data/ingresses/qwen.yaml ]; then
+        cat <<EOF > /data/ingresses/qwen.yaml
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  annotations:
+    higress.io/backend-protocol: HTTPS
+    higress.io/destination: qwen.dns
+    higress.io/exact-match-header-Authorization: Bearer qwen
+    higress.io/ignore-path-case: "false"
+    higress.io/proxy-ssl-name: dashscope.aliyuncs.com
+    higress.io/proxy-ssl-server-name: "on"
+  labels:
+    higress.io/resource-definer: higress
+  name: qwen
+  namespace: higress-system
+spec:
+  ingressClassName: higress
+  rules:
+  - http:
+      paths:
+      - backend:
+          resource:
+            apiGroup: networking.higress.io
+            kind: McpBridge
+            name: default
+        path: /
+        pathType: Prefix
+EOF
+    fi
+
+    if [ ! -f /data/ingresses/moonshot.yaml ]; then
+        cat <<EOF > /data/ingresses/moonshot.yaml
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  annotations:
+    higress.io/backend-protocol: HTTPS
+    higress.io/destination: moonshot.dns
+    higress.io/exact-match-header-Authorization: Bearer moonshot
+    higress.io/ignore-path-case: "false"
+    higress.io/proxy-ssl-name: api.moonshot.cn
+    higress.io/proxy-ssl-server-name: "on"
+  labels:
+    higress.io/resource-definer: higress
+  name: moonshot
+  namespace: higress-system
+spec:
+  ingressClassName: higress
+  rules:
+  - http:
+      paths:
+      - backend:
+          resource:
+            apiGroup: networking.higress.io
+            kind: McpBridge
+            name: default
+        path: /
+        pathType: Prefix
+EOF
+    fi
+
+    if [ ! -f /data/ingresses/azure-openai.yaml ]; then
+        cat <<EOF > /data/ingresses/azure-openai.yaml
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  annotations:
+    higress.io/backend-protocol: HTTPS
+    higress.io/destination: azure-openai.dns
+    higress.io/exact-match-header-Authorization: Bearer azure-openai
+    higress.io/ignore-path-case: "false"
+    higress.io/proxy-ssl-name: $AZURE_OPENAI_SERVICE_DOMAIN
+    higress.io/proxy-ssl-server-name: "on"
+  labels:
+    higress.io/resource-definer: higress
+  name: azure-openai
+  namespace: higress-system
+spec:
+  ingressClassName: higress
+  rules:
+  - http:
+      paths:
+      - backend:
+          resource:
+            apiGroup: networking.higress.io
+            kind: McpBridge
+            name: default
+        path: /
+        pathType: Prefix
+EOF
+    fi
+
+    if [ ! -f /data/ingresses/openai.yaml ]; then
+        cat <<EOF > /data/ingresses/openai.yaml
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  annotations:
+    higress.io/backend-protocol: HTTPS
+    higress.io/destination: openai.dns
+    higress.io/exact-match-header-Authorization: Bearer openai
+    higress.io/ignore-path-case: "false"
+    higress.io/proxy-ssl-name: api.openai.com
+    higress.io/proxy-ssl-server-name: "on"
+  labels:
+    higress.io/resource-definer: higress
+  name: openai
+  namespace: higress-system
+spec:
+  ingressClassName: higress
+  rules:
+  - http:
+      paths:
+      - backend:
+          resource:
+            apiGroup: networking.higress.io
+            kind: McpBridge
+            name: default
+        path: /
+        pathType: Prefix
+EOF
+    fi
+}
+
+initializeWasmPlugins
+initializeMcpBridge
+initializeIngresses
diff --git a/all-in-one/scripts/start-apiserver.sh b/all-in-one/scripts/start-apiserver.sh
@@ -12,4 +12,14 @@ if [ "$ENABLE_CONSOLE_ROUTE" != "1" ]; then
 fi
 cp -rn /opt/data/defaultConfig/* /data
 
+if [ -n "$CONFIG_TEMPLATE" ]; then
+    TEMPLATE_SCRIPT="$ROOT/config-template/$CONFIG_TEMPLATE.sh"
+    if [ -f "$TEMPLATE_SCRIPT" ]; then
+        /bin/bash "$TEMPLATE_SCRIPT"
+    else
+        echo "Unknown config template: $CONFIG_TEMPLATE"
+        exit 1
+    fi
+fi
+
 apiserver --bind-address 127.0.0.1 --secure-port 18443 --storage file --file-root-dir /data --cert-dir /tmp
diff --git a/all-in-one/scripts/start-gateway.sh b/all-in-one/scripts/start-gateway.sh
@@ -20,7 +20,7 @@ createDir /var/lib/istio/data
 
 /usr/local/bin/pilot-agent proxy router \
     --domain=higress-system.svc.cluster.local \
-    --proxyLogLevel=warning \
-    --proxyComponentLogLevel=misc:error \
+    --proxyLogLevel=${GATEWAY_LOG_LEVEL:-warning} \
+    --proxyComponentLogLevel=${GATEWAY_COMPONENT_LOG_LEVEL:-misc:error} \
     --log_output_level=all:info \
     --serviceCluster=higress-gateway