Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-29 19:59:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore: deprecate embeddingsOnly search (#283217)

Browse Source
This commit is contained in:
Raymond Zhao
2025-12-12 15:42:42 -08:00
committed by GitHub
parent c11cb509af
commit f6ef5e6d7f
4 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts
+5 -6
View File
@@ -20,7 +20,7 @@ import { IAiSettingsSearchService } from '../../../services/aiSettingsSearch/com
import { IWorkbenchExtensionEnablementService } from '../../../services/extensionManagement/common/extensionManagement.js';
import { IGroupFilter, ISearchResult, ISetting, ISettingMatch, ISettingMatcher, ISettingsEditorModel, ISettingsGroup, SettingKeyMatchTypes, SettingMatchType } from '../../../services/preferences/common/preferences.js';
import { nullRange } from '../../../services/preferences/common/preferencesModels.js';
import { EMBEDDINGS_ONLY_SEARCH_PROVIDER_NAME, EMBEDDINGS_SEARCH_PROVIDER_NAME, IAiSearchProvider, IPreferencesSearchService, IRemoteSearchProvider, ISearchProvider, IWorkbenchSettingsConfiguration, LLM_RANKED_SEARCH_PROVIDER_NAME, STRING_MATCH_SEARCH_PROVIDER_NAME, TF_IDF_SEARCH_PROVIDER_NAME } from '../common/preferences.js';
import { EMBEDDINGS_SEARCH_PROVIDER_NAME, IAiSearchProvider, IPreferencesSearchService, IRemoteSearchProvider, ISearchProvider, IWorkbenchSettingsConfiguration, LLM_RANKED_SEARCH_PROVIDER_NAME, STRING_MATCH_SEARCH_PROVIDER_NAME, TF_IDF_SEARCH_PROVIDER_NAME } from '../common/preferences.js';
export interface IEndpointDetails {
urlBase?: string;
@@ -409,8 +409,7 @@ class EmbeddingsSearchProvider implements IRemoteSearchProvider {
private _filter: string = '';
constructor(
private readonly _aiSettingsSearchService: IAiSettingsSearchService,
private readonly _excludeSelectionStep: boolean
private readonly _aiSettingsSearchService: IAiSettingsSearchService
) {
this._recordProvider = new SettingsRecordProvider();
}
@@ -425,7 +424,7 @@ class EmbeddingsSearchProvider implements IRemoteSearchProvider {
}
this._recordProvider.updateModel(preferencesModel);
this._aiSettingsSearchService.startSearch(this._filter, this._excludeSelectionStep, token);
this._aiSettingsSearchService.startSearch(this._filter, token);
return {
filterMatches: await this.getEmbeddingsItems(token),
@@ -441,7 +440,7 @@ class EmbeddingsSearchProvider implements IRemoteSearchProvider {
return [];
}
const providerName = this._excludeSelectionStep ? EMBEDDINGS_ONLY_SEARCH_PROVIDER_NAME : EMBEDDINGS_SEARCH_PROVIDER_NAME;
const providerName = EMBEDDINGS_SEARCH_PROVIDER_NAME;
for (const settingKey of settings) {
if (filterMatches.length === EmbeddingsSearchProvider.EMBEDDINGS_SETTINGS_SEARCH_MAX_PICKS) {
break;
@@ -589,7 +588,7 @@ class AiSearchProvider implements IAiSearchProvider {
constructor(
@IAiSettingsSearchService private readonly aiSettingsSearchService: IAiSettingsSearchService
) {
this._embeddingsSearchProvider = new EmbeddingsSearchProvider(this.aiSettingsSearchService, false);
this._embeddingsSearchProvider = new EmbeddingsSearchProvider(this.aiSettingsSearchService);
this._recordProvider = new SettingsRecordProvider();
}
src/vs/workbench/contrib/preferences/common/preferences.ts
-1
View File
@@ -117,7 +117,6 @@ export const EXTENSION_FETCH_TIMEOUT_MS = 1000;
export const STRING_MATCH_SEARCH_PROVIDER_NAME = 'local';
export const TF_IDF_SEARCH_PROVIDER_NAME = 'tfIdf';
export const FILTER_MODEL_SEARCH_PROVIDER_NAME = 'filterModel';
export const EMBEDDINGS_ONLY_SEARCH_PROVIDER_NAME = 'embeddingsOnly';
export const EMBEDDINGS_SEARCH_PROVIDER_NAME = 'embeddingsFull';
export const LLM_RANKED_SEARCH_PROVIDER_NAME = 'llmRanked';
src/vs/workbench/services/aiSettingsSearch/common/aiSettingsSearch.ts
+1 -1
View File
@@ -33,7 +33,7 @@ export interface IAiSettingsSearchService {
// Called from the Settings editor
isEnabled(): boolean;
startSearch(query: string, embeddingsOnly: boolean, token: CancellationToken): void;
startSearch(query: string, token: CancellationToken): void;
getEmbeddingsResults(query: string, token: CancellationToken): Promise<string[] | null>;
getLLMRankedResults(query: string, token: CancellationToken): Promise<string[] | null>;
src/vs/workbench/services/aiSettingsSearch/common/aiSettingsSearchService.ts
+2 -2
View File
@@ -38,7 +38,7 @@ export class AiSettingsSearchService extends Disposable implements IAiSettingsSe
};
}
startSearch(query: string, embeddingsOnly: boolean, token: CancellationToken): void {
startSearch(query: string, token: CancellationToken): void {
if (!this.isEnabled()) {
throw new Error('No settings search providers registered');
}
@@ -46,7 +46,7 @@ export class AiSettingsSearchService extends Disposable implements IAiSettingsSe
this._embeddingsResultsPromises.delete(query);
this._llmRankedResultsPromises.delete(query);
this._providers.forEach(provider => provider.searchSettings(query, { limit: AiSettingsSearchService.MAX_PICKS, embeddingsOnly }, token));
this._providers.forEach(provider => provider.searchSettings(query, { limit: AiSettingsSearchService.MAX_PICKS, embeddingsOnly: false }, token));
}
async getEmbeddingsResults(query: string, token: CancellationToken): Promise<string[] | null> {