Skip to content

Commit 74bf9ab

Browse files
committed
Update config, Dockerfiles, and grafana settings
1 parent 4e2ee29 commit 74bf9ab

File tree

6 files changed

+419
-13
lines changed

6 files changed

+419
-13
lines changed

config/config.yaml

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,17 +45,28 @@ prompt_guard:
4545
# Supported formats: 127.0.0.1, 192.168.1.1, ::1, 2001:db8::1
4646
# NOT supported: domain names (example.com), protocol prefixes (http://), paths (/api), ports in address (use 'port' field)
4747
vllm_endpoints:
48-
- name: "endpoint1"
49-
address: "172.28.0.20" # Static IPv4 of llm-katan within docker compose network
50-
port: 8002
51-
weight: 1
48+
- name: "math-endpoint"
49+
address: "172.28.0.30" # 数学模型服务器 IP
50+
port: 8006 # 数学模型端口
51+
weight: 1
52+
53+
- name: "text-endpoint"
54+
address: "172.28.0.30" # 文字模型服务器 IP
55+
port: 8007 # 文字模型端口
56+
weight: 1
5257

53-
model_config:
54-
"qwen3":
55-
reasoning_family: "qwen3" # This model uses Qwen-3 reasoning syntax
56-
preferred_endpoints: ["endpoint1"] # Optional: omit to let upstream handle endpoint selection
57-
pii_policy:
58-
allow_by_default: true
58+
model_config:
59+
"DeepSeek-R1-Distill-Qwen-7B":
60+
reasoning_family: "deepseek" # DeepSeek 使用 deepseek reasoning 语法
61+
preferred_endpoints: ["math-endpoint"]
62+
pii_policy:
63+
allow_by_default: true
64+
65+
"qwen3":
66+
reasoning_family: "qwen3" # Qwen3 使用 qwen3 reasoning 语法
67+
preferred_endpoints: ["text-endpoint"]
68+
pii_policy:
69+
allow_by_default: true
5970

6071
# Classifier configuration
6172
classifier:
@@ -139,7 +150,7 @@ categories:
139150
- name: math
140151
system_prompt: "You are a mathematics expert. Provide step-by-step solutions, show your work clearly, and explain mathematical concepts in an understandable way."
141152
model_scores:
142-
- model: qwen3
153+
- model: DeepSeek-R1-Distill-Qwen-7B
143154
score: 1.0
144155
use_reasoning: true # Enable reasoning for complex math
145156
- name: physics

dashboard/Dockerfile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Build frontend
22
FROM node:18-alpine AS frontend-builder
3+
ENV http_proxy=http://proxy.iil.intel.com:911
4+
ENV https_proxy=http://proxy.iil.intel.com:911
35
WORKDIR /app/frontend
46
COPY frontend/package*.json ./
57
RUN npm ci
@@ -8,6 +10,8 @@ RUN npm run build
810

911
# Build backend
1012
FROM golang:1.21-alpine AS backend-builder
13+
ENV http_proxy=http://proxy.iil.intel.com:911
14+
ENV https_proxy=http://proxy.iil.intel.com:911
1115
WORKDIR /app/backend
1216
COPY backend/go.* ./
1317
RUN go mod download
@@ -16,6 +20,8 @@ RUN CGO_ENABLED=0 GOOS=linux go build -o dashboard-server .
1620

1721
# Final image
1822
FROM alpine:3.18
23+
ENV http_proxy=http://proxy.iil.intel.com:911
24+
ENV https_proxy=http://proxy.iil.intel.com:911
1925
RUN apk add --no-cache ca-certificates
2026
WORKDIR /app
2127
COPY --from=backend-builder /app/backend/dashboard-server .

dashboard/backend/Dockerfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Stage 1: Build frontend with Node.js
22
FROM node:20-alpine AS frontend-builder
3+
ENV http_proxy=http://proxy.iil.intel.com:911
4+
ENV https_proxy=http://proxy.iil.intel.com:911
35
WORKDIR /app/frontend
46
COPY dashboard/frontend/package.json dashboard/frontend/package-lock.json dashboard/frontend/tsconfig.json dashboard/frontend/tsconfig.node.json dashboard/frontend/vite.config.ts ./
57
COPY dashboard/frontend/src ./src
@@ -11,7 +13,8 @@ RUN npm run build
1113
# Stage 2: Build backend with Go
1214
FROM golang:1.24 AS backend-builder
1315
WORKDIR /app
14-
16+
ENV http_proxy=http://proxy.iil.intel.com:911
17+
ENV https_proxy=http://proxy.iil.intel.com:911
1518
# Use Chinese Go proxy to avoid network timeout issues
1619
ENV GOPROXY=https://goproxy.cn,direct
1720
ENV GOSUMDB=sum.golang.google.cn
@@ -31,6 +34,8 @@ RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -ldflags="-w -s
3134

3235
# Stage 3: Final runtime image
3336
FROM alpine:3.19
37+
ENV http_proxy=http://proxy.iil.intel.com:911
38+
ENV https_proxy=http://proxy.iil.intel.com:911
3439
RUN apk --no-cache add ca-certificates wget
3540
WORKDIR /app
3641
COPY --from=backend-builder /app/dashboard-backend /app/dashboard-backend

deploy/docker-compose/addons/grafana.ini

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ enabled = false
3636

3737
[server]
3838
# Configure root URL
39-
root_url = %(protocol)s://%(domain)s:%(http_port)s/
39+
# root_url = %(protocol)s://%(domain)s:%(http_port)s/
40+
root_url = http://10.112.229.41:8700/embedded/grafana/
4041

4142
# Disable serving from sub path
4243
serve_from_sub_path = false

0 commit comments

Comments
 (0)