@jupyterlite/ai 0.7.0 → 0.8.1

package/lib/default-providers/MistralAI/completer.js

@@ -1,61 +1,52 @@
-import { HumanMessage, SystemMessage } from '@langchain/core/messages';
-import { ChatMistralAI } from '@langchain/mistralai';
-import { Throttler } from '@lumino/polling';
-import { COMPLETION_SYSTEM_PROMPT } from '../../provider';
-/**
- * The Mistral API has a rate limit of 1 request per second
- */
-const INTERVAL = 1000;
-export class CodestralCompleter {
+import { MistralAI } from '@langchain/mistralai';
+import { BaseCompleter } from '../../base-completer';
+const CODE_BLOCK_START_REGEX = /^```(?:[a-zA-Z]+)?\n?/;
+const CODE_BLOCK_END_REGEX = /```$/;
+export class CodestralCompleter extends BaseCompleter {
     constructor(options) {
-        this._completer = new ChatMistralAI({ ...options.settings });
-        this._throttler = new Throttler(async (messages) => {
-            const response = await this._completer.invoke(messages);
-            // Extract results of completion request.
-            const items = [];
-            if (typeof response.content === 'string') {
-                items.push({
-                    insertText: response.content
-                });
-            }
-            else {
-                response.content.forEach(content => {
-                    if (content.type !== 'text') {
-                        return;
-                    }
-                    items.push({
-                        insertText: content.text
-                    });
-                });
-            }
-            return { items };
-        }, { limit: INTERVAL });
-    }
-    /**
-     * Getter and setter for the initial prompt.
-     */
-    get prompt() {
-        return this._prompt;
-    }
-    set prompt(value) {
-        this._prompt = value;
+        super(options);
+        this._completer = new MistralAI({ ...options.settings });
     }
     async fetch(request, context) {
-        const { text, offset: cursorOffset } = request;
-        const prompt = text.slice(0, cursorOffset);
-        const messages = [
-            new SystemMessage(this._prompt),
-            new HumanMessage(prompt)
-        ];
         try {
-            return await this._throttler.invoke(messages);
+            const { text, offset: cursorOffset } = request;
+            const prompt = this.systemPrompt.concat(text.slice(0, cursorOffset));
+            const suffix = text.slice(cursorOffset);
+            this._controller.abort();
+            this._controller = new AbortController();
+            const response = await this._completer.completionWithRetry({
+                prompt,
+                model: this._completer.model,
+                suffix
+            }, { signal: this._controller.signal }, false);
+            const items = response.choices.map(choice => {
+                const messageContent = choice.message.content;
+                let content = '';
+                if (typeof messageContent === 'string') {
+                    content = messageContent
+                        .replace(CODE_BLOCK_START_REGEX, '')
+                        .replace(CODE_BLOCK_END_REGEX, '');
+                }
+                else if (Array.isArray(messageContent)) {
+                    // Handle ContentChunk[] case - extract text content
+                    content = messageContent
+                        .filter(chunk => chunk.type === 'text')
+                        .map(chunk => chunk.text || '')
+                        .join('')
+                        .replace(CODE_BLOCK_START_REGEX, '')
+                        .replace(CODE_BLOCK_END_REGEX, '');
+                }
+                return {
+                    insertText: content
+                };
+            });
+            return { items };
         }
         catch (error) {
-            console.error('Error fetching completions', error);
+            // the request may be aborted
             return { items: [] };
         }
     }
-    _throttler;
+    _controller = new AbortController();
     _completer;
-    _prompt = COMPLETION_SYSTEM_PROMPT;
 }

package/lib/default-providers/MistralAI/instructions.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "\n<i class=\"fas fa-exclamation-triangle\"></i> This extension is still very much experimental. It is not an official MistralAI extension.\n\n1. Go to <https://console.mistral.ai/api-keys/> and create an API key.\n\n    <img src=\"https://raw.githubusercontent.com/jupyterlite/ai/refs/heads/main/img/1-api-key.png\" alt=\"Screenshot showing how to create an API key\" width=\"500px\">\n\n2. Open the JupyterLab settings and go to the **Ai providers** section to select the `MistralAI`\n   provider and the API key (required).\n\n    <img src=\"https://raw.githubusercontent.com/jupyterlite/ai/refs/heads/main/img/2-jupyterlab-settings.png\" alt=\"Screenshot showing how to add the API key to the settings\" width=\"500px\">\n\n3. Open the chat, or use the inline completer\n\n    <img src=\"https://raw.githubusercontent.com/jupyterlite/ai/refs/heads/main/img/3-usage.png\" alt=\"Screenshot showing how to use the chat\" width=\"500px\">\n";
+declare const _default: "\n<i class=\"fas fa-exclamation-triangle\"></i> This extension is still very much experimental. It is not an official MistralAI extension.\n\n1. Go to <https://console.mistral.ai/api-keys/> and create an API key.\n\n    <img src=\"https://raw.githubusercontent.com/jupyterlite/ai/refs/heads/main/img/1-api-key.png\" alt=\"Screenshot showing how to create an API key\" width=\"500px\">\n\n2. Open the JupyterLab settings and go to the **Ai providers** section to select the `MistralAI`\n   provider and the API key (required).\n\n    <img src=\"https://raw.githubusercontent.com/jupyterlite/ai/refs/heads/main/img/2-jupyterlab-settings.png\" alt=\"Screenshot showing how to add the API key to the settings\" width=\"500px\">\n\n**Note:** When using MistralAI for completions, only a subset of models are available. Please check [this resource](https://docs.mistral.ai/api/#tag/fim) to see the list of supported models for completions.\n\n3. Open the chat, or use the inline completer\n\n    <img src=\"https://raw.githubusercontent.com/jupyterlite/ai/refs/heads/main/img/3-usage.png\" alt=\"Screenshot showing how to use the chat\" width=\"500px\">\n";
 export default _default;

package/lib/default-providers/MistralAI/instructions.js

@@ -10,6 +10,8 @@ export default `
 
     <img src="https://raw.githubusercontent.com/jupyterlite/ai/refs/heads/main/img/2-jupyterlab-settings.png" alt="Screenshot showing how to add the API key to the settings" width="500px">
 
+**Note:** When using MistralAI for completions, only a subset of models are available. Please check [this resource](https://docs.mistral.ai/api/#tag/fim) to see the list of supported models for completions.
+
 3. Open the chat, or use the inline completer
 
     <img src="https://raw.githubusercontent.com/jupyterlite/ai/refs/heads/main/img/3-usage.png" alt="Screenshot showing how to use the chat" width="500px">

package/lib/default-providers/Ollama/completer.d.ts

@@ -1,17 +1,12 @@
 import { CompletionHandler, IInlineCompletionContext } from '@jupyterlab/completer';
-import { BaseCompleter, IBaseCompleter } from '../../base-completer';
-export declare class OllamaCompleter implements IBaseCompleter {
+import { ChatOllama } from '@langchain/ollama';
+import { BaseCompleter } from '../../base-completer';
+export declare class OllamaCompleter extends BaseCompleter {
     constructor(options: BaseCompleter.IOptions);
-    /**
-     * Getter and setter for the initial prompt.
-     */
-    get prompt(): string;
-    set prompt(value: string);
     fetch(request: CompletionHandler.IRequest, context: IInlineCompletionContext): Promise<{
         items: {
             insertText: string;
         }[];
     }>;
-    private _completer;
-    private _prompt;
+    protected _completer: ChatOllama;
 }

package/lib/default-providers/Ollama/completer.js

@@ -1,23 +1,18 @@
 import { AIMessage, SystemMessage } from '@langchain/core/messages';
 import { ChatOllama } from '@langchain/ollama';
-import { COMPLETION_SYSTEM_PROMPT } from '../../provider';
-export class OllamaCompleter {
+import { BaseCompleter } from '../../base-completer';
+export class OllamaCompleter extends BaseCompleter {
     constructor(options) {
+        super(options);
         this._completer = new ChatOllama({ ...options.settings });
     }
-    /**
-     * Getter and setter for the initial prompt.
-     */
-    get prompt() {
-        return this._prompt;
-    }
-    set prompt(value) {
-        this._prompt = value;
-    }
     async fetch(request, context) {
         const { text, offset: cursorOffset } = request;
         const prompt = text.slice(0, cursorOffset);
-        const messages = [new SystemMessage(this._prompt), new AIMessage(prompt)];
+        const messages = [
+            new SystemMessage(this.systemPrompt),
+            new AIMessage(prompt)
+        ];
         try {
             const response = await this._completer.invoke(messages);
             const items = [];
@@ -45,5 +40,4 @@ export class OllamaCompleter {
         }
     }
     _completer;
-    _prompt = COMPLETION_SYSTEM_PROMPT;
 }

package/lib/default-providers/Ollama/settings-schema.json

@@ -90,10 +90,7 @@
             "type": "boolean"
         },
         "keepAlive": {
-            "type": [
-                "string",
-                "number"
-            ],
+            "type": ["string", "number"],
             "default": "5m"
         },
         "stop": {

package/lib/default-providers/OpenAI/completer.d.ts

@@ -1,17 +1,12 @@
 import { CompletionHandler, IInlineCompletionContext } from '@jupyterlab/completer';
-import { BaseCompleter, IBaseCompleter } from '../../base-completer';
-export declare class OpenAICompleter implements IBaseCompleter {
+import { ChatOpenAI } from '@langchain/openai';
+import { BaseCompleter } from '../../base-completer';
+export declare class OpenAICompleter extends BaseCompleter {
     constructor(options: BaseCompleter.IOptions);
-    /**
-     * Getter and setter for the initial prompt.
-     */
-    get prompt(): string;
-    set prompt(value: string);
     fetch(request: CompletionHandler.IRequest, context: IInlineCompletionContext): Promise<{
         items: {
             insertText: string;
         }[];
     }>;
-    private _completer;
-    private _prompt;
+    protected _completer: ChatOpenAI;
 }

package/lib/default-providers/OpenAI/completer.js

@@ -1,23 +1,18 @@
 import { AIMessage, SystemMessage } from '@langchain/core/messages';
 import { ChatOpenAI } from '@langchain/openai';
-import { COMPLETION_SYSTEM_PROMPT } from '../../provider';
-export class OpenAICompleter {
+import { BaseCompleter } from '../../base-completer';
+export class OpenAICompleter extends BaseCompleter {
     constructor(options) {
+        super(options);
         this._completer = new ChatOpenAI({ ...options.settings });
     }
-    /**
-     * Getter and setter for the initial prompt.
-     */
-    get prompt() {
-        return this._prompt;
-    }
-    set prompt(value) {
-        this._prompt = value;
-    }
     async fetch(request, context) {
         const { text, offset: cursorOffset } = request;
         const prompt = text.slice(0, cursorOffset);
-        const messages = [new SystemMessage(this._prompt), new AIMessage(prompt)];
+        const messages = [
+            new SystemMessage(this.systemPrompt),
+            new AIMessage(prompt)
+        ];
         try {
             const response = await this._completer.invoke(messages);
             const items = [];
@@ -45,5 +40,4 @@ export class OpenAICompleter {
         }
     }
     _completer;
-    _prompt = COMPLETION_SYSTEM_PROMPT;
 }