Skip to content

avoid infinite recursion from missing model #302557

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
amunger wants to merge 1 commit into from
Closed

avoid infinite recursion from missing model #302557

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/vs/workbench/api/common/extHostLanguageModels.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,13 +376,13 @@ export class ExtHostLanguageModels implements ExtHostLanguageModelsShape {
return this.getLanguageModelByIdentifier(extension, defaultModelId);
}

async getLanguageModelByIdentifier(extension: IExtensionDescription, modelId: string | undefined): Promise<vscode.LanguageModelChat | undefined> {
async getLanguageModelByIdentifier(extension: IExtensionDescription, modelId: string | undefined, resolveIfMissing: boolean = true): Promise<vscode.LanguageModelChat | undefined> {
if (!modelId) {
return undefined;
}

let model = this._localModels.get(modelId);
if (!model) {
if (!model && resolveIfMissing) {
// model gone? is this an error on us? Try to resolve model again
this._logService.warn(`[LanguageModelProxy](${extension.identifier.value}) Could not find model '${modelId}' in local cache. Trying to resolve model again.`);
const vendor = this.getVendorFromModelIdentifier(modelId);
Expand All @@ -396,6 +396,9 @@ export class ExtHostLanguageModels implements ExtHostLanguageModelsShape {
this._logService.warn(`[LanguageModelProxy](${extension.identifier.value}) Could not find model '${modelId}' in local cache after re-resolving models.`);
return undefined;
}
} else if (!model) {
this._logService.warn(`[LanguageModelProxy](${extension.identifier.value}) Could not find model '${modelId}' in local cache.`);
return undefined;
}

// make sure auth information is correct
Expand Down Expand Up @@ -445,7 +448,8 @@ export class ExtHostLanguageModels implements ExtHostLanguageModelsShape {

const result: vscode.LanguageModelChat[] = [];

const modelPromises = models.map(identifier => this.getLanguageModelByIdentifier(extension, identifier));
// don't attempt to resolve again or we will go in a loop
const modelPromises = models.map(identifier => this.getLanguageModelByIdentifier(extension, identifier, false));
const modelResults = await Promise.all(modelPromises);
for (const model of modelResults) {
if (model) {
Expand Down
Loading