Skip to content

Commit bcc2c6f

Browse files
authored
Merge branch 'main' into 1013-yuluo/ut-tls
2 parents 0d0f7e2 + 45240d8 commit bcc2c6f

File tree

85 files changed

+622
-626
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+622
-626
lines changed

.github/workflows/pre-commit.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ jobs:
4848
pkg-config
4949
npm install -g markdownlint-cli
5050
pip install --user yamllint codespell
51+
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/HEAD/install.sh | sh -s -- -b $(go env GOPATH)/bin v2.5.0
5152
5253
- name: Cache Rust dependencies
5354
uses: actions/cache@v4

.github/workflows/test-and-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ jobs:
3232
make \
3333
build-essential \
3434
pkg-config
35+
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/HEAD/install.sh | sh -s -- -b $(go env GOPATH)/bin v2.5.0
3536
3637
- name: Cache Rust dependencies
3738
uses: actions/cache@v4
@@ -74,7 +75,6 @@ jobs:
7475
run: |
7576
pip install -U "huggingface_hub[cli]" hf_transfer
7677
77-
7878
- name: Download models (minimal on PRs)
7979
env:
8080
CI_MINIMAL_MODELS: ${{ github.event_name == 'pull_request' }}

.pre-commit-config.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,15 @@ repos:
2222
language: system
2323
files: \.go$
2424

25+
- repo: local
26+
hooks:
27+
- id: golang-lint
28+
name: go lint
29+
entry: make go-lint
30+
language: system
31+
files: \.go$
32+
pass_filenames: false
33+
2534
# Markdown specific hooks
2635
- repo: local
2736
hooks:

Dockerfile.precommit

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,6 @@ RUN pip install --break-system-packages yamllint
2929

3030
# CodeSpell
3131
RUN pip install --break-system-packages codespell
32+
33+
# Golangci-lint
34+
RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/HEAD/install.sh | sh -s -- -b $(go env GOPATH)/bin v2.5.0

config/config-mcp-classifier-example.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,6 @@ vllm_endpoints:
7575
- name: endpoint1
7676
address: 127.0.0.1
7777
port: 8000
78-
models:
79-
- openai/gpt-oss-20b
8078
weight: 1
8179
health_check_path: /health
8280

config/config.development.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ vllm_endpoints:
2929
- name: "local-endpoint"
3030
address: "127.0.0.1"
3131
port: 8000
32-
models:
33-
- "test-model"
3432
weight: 1
3533

3634
model_config:

config/config.e2e.yaml

Lines changed: 19 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,11 @@ vllm_endpoints:
4242
- name: "qwen-endpoint"
4343
address: "127.0.0.1"
4444
port: 8000
45-
models:
46-
- "Model-A"
4745
weight: 1
4846
health_check_path: "/health"
4947
- name: "tinyllama-endpoint"
5048
address: "127.0.0.1"
5149
port: 8001
52-
models:
53-
- "Model-B"
5450
weight: 1
5551
health_check_path: "/health"
5652

