Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
50 changes: 35 additions & 15 deletions src/api/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export class ApiClient {
async getAutocomplete(
input: AutocompleteInput,
signal?: AbortSignal,
): Promise<AutocompleteResult | null> {
): Promise<AutocompleteResult[] | null> {
const apiKey = this.apiKey;
if (!apiKey) {
return null;
Expand Down Expand Up @@ -97,20 +97,40 @@ export class ApiClient {
return null;
}

const startIndex = requestData.use_bytes
? utf8ByteOffsetToUtf16Offset(documentText, response.start_index)
: response.start_index;
const endIndex = requestData.use_bytes
? utf8ByteOffsetToUtf16Offset(documentText, response.end_index)
: response.end_index;
const decodeOffset = requestData.use_bytes
? (index: number) => utf8ByteOffsetToUtf16Offset(documentText, index)
: (index: number) => index;

const completions =
response.completions && response.completions.length > 0
? response.completions
: [
{
autocomplete_id: response.autocomplete_id,
start_index: response.start_index,
end_index: response.end_index,
completion: response.completion,
confidence: response.confidence,
},
];

const results = completions
.map((completion): AutocompleteResult => {
return {
id: completion.autocomplete_id,
startIndex: decodeOffset(completion.start_index),
endIndex: decodeOffset(completion.end_index),
completion: completion.completion,
confidence: completion.confidence,
};
})
.filter((result) => result.completion.length > 0);

return {
id: response.autocomplete_id,
startIndex,
endIndex,
completion: response.completion,
confidence: response.confidence,
};
if (results.length === 0) {
return null;
}

return results;
}

async trackAutocompleteMetrics(
Expand Down Expand Up @@ -162,7 +182,7 @@ export class ApiClient {
cursor_position: utf8ByteOffsetAt(document, position),
recent_changes: recentChangesText,
changes_above_cursor: true,
multiple_suggestions: false,
multiple_suggestions: true,
file_chunks: fileChunks,
retrieval_chunks: retrievalChunks,
recent_user_actions: userActions,
Expand Down
11 changes: 11 additions & 0 deletions src/api/schemas.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,17 @@ export const AutocompleteResponseSchema = z.object({
confidence: z.number(),
elapsed_time_ms: z.number().optional(),
finish_reason: z.string().nullable().optional(),
completions: z
.array(
z.object({
autocomplete_id: z.string(),
start_index: z.number(),
end_index: z.number(),
completion: z.string(),
confidence: z.number(),
}),
)
.optional(),
});

export const SuggestionTypeSchema = z.enum([
Expand Down
Loading