Skip to content

Commit 58bc1a8

Browse files
fix: refine default model selection to include vendor check for 'copilot' (#299064)
* fix: refine default model selection to include vendor check for 'copilot' * fix tests * try this * fix these too
1 parent 45f5a18 commit 58bc1a8

4 files changed

Lines changed: 9 additions & 8 deletions

File tree

extensions/vscode-api-tests/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
"contributes": {
6969
"languageModelChatProviders": [
7070
{
71-
"vendor": "test-lm-vendor",
71+
"vendor": "copilot",
7272
"displayName": "Test LM Vendor"
7373
}
7474
],

extensions/vscode-api-tests/src/singlefolder-tests/chat.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ suite('chat', () => {
1717
disposables = [];
1818

1919
// Register a dummy default model which is required for a participant request to go through
20-
disposables.push(lm.registerLanguageModelChatProvider('test-lm-vendor', {
20+
disposables.push(lm.registerLanguageModelChatProvider('copilot', {
2121
async provideLanguageModelChatInformation(_options, _token) {
2222
return [{
2323
id: 'test-lm',

extensions/vscode-api-tests/src/singlefolder-tests/lm.test.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ suite('lm', function () {
4040
const defer = new DeferredPromise<void>();
4141

4242
try {
43-
disposables.push(vscode.lm.registerLanguageModelChatProvider('test-lm-vendor', {
43+
disposables.push(vscode.lm.registerLanguageModelChatProvider('copilot', {
4444
async provideLanguageModelChatInformation(_options, _token) {
4545
return [testProviderOptions];
4646
},
@@ -92,7 +92,7 @@ suite('lm', function () {
9292

9393
test('lm request fail', async function () {
9494

95-
disposables.push(vscode.lm.registerLanguageModelChatProvider('test-lm-vendor', {
95+
disposables.push(vscode.lm.registerLanguageModelChatProvider('copilot', {
9696
async provideLanguageModelChatInformation(_options, _token) {
9797
return [testProviderOptions];
9898
},
@@ -119,7 +119,7 @@ suite('lm', function () {
119119

120120
const defer = new DeferredPromise<void>();
121121

122-
disposables.push(vscode.lm.registerLanguageModelChatProvider('test-lm-vendor', {
122+
disposables.push(vscode.lm.registerLanguageModelChatProvider('copilot', {
123123
async provideLanguageModelChatInformation(_options, _token) {
124124
return [testProviderOptions];
125125
},
@@ -157,7 +157,7 @@ suite('lm', function () {
157157

158158
test('LanguageModelError instance is not thrown to extensions#235322 (SYNC)', async function () {
159159

160-
disposables.push(vscode.lm.registerLanguageModelChatProvider('test-lm-vendor', {
160+
disposables.push(vscode.lm.registerLanguageModelChatProvider('copilot', {
161161
async provideLanguageModelChatInformation(_options, _token) {
162162
return [testProviderOptions];
163163
},
@@ -183,7 +183,7 @@ suite('lm', function () {
183183

184184
test('LanguageModelError instance is not thrown to extensions#235322 (ASYNC)', async function () {
185185

186-
disposables.push(vscode.lm.registerLanguageModelChatProvider('test-lm-vendor', {
186+
disposables.push(vscode.lm.registerLanguageModelChatProvider('copilot', {
187187
async provideLanguageModelChatInformation(_options, _token) {
188188
return [testProviderOptions];
189189
},

src/vs/workbench/api/common/extHostLanguageModels.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,8 @@ export class ExtHostLanguageModels implements ExtHostLanguageModelsShape {
363363
}
364364

365365
for (const [modelIdentifier, modelData] of this._localModels) {
366-
if (modelData.metadata.isDefaultForLocation[ChatAgentLocation.Chat]) {
366+
// TODO: use product.json to determine default vendor
367+
if (modelData.metadata.isDefaultForLocation[ChatAgentLocation.Chat] && modelData.metadata.vendor === 'copilot') {
367368
defaultModelId = modelIdentifier;
368369
break;
369370
}

0 commit comments

Comments
 (0)