@@ -86,187 +82,175 @@ classifier:
8682
pii_mapping_path: "models/pii_classifier_modernbert-base_presidio_token_model/pii_type_mapping.json"
8783
categories:
8884
- name: business
89-
use_reasoning: false
90-
reasoning_description: "Business content is typically conversational"
91-
reasoning_effort: low # Business conversations need low reasoning effort
9285
model_scores:
9386
- model: "Model-A"
9487
score: 0.8
9588
use_reasoning: false
89+
reasoning_description: "Business content is typically conversational"
90+
reasoning_effort: low
9691
- model: "Model-B"
9792
score: 0.4
9893
use_reasoning: false
9994
- model: "Model-A"
10095
score: 0.2
10196
use_reasoning: false
10297
- name: law
103-
use_reasoning: false
104-
reasoning_description: "Legal content is typically explanatory"
10598
model_scores:
10699
- model: "Model-B"
107100
score: 0.8
108101
use_reasoning: false
102+
reasoning_description: "Legal content is typically explanatory"
109103
- model: "Model-A"
110104
score: 0.6
111105
use_reasoning: false
112106
- model: "Model-A"
113107
score: 0.4
114108
use_reasoning: false
115109
- name: psychology
116-
use_reasoning: false
117-
reasoning_description: "Psychology content is usually explanatory"
118110
model_scores:
119111
- model: "Model-A"
120112
score: 0.6
121113
use_reasoning: false
114+
reasoning_description: "Psychology content is usually explanatory"
122115
- model: "Model-B"
123116
score: 0.4
124117
use_reasoning: false
125118
- model: "Model-A"
126119
score: 0.4
127120
use_reasoning: false
128121
- name: biology
129-
use_reasoning: true
130-
reasoning_description: "Biological processes benefit from structured analysis"
131122
model_scores:
132123
- model: "Model-A"
133124
score: 0.8
134125
use_reasoning: false
126+
reasoning_description: "Biological processes benefit from structured analysis"
135127
- model: "Model-B"
136128
score: 0.6
137129
use_reasoning: false
138130
- model: "Model-A"
139131
score: 0.2
140132
use_reasoning: false
141133
- name: chemistry
142-
use_reasoning: true
143-
reasoning_description: "Chemical reactions and formulas require systematic thinking"
144-
reasoning_effort: high # Chemistry requires high reasoning effort
145134
model_scores:
146135
- model: "Model-A"
147136
score: 0.8
148137
use_reasoning: true
138+
reasoning_description: "Chemical reactions and formulas require systematic thinking"
139+
reasoning_effort: high
149140
- model: "Model-B"
150141
score: 0.6
151142
use_reasoning: false
152143
- model: "Model-A"
153144
score: 0.6
154145
use_reasoning: false
155146
- name: history
156-
use_reasoning: false
157-
reasoning_description: "Historical content is narrative-based"
158147
model_scores:
159148
- model: "Model-A"
160149
score: 0.8
161150
use_reasoning: false
151+
reasoning_description: "Historical content is narrative-based"
162152
- model: "Model-A"
163153
score: 0.6
164154
use_reasoning: false
165155
- model: "Model-B"
166156
score: 0.4
167157
use_reasoning: false
168158
- name: other
169-
use_reasoning: false
170-
reasoning_description: "General content doesn't require reasoning"
171159
model_scores:
172160
- model: "Model-B"
173161
score: 0.8
174162
use_reasoning: false
163+
reasoning_description: "General content doesn't require reasoning"
175164
- model: "Model-A"
176165
score: 0.6
177166
use_reasoning: false
178167
- model: "Model-A"
179168
score: 0.6
180169
use_reasoning: false
181170
- name: health
182-
use_reasoning: false
183-
reasoning_description: "Health information is typically informational"
184171
model_scores:
185172
- model: "Model-B"
186173
score: 0.8
187174
use_reasoning: false
175+
reasoning_description: "Health information is typically informational"
188176
- model: "Model-A"
189177
score: 0.8
190178
use_reasoning: false
191179
- model: "Model-A"
192180
score: 0.6
193181
use_reasoning: false
194182
- name: economics
195-
use_reasoning: false
196-
reasoning_description: "Economic discussions are usually explanatory"
197183
model_scores:
198184
- model: "Model-B"
199185
score: 0.8
200186
use_reasoning: false
187+
reasoning_description: "Economic discussions are usually explanatory"
201188
- model: "Model-A"
202189
score: 0.8
203190
use_reasoning: false
204191
- model: "Model-A"
205192
score: 0.1
206193
use_reasoning: false
207194
- name: math
208-
use_reasoning: true
209-
reasoning_description: "Mathematical problems require step-by-step reasoning"
210-
reasoning_effort: high # Math problems need high reasoning effort
211195
model_scores:
212196
- model: "Model-B"
213197
score: 1.0
214198
use_reasoning: true
199+
reasoning_description: "Mathematical problems require step-by-step reasoning"
200+
reasoning_effort: high
215201
- model: "Model-A"
216202
score: 0.9
217203
use_reasoning: true
204+
reasoning_description: "Mathematical problems require step-by-step reasoning"
205+
reasoning_effort: high
218206
- model: "Model-A"
219207
score: 0.8
220208
use_reasoning: false
221209
- model: "Model-B"
222210
score: 0.6
223211
use_reasoning: false
224212
- name: physics
225-
use_reasoning: true
226-
reasoning_description: "Physics concepts need logical analysis"
227213
model_scores:
228214
- model: "Model-B"
229215
score: 0.4
230216
use_reasoning: true
217+
reasoning_description: "Physics concepts need logical analysis"
231218
- model: "Model-A"
232219
score: 0.4
233220
use_reasoning: false
234221
- model: "Model-A"
235222
score: 0.4
236223
use_reasoning: false
237224
- name: computer science
238-
use_reasoning: true
239-
reasoning_description: "Programming and algorithms need logical reasoning"
240225
model_scores:
241226
- model: "Model-B"
242227
score: 0.6
243228
use_reasoning: false
229+
reasoning_description: "Programming and algorithms need logical reasoning"
244230
- model: "Model-A"
245231
score: 0.6
246232
use_reasoning: false
247233
- model: "Model-A"
248234
score: 0.1
249235
use_reasoning: false
250236
- name: philosophy
251-
use_reasoning: false
252-
reasoning_description: "Philosophical discussions are conversational"
253237
model_scores:
254238
- model: "Model-A"
255239
score: 0.6
256240
use_reasoning: false
241+
reasoning_description: "Philosophical discussions are conversational"
257242
- model: "Model-B"
258243
score: 0.2
259244
use_reasoning: false
260245
- model: "Model-A"
261246
score: 0.2
262247
use_reasoning: false
263248
- name: engineering
264-
use_reasoning: true
265-
reasoning_description: "Engineering problems require systematic problem-solving"
266249
model_scores:
267250
- model: "Model-B"
268251
score: 0.6
269252
use_reasoning: false
253+
reasoning_description: "Engineering problems require systematic problem-solving"
270254
- model: "Model-A"
271255
score: 0.6
272256
use_reasoning: false

config/config.production.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ vllm_endpoints:
3434
- name: "endpoint1"
3535
address: "127.0.0.1"
3636
port: 8000
37-
models:
38-
- "openai/gpt-oss-20b"
3937
weight: 1
4038

4139
model_config:

config/config.recipe-accuracy.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ vllm_endpoints:
4444
- name: "endpoint1"
4545
address: "127.0.0.1"
4646
port: 8000
47-
models:
48-
- "openai/gpt-oss-20b"
4947
weight: 1
5048

5149
model_config:

config/config.recipe-latency.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ vllm_endpoints:
3939
- name: "endpoint1"
4040
address: "127.0.0.1"
4141
port: 8000
42-
models:
43-
- "openai/gpt-oss-20b"
4442
weight: 1
4543

4644
model_config:

0 commit comments

Comments
 (0)