Skip to content

Avoid hardcoding external ingest embedding type #308873

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

Merged
mjbvz merged 2 commits into from
Apr 9, 2026
+26 −8
Merged

Avoid hardcoding external ingest embedding type #308873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a556f32
Avoid hardcoding external ingest embedding type
mjbvz Apr 9, 2026
7bb6eb7
Update extensions/copilot/src/platform/workspaceChunkSearch/node/code…
mjbvz Apr 9, 2026
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
2 changes: 1 addition & 1 deletion ...nsions/copilot/src/platform/workspaceChunkSearch/node/codeSearch/codeSearchChunkSearch.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,7 +662,7 @@ export class CodeSearchChunkSearch extends Disposable {
// Also force it to search the local diff too so we can can override stale code-search results.
await raceCancellationError(this._externalIngestIndex.value.updateForceIncludeFiles(diffArray, token), token);

const externalResult = await this._externalIngestIndex.value.search(sizing, query, innerTelemetryInfo.callTracker, token);
const externalResult = await this._externalIngestIndex.value.search(sizing, query, innerTelemetryInfo, token);
if (externalResult) {
const diffFilePattern = diffArray.map(uri => new RelativePattern(uri, '*'));
const filtered = externalResult.filter(x => shouldInclude(x.chunk.file, { include: diffFilePattern }));
Expand Down
32 changes: 25 additions & 7 deletions extensions/copilot/src/platform/workspaceChunkSearch/node/codeSearch/externalIngestIndex.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import * as fs from 'node:fs';
import sql from 'node:sqlite';
import { toErrorMessage } from '../../../../util/common/errorMessage';
import { Result } from '../../../../util/common/result';
import { CallTracker } from '../../../../util/common/telemetryCorrelationId';
import { CallTracker, TelemetryCorrelationId } from '../../../../util/common/telemetryCorrelationId';
import { coalesce } from '../../../../util/vs/base/common/arrays';
import { CancelablePromise, createCancelablePromise, Limiter, raceCancellationError, timeout } from '../../../../util/vs/base/common/async';
import { CancellationToken } from '../../../../util/vs/base/common/cancellation';
Expand Down Expand Up @@ -409,13 +409,13 @@ export class ExternalIngestIndex extends Disposable {
return updatePromise;
}

async search(sizing: StrategySearchSizing, query: WorkspaceChunkQueryWithEmbeddings, inCallTracker: CallTracker, token: CancellationToken): Promise<readonly FileChunkAndScore[] | undefined> {
async search(sizing: StrategySearchSizing, query: WorkspaceChunkQueryWithEmbeddings, telemetryInfo: TelemetryCorrelationId, token: CancellationToken): Promise<readonly FileChunkAndScore[] | undefined> {
const filesetName = this.getFilesetName();
if (!filesetName) {
return undefined;
}

const callTracker = inCallTracker.add('ExternalIngestIndex::search');
const callTracker = telemetryInfo.callTracker.add('ExternalIngestIndex::search');
const sw = new StopWatch();

try {
Expand Down Expand Up @@ -446,7 +446,7 @@ export class ExternalIngestIndex extends Disposable {
return [];
}

const embeddingType = EmbeddingType.metis_1024_I16_Binary;
const embeddingType = new EmbeddingType(searchResult.embedding_model);
const primaryRoot = this._workspaceService.getWorkspaceFolders().at(0);

const chunks: readonly FileChunkAndScore[] = coalesce(searchResult.results.map((r): FileChunkAndScore | undefined => {
Expand Down Expand Up @@ -482,11 +482,18 @@ export class ExternalIngestIndex extends Disposable {
"externalIngestIndex.search.success" : {
"owner": "mjbvz",
"comment": "Logged when external ingest search completes successfully",
"resultEmbeddingType": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "comment": "The embedding model used for the search" },
"workspaceSearchSource": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "comment": "Caller of the search" },
"workspaceSearchCorrelationId": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "comment": "Correlation id for the search" },
"resultCount": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true, "comment": "Number of chunks returned from the search" },
"durationMs": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true, "comment": "Time taken to complete the search in milliseconds" }
}
*/
this._telemetryService.sendMSFTTelemetryEvent('externalIngestIndex.search.success', undefined, {
this._telemetryService.sendMSFTTelemetryEvent('externalIngestIndex.search.success', {
resultEmbeddingType: embeddingType.toString(),
workspaceSearchSource: telemetryInfo.callTracker.toString(),
workspaceSearchCorrelationId: telemetryInfo.correlationId,
}, {
resultCount: chunks.length,
durationMs: sw.elapsed()
});
Expand All @@ -498,10 +505,15 @@ export class ExternalIngestIndex extends Disposable {
"externalIngestIndex.search.cancelled" : {
"owner": "mjbvz",
"comment": "Logged info about cancellation of external ingest search. Mostly for timeouts",
"workspaceSearchSource": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "comment": "Caller of the search" },
"workspaceSearchCorrelationId": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "comment": "Correlation id for the search" },
"durationMs": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true, "comment": "Time taken before the search was cancelled or aborted in milliseconds" }
}
*/
this._telemetryService.sendMSFTTelemetryEvent('externalIngestIndex.search.cancelled', undefined, {
this._telemetryService.sendMSFTTelemetryEvent('externalIngestIndex.search.cancelled', {
workspaceSearchSource: telemetryInfo.callTracker.toString(),
workspaceSearchCorrelationId: telemetryInfo.correlationId,
}, {
durationMs: sw.elapsed()
});
throw e;
Expand All @@ -512,10 +524,16 @@ export class ExternalIngestIndex extends Disposable {
"owner": "mjbvz",
"comment": "Logged when external ingest search fails",
"error": { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth", "comment": "The error message" },
"workspaceSearchSource": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "comment": "Caller of the search" },
"workspaceSearchCorrelationId": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "comment": "Correlation id for the search" },
"durationMs": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true, "comment": "Time taken before failure in milliseconds" }
}
*/
this._telemetryService.sendMSFTTelemetryErrorEvent('externalIngestIndex.search.error', { error: (e as Error).message }, { durationMs: sw.elapsed() });
this._telemetryService.sendMSFTTelemetryErrorEvent('externalIngestIndex.search.error', {
error: (e as Error).message,
workspaceSearchSource: telemetryInfo.callTracker.toString(),
workspaceSearchCorrelationId: telemetryInfo.correlationId,
}, { durationMs: sw.elapsed() });
throw e;
}
}
Expand Down
Loading