chore: stop sequence

packages/core/src/copilot.ts

@@ -19,6 +19,7 @@ import type {
     Provider,
 } from './types/llm';
 import {BaseCopilotMetadata} from './types/metadata';
+import {fetchWithTimeout} from './utils/fetch-with-timeout';
 import validate from './validator';
 
 export abstract class Copilot<Metadata> {
@@ -139,7 +140,7 @@ export abstract class Copilot<Metadata> {
         requestBody: CompletionCreateParams,
         headers: Record<string, string>,
     ) {
-        const response = await fetch(endpoint, {
+        const response = await fetchWithTimeout(endpoint, {
             method: 'POST',
             headers: {
                 'Content-Type': 'application/json',

packages/core/src/defaults.ts

@@ -0,0 +1,2 @@
+export const DEFAULT_COPILOT_MAX_TOKENS = 256 as const;
+export const DEFAULT_COPILOT_STOP_SEQUENCE = '\n\n' as const;

packages/core/src/index.ts

@@ -1,7 +1,7 @@
 export {Copilot} from './copilot';
 
 export * from './logger';
-export * from './constants';
+export * from './defaults';
 export * from './llm/base';
 
 export type * from './types/llm';

packages/core/src/llm/providers/mistral.ts

@@ -1,4 +1,7 @@
-import {DEFAULT_COPILOT_TEMPERATURE} from '../../constants';
+import {
+    DEFAULT_COPILOT_MAX_TOKENS,
+    DEFAULT_COPILOT_STOP_SEQUENCE,
+} from '../../defaults';
 import type {PromptData} from '../../types/copilot';
 import type {
     PickCompletion,
@@ -21,10 +24,12 @@ export class MistralHandler extends BaseProviderHandler<'mistral'> {
     ): PickCompletionCreateParams<'mistral'> {
         return {
             model: MODEL_IDS[model],
-            temperature: DEFAULT_COPILOT_TEMPERATURE,
-            prompt: `${prompt.context}\n${prompt.instruction}\n\n${metadata.textBeforeCursor}`,
+            prompt: `${prompt.context}\n${prompt.instruction}\n${metadata.textBeforeCursor}`,
+            max_tokens: DEFAULT_COPILOT_MAX_TOKENS,
+            stop: DEFAULT_COPILOT_STOP_SEQUENCE,
             suffix: metadata.textAfterCursor,
             stream: false,
+            top_p: 0.9,
         };
     }
 

packages/core/src/types/llm.ts

@@ -1,6 +1,6 @@
 import {
     FIMCompletionResponse as MistralFIMCompletion,
-    FIMCompletionRequest as MistralFIMCompletionCreateParams,
+    FIMCompletionRequest$Outbound as MistralFIMCompletionCreateParams,
 } from '@mistralai/mistralai/models/components';
 
 import type {PromptData} from './copilot';

packages/core/src/utils/fetch-with-timeout.ts

@@ -0,0 +1,28 @@
+export const fetchWithTimeout = async (
+    url: string,
+    options: RequestInit = {},
+    timeoutMs: number = 5000,
+): Promise<Response> => {
+    const controller = new AbortController();
+    const {signal} = controller;
+
+    const timeoutId = setTimeout(() => {
+        controller.abort();
+    }, timeoutMs);
+
+    try {
+        const response = await fetch(url, {
+            ...options,
+            signal,
+        });
+
+        return response;
+    } catch (error) {
+        if (error instanceof DOMException && error.name === 'AbortError') {
+            throw new Error(`Request timed out after ${timeoutMs}ms`);
+        }
+        throw error;
+    } finally {
+        clearTimeout(timeoutId);
+    }
+};

packages/monacopilot/src/classes/formatter.ts

@@ -1,16 +1,8 @@
 export class CompletionFormatter {
     private formattedCompletion = '';
-    private currentColumn = 0;
-    private textBeforeCursorInLine = '';
 
-    constructor(
-        completion: string,
-        currentColumn: number,
-        textBeforeCursorInLine: string,
-    ) {
+    constructor(completion: string) {
         this.formattedCompletion = completion;
-        this.currentColumn = currentColumn;
-        this.textBeforeCursorInLine = textBeforeCursorInLine;
     }
 
     public setCompletion(completion: string): CompletionFormatter {
@@ -30,41 +22,6 @@ export class CompletionFormatter {
         return this;
     }
 
-    public indentByColumn(): CompletionFormatter {
-        const lines = this.formattedCompletion.split('\n');
-
-        if (this.textBeforeCursorInLine.trim() !== '') {
-            return this;
-        }
-
-        const firstLine = lines[0].trimStart();
-        const firstLineIndent = lines[0].length - firstLine.length;
-
-        if (lines.length === 1) {
-            this.formattedCompletion = firstLine;
-            return this;
-        }
-
-        this.formattedCompletion =
-            firstLine +
-            '\n' +
-            lines
-                .slice(1)
-                .map(line => {
-                    const currentLineIndent =
-                        line.length - line.trimStart().length;
-                    const trimAmount = Math.min(
-                        firstLineIndent,
-                        currentLineIndent,
-                    );
-                    const trimmedStart = line.slice(trimAmount);
-                    return ' '.repeat(this.currentColumn - 1) + trimmedStart;
-                })
-                .join('\n');
-
-        return this;
-    }
-
     private removeMarkdownCodeBlocks(text: string): string {
         const lines = text.split('\n');
         const result: string[] = [];

packages/monacopilot/src/processor.ts

@@ -21,7 +21,7 @@ import {
 } from './types';
 import type {EditorInlineCompletionsResult} from './types/monaco';
 import {asyncDebounce} from './utils/async-debounce';
-import {getTextBeforeCursor, getTextBeforeCursorInLine} from './utils/editor';
+import {getTextBeforeCursor} from './utils/editor';
 import {isCancellationError} from './utils/error';
 import {createInlineCompletionResult} from './utils/result';
 
@@ -86,15 +86,10 @@ export const processInlineCompletions = async ({
         });
 
         if (completion) {
-            const formattedCompletion = new CompletionFormatter(
-                completion,
-                pos.column,
-                getTextBeforeCursorInLine(pos, mdl),
-            )
+            const formattedCompletion = new CompletionFormatter(completion)
                 .removeMarkdownCodeSyntax()
                 .removeExcessiveNewlines()
                 .removeInvalidLineBreaks()
-                .indentByColumn()
                 .build();
 
             const completionRange = new CompletionRange(monaco);