Commit 719c0a8
committed
Add auto-fetching of available models from the DashScope API and
display them alongside the 8 static presets. Bundle the full set of
provider improvements, wiring, and tests from the bailian feature
branch.
## Dynamic Model Fetching
- packages/types/src/provider-settings.ts — register "bailian" in
the dynamicProviders array so the model cache pipeline routes
fetch requests
- packages/types/src/providers/bailian.ts — correct contextWindow
from 1,048,576 to 1,000,000 for the 5 models with a 1M-token
product specification; expand single-line pricing and cache-price
fields to multi-line for readability
- src/api/providers/fetchers/bailian.ts — getBailianModels() fetcher
calling DashScope /models via the standard OpenAI-compatible
endpoint; case-insensitive exact/substring preset matching (e.g.
"ZHIPU/GLM-5.1" matches preset "glm-5.1"); text-model keyword
filter excluding image, embedding, speech, video, and OCR models;
conservative defaults (8192 maxTokens, 128K context, no pricing)
for unknown models; 10s AbortController timeout; error detail
forwarded in thrown Error; error-body logging truncated to 500
characters
- src/api/providers/fetchers/modelCache.ts — add "bailian" case to
fetchModelsFromProvider() switch with exhaustive type enforcement
- src/core/webview/webviewMessageHandler.ts — add bailian candidate
block to requestRouterModels, conditional on bailianApiKey;
try/catch wrapper around getBailianBaseUrl to skip model fetch
when Frankfurt or Hong Kong is selected without a workspaceId;
flush cached models regardless of whether the key came from the
current webview message or stored configuration; use instanceof
Error for safe type-checking in the catch block
- src/shared/api.ts — add bailian entry to dynamicProviderExtras
with optional apiKey and baseUrl fields
- webview-ui/src/components/settings/providers/Bailian.tsx — accept
RouterModels prop; merge API-fetched models with static presets
(static overwrites matching keys); pass the merged collection to
ModelPicker; use Object.hasOwn for isCustomModel detection; trim
model IDs so whitespace from UI input does not cause false
custom-model detection
- webview-ui/src/components/settings/ApiOptions.tsx — pass routerModels
to the Bailian component
- webview-ui/src/utils/__tests__/validate.spec.ts — add bailian: {}
entry to the mock RouterModels fixture for exhaustiveness
## Provider Hardening
- src/api/providers/bailian.ts — rewrite getModel() as a three-tier
lookup (static presets → API-fetched cache → custom model fallback)
via getModelsFromCache; trim model IDs at the handler level so
whitespace never reaches downstream lookups; canonicalize versioned
and named-space API variants (e.g. "qwen3.7-max-2026-05-17",
"kimi/kimi-k2.6") via findMatchingPreset before pricing lookup
so every variant receives region-correct pricing; always merge
user-configured custom model overrides regardless of whether the
model ID matches a preset; remove sentinel "..." text injection
for image-only messages in addPromptCaching
- src/api/providers/bailian-region.ts — getBailianBaseUrl() shared
utility consolidating the REGION_URLS map, workspaceId validation
for Frankfurt and Hong Kong, and a console.warn when an unknown
region string is provided before falling back to Beijing; eliminates
duplicate logic previously in the handler constructor and
webviewMessageHandler
## Tests
- src/api/providers/__tests__/bailian.spec.ts — 35 handler tests
- src/api/providers/fetchers/__tests__/bailian.spec.ts — 24 fetcher
tests (exact/substring/no-match matching, filtering, error handling,
edge cases including network failure, AbortSignal, and non-string
model IDs)
- webview-ui/src/components/settings/providers/__tests__/Bailian.spec.tsx
— 5 UI merge tests (static-override priority, API-only model inclusion,
isCustomModel detection with merged collection, whitespace trim)
- apps/vscode-e2e/src/suite/providers/bailian.test.ts — E2E smoke
test with fetch-interceptor pattern
- apps/vscode-e2e/fixtures/bailian.json — empty fixture scaffolding
Closes #420. See #421.
1 parent ef6b1f9 commit 719c0a8
17 files changed
Lines changed: 1656 additions & 157 deletions
File tree
- apps/vscode-e2e
- fixtures
- src/suite/providers
- packages/types/src
- providers
- src
- api/providers
- __tests__
- fetchers
- __tests__
- core/webview
- webview-ui/src
- components
- settings
- providers
- __tests__
- ui/hooks
- utils/__tests__
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
| 261 | + | |
| 262 | + | |
| 263 | + | |
| 264 | + | |
| 265 | + | |
| 266 | + | |
| 267 | + | |
| 268 | + | |
| 269 | + | |
| 270 | + | |
| 271 | + | |
| 272 | + | |
| 273 | + | |
| 274 | + | |
| 275 | + | |
| 276 | + | |
| 277 | + | |
| 278 | + | |
| 279 | + | |
| 280 | + | |
| 281 | + | |
| 282 | + | |
| 283 | + | |
| 284 | + | |
| 285 | + | |
| 286 | + | |
| 287 | + | |
| 288 | + | |
| 289 | + | |
| 290 | + | |
| 291 | + | |
| 292 | + | |
| 293 | + | |
| 294 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
44 | 44 | | |
45 | 45 | | |
46 | 46 | | |
| 47 | + | |
47 | 48 | | |
48 | 49 | | |
49 | 50 | | |
| |||
353 | 354 | | |
354 | 355 | | |
355 | 356 | | |
356 | | - | |
| 357 | + | |
| 358 | + | |
| 359 | + | |
| 360 | + | |
| 361 | + | |
| 362 | + | |
| 363 | + | |
| 364 | + | |
| 365 | + | |
| 366 | + | |
357 | 367 | | |
358 | 368 | | |
359 | 369 | | |
| |||
0 commit comments