@jupyterlite/ai 0.3.0 → 0.4.0

package/lib/chat-handler.d.ts

@@ -1,6 +1,6 @@
 import { ChatModel, IChatHistory, IChatMessage, INewMessage } from '@jupyter/chat';
 import type { BaseChatModel } from '@langchain/core/language_models/chat_models';
-import { IAIProvider } from './token';
+import { IAIProviderRegistry } from './tokens';
 export type ConnectionMessage = {
     type: 'connection';
     client_id: string;
@@ -22,7 +22,7 @@ export declare class ChatHandler extends ChatModel {
     getHistory(): Promise<IChatHistory>;
     dispose(): void;
     messageAdded(message: IChatMessage): void;
-    private _aiProvider;
+    private _providerRegistry;
     private _personaName;
     private _prompt;
     private _errorMessage;
@@ -31,6 +31,6 @@ export declare class ChatHandler extends ChatModel {
 }
 export declare namespace ChatHandler {
     interface IOptions extends ChatModel.IOptions {
-        aiProvider: IAIProvider;
+        providerRegistry: IAIProviderRegistry;
     }
 }

package/lib/chat-handler.js

@@ -5,7 +5,6 @@
 import { ChatModel } from '@jupyter/chat';
 import { AIMessage, HumanMessage, mergeMessageRuns, SystemMessage } from '@langchain/core/messages';
 import { UUID } from '@lumino/coreutils';
-import { getErrorMessage } from './llm-models';
 import { chatSystemPrompt } from './provider';
 import { jupyternautLiteIcon } from './icons';
 /**
@@ -21,15 +20,19 @@ export class ChatHandler extends ChatModel {
         this._errorMessage = '';
         this._history = { messages: [] };
         this._defaultErrorMessage = 'AI provider not configured';
-        this._aiProvider = options.aiProvider;
-        this._prompt = chatSystemPrompt({ provider_name: this._aiProvider.name });
-        this._aiProvider.modelChange.connect(() => {
-            this._errorMessage = this._aiProvider.chatError;
-            this._prompt = chatSystemPrompt({ provider_name: this._aiProvider.name });
+        this._providerRegistry = options.providerRegistry;
+        this._prompt = chatSystemPrompt({
+            provider_name: this._providerRegistry.currentName
+        });
+        this._providerRegistry.providerChanged.connect(() => {
+            this._errorMessage = this._providerRegistry.chatError;
+            this._prompt = chatSystemPrompt({
+                provider_name: this._providerRegistry.currentName
+            });
         });
     }
     get provider() {
-        return this._aiProvider.chatModel;
+        return this._providerRegistry.currentChatModel;
     }
     /**
      * Getter and setter for the persona name.
@@ -74,7 +77,7 @@ export class ChatHandler extends ChatModel {
             type: 'msg'
         };
         this.messageAdded(msg);
-        if (this._aiProvider.chatModel === null) {
+        if (this._providerRegistry.currentChatModel === null) {
             const errorMsg = {
                 id: UUID.uuid4(),
                 body: `**${this._errorMessage ? this._errorMessage : this._defaultErrorMessage}**`,
@@ -105,7 +108,7 @@ export class ChatHandler extends ChatModel {
         };
         let content = '';
         try {
-            for await (const chunk of await this._aiProvider.chatModel.stream(messages)) {
+            for await (const chunk of await this._providerRegistry.currentChatModel.stream(messages)) {
                 content += (_a = chunk.content) !== null && _a !== void 0 ? _a : chunk;
                 botMsg.body = content;
                 this.messageAdded(botMsg);
@@ -114,7 +117,7 @@ export class ChatHandler extends ChatModel {
             return true;
         }
         catch (reason) {
-            const error = getErrorMessage(this._aiProvider.name, reason);
+            const error = this._providerRegistry.formatErrorMessage(reason);
             const errorMsg = {
                 id: UUID.uuid4(),
                 body: `**${error}**`,

package/lib/completion-provider.d.ts

@@ -1,20 +1,12 @@
 import { CompletionHandler, IInlineCompletionContext, IInlineCompletionProvider } from '@jupyterlab/completer';
-import { BaseLanguageModel } from '@langchain/core/language_models/base';
-import { ReadonlyPartialJSONObject } from '@lumino/coreutils';
-import { IBaseCompleter, BaseCompleter } from './llm-models';
+import { IBaseCompleter } from './llm-models';
+import { IAIProviderRegistry } from './tokens';
 /**
  * The generic completion provider to register to the completion provider manager.
  */
 export declare class CompletionProvider implements IInlineCompletionProvider {
     readonly identifier = "@jupyterlite/ai";
     constructor(options: CompletionProvider.IOptions);
-    /**
-     * Set the completer.
-     *
-     * @param name - the name of the completer.
-     * @param settings - The settings associated to the completer.
-     */
-    setCompleter(name: string, settings: ReadonlyPartialJSONObject): void;
     /**
      * Get the current completer name.
      */
@@ -23,18 +15,13 @@ export declare class CompletionProvider implements IInlineCompletionProvider {
      * Get the current completer.
      */
     get completer(): IBaseCompleter | null;
-    /**
-     * Get the LLM completer.
-     */
-    get llmCompleter(): BaseLanguageModel | null;
     fetch(request: CompletionHandler.IRequest, context: IInlineCompletionContext): Promise<any>;
-    private _name;
+    private _providerRegistry;
     private _requestCompletion;
-    private _completer;
 }
 export declare namespace CompletionProvider {
-    interface IOptions extends BaseCompleter.IOptions {
-        name: string;
+    interface IOptions {
+        providerRegistry: IAIProviderRegistry;
         requestCompletion: () => void;
     }
 }

package/lib/completion-provider.js

@@ -1,57 +1,31 @@
-import { getCompleter } from './llm-models';
 /**
  * The generic completion provider to register to the completion provider manager.
  */
 export class CompletionProvider {
     constructor(options) {
         this.identifier = '@jupyterlite/ai';
-        this._name = 'None';
-        this._completer = null;
-        const { name, settings } = options;
+        this._providerRegistry = options.providerRegistry;
         this._requestCompletion = options.requestCompletion;
-        this.setCompleter(name, settings);
-    }
-    /**
-     * Set the completer.
-     *
-     * @param name - the name of the completer.
-     * @param settings - The settings associated to the completer.
-     */
-    setCompleter(name, settings) {
-        try {
-            this._completer = getCompleter(name, settings);
-            if (this._completer) {
-                this._completer.requestCompletion = this._requestCompletion;
+        this._providerRegistry.providerChanged.connect(() => {
+            if (this.completer) {
+                this.completer.requestCompletion = this._requestCompletion;
             }
-            this._name = this._completer === null ? 'None' : name;
-        }
-        catch (e) {
-            this._completer = null;
-            this._name = 'None';
-            throw e;
-        }
+        });
     }
     /**
      * Get the current completer name.
      */
     get name() {
-        return this._name;
+        return this._providerRegistry.currentName;
     }
     /**
      * Get the current completer.
      */
     get completer() {
-        return this._completer;
-    }
-    /**
-     * Get the LLM completer.
-     */
-    get llmCompleter() {
-        var _a;
-        return ((_a = this._completer) === null || _a === void 0 ? void 0 : _a.provider) || null;
+        return this._providerRegistry.currentCompleter;
     }
     async fetch(request, context) {
         var _a;
-        return (_a = this._completer) === null || _a === void 0 ? void 0 : _a.fetch(request, context);
+        return (_a = this.completer) === null || _a === void 0 ? void 0 : _a.fetch(request, context);
     }
 }

package/lib/index.d.ts

@@ -1,5 +1,5 @@
 import { IAutocompletionRegistry } from '@jupyter/chat';
 import { JupyterFrontEndPlugin } from '@jupyterlab/application';
-import { IAIProvider } from './token';
-declare const _default: (JupyterFrontEndPlugin<void> | JupyterFrontEndPlugin<IAutocompletionRegistry> | JupyterFrontEndPlugin<IAIProvider>)[];
+import { IAIProviderRegistry } from './tokens';
+declare const _default: (JupyterFrontEndPlugin<void> | JupyterFrontEndPlugin<IAutocompletionRegistry> | JupyterFrontEndPlugin<IAIProviderRegistry>)[];
 export default _default;

package/lib/index.js

@@ -4,11 +4,14 @@ import { ICompletionProviderManager } from '@jupyterlab/completer';
 import { INotebookTracker } from '@jupyterlab/notebook';
 import { IRenderMimeRegistry } from '@jupyterlab/rendermime';
 import { ISettingRegistry } from '@jupyterlab/settingregistry';
+import { IFormRendererRegistry } from '@jupyterlab/ui-components';
 import { ChatHandler } from './chat-handler';
-import { getSettings } from './llm-models';
-import { AIProvider } from './provider';
+import { CompletionProvider } from './completion-provider';
+import { AIProviders } from './llm-models';
+import { AIProviderRegistry } from './provider';
+import { aiSettingsRenderer } from './settings/panel';
 import { renderSlashCommandOption } from './slash-commands';
-import { IAIProvider } from './token';
+import { IAIProviderRegistry } from './tokens';
 const autocompletionRegistryPlugin = {
     id: '@jupyterlite/ai:autocompletion-registry',
     description: 'Autocompletion registry',
@@ -38,9 +41,9 @@ const chatPlugin = {
     id: '@jupyterlite/ai:chat',
     description: 'LLM chat extension',
     autoStart: true,
-    requires: [IAIProvider, IRenderMimeRegistry, IAutocompletionRegistry],
+    requires: [IAIProviderRegistry, IRenderMimeRegistry, IAutocompletionRegistry],
     optional: [INotebookTracker, ISettingRegistry, IThemeManager],
-    activate: async (app, aiProvider, rmRegistry, autocompletionRegistry, notebookTracker, settingsRegistry, themeManager) => {
+    activate: async (app, providerRegistry, rmRegistry, autocompletionRegistry, notebookTracker, settingsRegistry, themeManager) => {
         let activeCellManager = null;
         if (notebookTracker) {
             activeCellManager = new ActiveCellManager({
@@ -49,8 +52,8 @@ const chatPlugin = {
             });
         }
         const chatHandler = new ChatHandler({
-            aiProvider: aiProvider,
-            activeCellManager: activeCellManager
+            providerRegistry,
+            activeCellManager
         });
         let sendWithShiftEnter = false;
         let enableCodeToolbar = true;
@@ -93,53 +96,52 @@ const chatPlugin = {
         console.log('Chat extension initialized');
     }
 };
-const aiProviderPlugin = {
-    id: '@jupyterlite/ai:ai-provider',
+const completerPlugin = {
+    id: '@jupyterlite/ai:completer',
     autoStart: true,
-    requires: [ICompletionProviderManager, ISettingRegistry],
-    provides: IAIProvider,
-    activate: (app, manager, settingRegistry) => {
-        const aiProvider = new AIProvider({
-            completionProviderManager: manager,
+    requires: [IAIProviderRegistry, ICompletionProviderManager],
+    activate: (app, providerRegistry, manager) => {
+        const completer = new CompletionProvider({
+            providerRegistry,
             requestCompletion: () => app.commands.execute('inline-completer:invoke')
         });
-        let currentProvider = 'None';
+        manager.registerInlineProvider(completer);
+    }
+};
+const providerRegistryPlugin = {
+    id: '@jupyterlite/ai:provider-registry',
+    autoStart: true,
+    requires: [IFormRendererRegistry, ISettingRegistry],
+    optional: [IRenderMimeRegistry],
+    provides: IAIProviderRegistry,
+    activate: (app, editorRegistry, settingRegistry, rmRegistry) => {
+        const providerRegistry = new AIProviderRegistry();
+        editorRegistry.addRenderer('@jupyterlite/ai:provider-registry.AIprovider', aiSettingsRenderer({ providerRegistry, rmRegistry }));
         settingRegistry
-            .load(aiProviderPlugin.id)
+            .load(providerRegistryPlugin.id)
             .then(settings => {
             const updateProvider = () => {
-                const provider = settings.get('provider').composite;
-                if (provider !== currentProvider) {
-                    // Update the settings panel.
-                    currentProvider = provider;
-                    const settingsProperties = settings.schema.properties;
-                    if (settingsProperties) {
-                        const schemaKeys = Object.keys(settingsProperties);
-                        schemaKeys.forEach(key => {
-                            var _a;
-                            if (key !== 'provider') {
-                                (_a = settings.schema.properties) === null || _a === void 0 ? true : delete _a[key];
-                            }
-                        });
-                        const properties = getSettings(provider);
-                        if (properties === null) {
-                            return;
-                        }
-                        Object.entries(properties).forEach(([name, value], index) => {
-                            settingsProperties[name] = value;
-                        });
-                    }
-                }
+                var _a;
                 // Update the settings to the AI providers.
-                aiProvider.setModels(provider, settings.composite);
+                const providerSettings = ((_a = settings.get('AIprovider').composite) !== null && _a !== void 0 ? _a : {
+                    provider: 'None'
+                });
+                providerRegistry.setProvider(providerSettings.provider, providerSettings);
             };
             settings.changed.connect(() => updateProvider());
             updateProvider();
         })
             .catch(reason => {
-            console.error(`Failed to load settings for ${aiProviderPlugin.id}`, reason);
+            console.error(`Failed to load settings for ${providerRegistryPlugin.id}`, reason);
         });
-        return aiProvider;
+        // Initialize the registry with the default providers
+        AIProviders.forEach(provider => providerRegistry.add(provider));
+        return providerRegistry;
     }
 };
-export default [chatPlugin, autocompletionRegistryPlugin, aiProviderPlugin];
+export default [
+    providerRegistryPlugin,
+    autocompletionRegistryPlugin,
+    chatPlugin,
+    completerPlugin
+];

package/lib/llm-models/index.d.ts

@@ -1,3 +1,4 @@
+import { IAIProvider } from '../tokens';
 export * from './base-completer';
-export * from './codestral-completer';
-export * from './utils';
+declare const AIProviders: IAIProvider[];
+export { AIProviders };

package/lib/llm-models/index.js

@@ -1,3 +1,43 @@
+import { ChatAnthropic } from '@langchain/anthropic';
+import { ChromeAI } from '@langchain/community/experimental/llms/chrome_ai';
+import { ChatMistralAI } from '@langchain/mistralai';
+import { ChatOpenAI } from '@langchain/openai';
+import { AnthropicCompleter } from './anthropic-completer';
+import { CodestralCompleter } from './codestral-completer';
+import { ChromeCompleter } from './chrome-completer';
+import { OpenAICompleter } from './openai-completer';
+import { instructions } from '../settings/instructions';
+import { ProviderSettings } from '../settings/schemas';
 export * from './base-completer';
-export * from './codestral-completer';
-export * from './utils';
+const AIProviders = [
+    {
+        name: 'Anthropic',
+        chatModel: ChatAnthropic,
+        completer: AnthropicCompleter,
+        settingsSchema: ProviderSettings.Anthropic,
+        errorMessage: (error) => error.error.error.message
+    },
+    {
+        name: 'ChromeAI',
+        // TODO: fix
+        // @ts-expect-error: missing properties
+        chatModel: ChromeAI,
+        completer: ChromeCompleter,
+        instructions: instructions.ChromeAI,
+        settingsSchema: ProviderSettings.ChromeAI
+    },
+    {
+        name: 'MistralAI',
+        chatModel: ChatMistralAI,
+        completer: CodestralCompleter,
+        instructions: instructions.MistralAI,
+        settingsSchema: ProviderSettings.MistralAI
+    },
+    {
+        name: 'OpenAI',
+        chatModel: ChatOpenAI,
+        completer: OpenAICompleter,
+        settingsSchema: ProviderSettings.OpenAI
+    }
+];
+export { AIProviders };

package/lib/provider.d.ts

@@ -4,20 +4,43 @@ import { BaseChatModel } from '@langchain/core/language_models/chat_models';
 import { ISignal } from '@lumino/signaling';
 import { ReadonlyPartialJSONObject } from '@lumino/coreutils';
 import { IBaseCompleter } from './llm-models';
-import { IAIProvider } from './token';
-export declare const chatSystemPrompt: (options: AIProvider.IPromptOptions) => string;
+import { IAIProvider, IAIProviderRegistry } from './tokens';
+import { JSONSchema7 } from 'json-schema';
+export declare const chatSystemPrompt: (options: AIProviderRegistry.IPromptOptions) => string;
 export declare const COMPLETION_SYSTEM_PROMPT = "\nYou are an application built to provide helpful code completion suggestions.\nYou should only produce code. Keep comments to minimum, use the\nprogramming language comment syntax. Produce clean code.\nThe code is written in JupyterLab, a data analysis and code development\nenvironment which can execute code extended with additional syntax for\ninteractive features, such as magics.\nOnly give raw strings back, do not format the response using backticks.\nThe output should be a single string, and should correspond to what a human users\nwould write.\nDo not include the prompt in the output, only the string that should be appended to the current input.\n";
-export declare class AIProvider implements IAIProvider {
-    constructor(options: AIProvider.IOptions);
-    get name(): string;
+export declare class AIProviderRegistry implements IAIProviderRegistry {
+    /**
+     * Get the list of provider names.
+     */
+    get providers(): string[];
+    /**
+     * Add a new provider.
+     */
+    add(provider: IAIProvider): void;
+    /**
+     * Get the current provider name.
+     */
+    get currentName(): string;
     /**
      * Get the current completer of the completion provider.
      */
-    get completer(): IBaseCompleter | null;
+    get currentCompleter(): IBaseCompleter | null;
     /**
      * Get the current llm chat model.
      */
-    get chatModel(): BaseChatModel | null;
+    get currentChatModel(): BaseChatModel | null;
+    /**
+     * Get the settings schema of a given provider.
+     */
+    getSettingsSchema(provider: string): JSONSchema7;
+    /**
+     * Get the instructions of a given provider.
+     */
+    getInstructions(provider: string): string | undefined;
+    /**
+     * Format an error message from the current provider.
+     */
+    formatErrorMessage(error: any): string;
     /**
      * Get the current chat error;
      */
@@ -27,22 +50,27 @@ export declare class AIProvider implements IAIProvider {
      */
     get completerError(): string;
     /**
-     * Set the models (chat model and completer).
-     * Creates the models if the name has changed, otherwise only updates their config.
+     * Set the providers (chat model and completer).
+     * Creates the providers if the name has changed, otherwise only updates their config.
      *
-     * @param name - the name of the model to use.
+     * @param name - the name of the provider to use.
      * @param settings - the settings for the models.
      */
-    setModels(name: string, settings: ReadonlyPartialJSONObject): void;
-    get modelChange(): ISignal<IAIProvider, void>;
-    private _completionProvider;
-    private _llmChatModel;
+    setProvider(name: string, settings: ReadonlyPartialJSONObject): void;
+    /**
+     * A signal emitting when the provider or its settings has changed.
+     */
+    get providerChanged(): ISignal<IAIProviderRegistry, void>;
+    private _currentProvider;
+    private _completer;
+    private _chatModel;
     private _name;
-    private _modelChange;
+    private _providerChanged;
     private _chatError;
     private _completerError;
+    private _providers;
 }
-export declare namespace AIProvider {
+export declare namespace AIProviderRegistry {
     /**
      * The options for the LLM provider.
      */