@jupyterlite/ai 0.6.0 → 0.6.2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@jupyterlite/ai",
-    "version": "0.6.0",
+    "version": "0.6.2",
     "description": "AI code completions and chat for JupyterLite",
     "keywords": [
         "jupyter",
@@ -57,13 +57,14 @@
     },
     "dependencies": {
         "@jupyter/chat": "^0.9.0",
-        "@jupyterlab/application": "^4.4.0-alpha.0",
-        "@jupyterlab/apputils": "^4.5.0-alpha.0",
-        "@jupyterlab/completer": "^4.4.0-alpha.0",
-        "@jupyterlab/notebook": "^4.4.0-alpha.0",
-        "@jupyterlab/rendermime": "^4.4.0-alpha.0",
-        "@jupyterlab/settingregistry": "^4.4.0-beta.1",
-        "@jupyterlab/ui-components": "^4.4.0-alpha.0",
+        "@jupyterlab/application": "^4.4.0",
+        "@jupyterlab/apputils": "^4.5.0",
+        "@jupyterlab/completer": "^4.4.0",
+        "@jupyterlab/coreutils": "^6.4.0",
+        "@jupyterlab/notebook": "^4.4.0",
+        "@jupyterlab/rendermime": "^4.4.0",
+        "@jupyterlab/settingregistry": "^4.4.0",
+        "@jupyterlab/ui-components": "^4.4.0",
         "@langchain/anthropic": "^0.3.9",
         "@langchain/community": "^0.3.31",
         "@langchain/core": "^0.3.40",
@@ -74,16 +75,16 @@
         "@lumino/signaling": "^2.1.2",
         "@mui/icons-material": "^5.11.0",
         "@mui/material": "^5.11.0",
-        "@rjsf/core": "^4.2.0",
+        "@rjsf/core": "^5.18.4",
         "@rjsf/utils": "^5.18.4",
         "@rjsf/validator-ajv8": "^5.18.4",
         "json5": "^2.2.3",
-        "jupyter-secrets-manager": "^0.2.0",
+        "jupyter-secrets-manager": "^0.3.0",
         "react": "^18.2.0",
         "react-dom": "^18.2.0"
     },
     "devDependencies": {
-        "@jupyterlab/builder": "^4.0.0",
+        "@jupyterlab/builder": "^4.4.0",
         "@stylistic/eslint-plugin": "^3.0.1",
         "@types/json-schema": "^7.0.11",
         "@types/react": "^18.0.26",

package/schema/provider-registry.json

@@ -11,6 +11,12 @@
       "description": "Whether to use or not the secrets manager. If not, secrets will be stored in the browser (local storage)",
       "default": true
     },
+    "HideSecretFields": {
+      "type": "boolean",
+      "title": "Hide secret fields",
+      "description": "Whether to hide the secret fields in the UI or not",
+      "default": true
+    },
     "AIprovider": {
       "type": "object",
       "title": "AI provider",

package/src/base-completer.ts

@@ -9,7 +9,7 @@ export interface IBaseCompleter {
   /**
    * The LLM completer.
    */
-  provider: BaseLanguageModel;
+  completer: BaseLanguageModel;
 
   /**
    * The completion prompt.

package/src/default-providers/Anthropic/completer.ts

@@ -11,11 +11,11 @@ import { COMPLETION_SYSTEM_PROMPT } from '../../provider';
 
 export class AnthropicCompleter implements IBaseCompleter {
   constructor(options: BaseCompleter.IOptions) {
-    this._anthropicProvider = new ChatAnthropic({ ...options.settings });
+    this._completer = new ChatAnthropic({ ...options.settings });
   }
 
-  get provider(): BaseChatModel {
-    return this._anthropicProvider;
+  get completer(): BaseChatModel {
+    return this._completer;
   }
 
   /**
@@ -44,7 +44,7 @@ export class AnthropicCompleter implements IBaseCompleter {
     ];
 
     try {
-      const response = await this._anthropicProvider.invoke(messages);
+      const response = await this._completer.invoke(messages);
       const items = [];
 
       // Anthropic can return string or complex content, a list of string/images/other.
@@ -70,6 +70,6 @@ export class AnthropicCompleter implements IBaseCompleter {
     }
   }
 
-  private _anthropicProvider: ChatAnthropic;
+  private _completer: ChatAnthropic;
   private _prompt: string = COMPLETION_SYSTEM_PROMPT;
 }

package/src/default-providers/ChromeAI/completer.ts

@@ -32,7 +32,7 @@ const CODE_BLOCK_END_REGEX = /```$/;
 
 export class ChromeCompleter implements IBaseCompleter {
   constructor(options: BaseCompleter.IOptions) {
-    this._chromeProvider = new ChromeAI({ ...options.settings });
+    this._completer = new ChromeAI({ ...options.settings });
   }
 
   /**
@@ -45,8 +45,8 @@ export class ChromeCompleter implements IBaseCompleter {
     this._prompt = value;
   }
 
-  get provider(): LLM {
-    return this._chromeProvider;
+  get completer(): LLM {
+    return this._completer;
   }
 
   async fetch(
@@ -64,7 +64,7 @@ export class ChromeCompleter implements IBaseCompleter {
     ];
 
     try {
-      let response = await this._chromeProvider.invoke(messages);
+      let response = await this._completer.invoke(messages);
 
       // ChromeAI sometimes returns a string starting with '```',
       // so process the response to remove the code block delimiters
@@ -84,6 +84,6 @@ export class ChromeCompleter implements IBaseCompleter {
     }
   }
 
-  private _chromeProvider: ChromeAI;
+  private _completer: ChromeAI;
   private _prompt: string = COMPLETION_SYSTEM_PROMPT;
 }

package/src/default-providers/MistralAI/completer.ts

@@ -21,10 +21,10 @@ const INTERVAL = 1000;
 
 export class CodestralCompleter implements IBaseCompleter {
   constructor(options: BaseCompleter.IOptions) {
-    this._mistralProvider = new ChatMistralAI({ ...options.settings });
+    this._completer = new ChatMistralAI({ ...options.settings });
     this._throttler = new Throttler(
       async (messages: BaseMessage[]) => {
-        const response = await this._mistralProvider.invoke(messages);
+        const response = await this._completer.invoke(messages);
         // Extract results of completion request.
         const items = [];
         if (typeof response.content === 'string') {
@@ -47,8 +47,8 @@ export class CodestralCompleter implements IBaseCompleter {
     );
   }
 
-  get provider(): BaseChatModel {
-    return this._mistralProvider;
+  get completer(): BaseChatModel {
+    return this._completer;
   }
 
   /**
@@ -82,6 +82,6 @@ export class CodestralCompleter implements IBaseCompleter {
   }
 
   private _throttler: Throttler;
-  private _mistralProvider: ChatMistralAI;
+  private _completer: ChatMistralAI;
   private _prompt: string = COMPLETION_SYSTEM_PROMPT;
 }

package/src/default-providers/OpenAI/completer.ts

@@ -11,11 +11,11 @@ import { COMPLETION_SYSTEM_PROMPT } from '../../provider';
 
 export class OpenAICompleter implements IBaseCompleter {
   constructor(options: BaseCompleter.IOptions) {
-    this._openAIProvider = new ChatOpenAI({ ...options.settings });
+    this._completer = new ChatOpenAI({ ...options.settings });
   }
 
-  get provider(): BaseChatModel {
-    return this._openAIProvider;
+  get completer(): BaseChatModel {
+    return this._completer;
   }
 
   /**
@@ -38,7 +38,7 @@ export class OpenAICompleter implements IBaseCompleter {
     const messages = [new SystemMessage(this._prompt), new AIMessage(prompt)];
 
     try {
-      const response = await this._openAIProvider.invoke(messages);
+      const response = await this._completer.invoke(messages);
       const items = [];
       if (typeof response.content === 'string') {
         items.push({
@@ -62,6 +62,6 @@ export class OpenAICompleter implements IBaseCompleter {
     }
   }
 
-  private _openAIProvider: ChatOpenAI;
+  private _completer: ChatOpenAI;
   private _prompt: string = COMPLETION_SYSTEM_PROMPT;
 }

package/src/index.ts

@@ -21,18 +21,18 @@ import {
 } from '@jupyterlab/settingregistry';
 import { IFormRendererRegistry } from '@jupyterlab/ui-components';
 import { ReadonlyPartialJSONObject } from '@lumino/coreutils';
-import { ISecretsManager } from 'jupyter-secrets-manager';
+import { ISecretsManager, SecretsManager } from 'jupyter-secrets-manager';
 
 import { ChatHandler } from './chat-handler';
 import { CompletionProvider } from './completion-provider';
 import { defaultProviderPlugins } from './default-providers';
 import { AIProviderRegistry } from './provider';
 import { aiSettingsRenderer, SettingConnector } from './settings';
-import { IAIProviderRegistry } from './tokens';
+import { IAIProviderRegistry, PLUGIN_IDS } from './tokens';
 import { stopItem } from './components/stop-button';
 
 const chatCommandRegistryPlugin: JupyterFrontEndPlugin<IChatCommandRegistry> = {
-  id: '@jupyterlite/ai:autocompletion-registry',
+  id: PLUGIN_IDS.chatCommandRegistry,
   description: 'Autocompletion registry',
   autoStart: true,
   provides: IChatCommandRegistry,
@@ -44,7 +44,7 @@ const chatCommandRegistryPlugin: JupyterFrontEndPlugin<IChatCommandRegistry> = {
 };
 
 const chatPlugin: JupyterFrontEndPlugin<void> = {
-  id: '@jupyterlite/ai:chat',
+  id: PLUGIN_IDS.chat,
   description: 'LLM chat extension',
   autoStart: true,
   requires: [IAIProviderRegistry, IRenderMimeRegistry, IChatCommandRegistry],
@@ -141,7 +141,7 @@ const chatPlugin: JupyterFrontEndPlugin<void> = {
 };
 
 const completerPlugin: JupyterFrontEndPlugin<void> = {
-  id: '@jupyterlite/ai:completer',
+  id: PLUGIN_IDS.completer,
   autoStart: true,
   requires: [IAIProviderRegistry, ICompletionProviderManager],
   activate: (
@@ -157,59 +157,64 @@ const completerPlugin: JupyterFrontEndPlugin<void> = {
   }
 };
 
-const providerRegistryPlugin: JupyterFrontEndPlugin<IAIProviderRegistry> = {
-  id: '@jupyterlite/ai:provider-registry',
-  autoStart: true,
-  requires: [IFormRendererRegistry, ISettingRegistry],
-  optional: [IRenderMimeRegistry, ISecretsManager, ISettingConnector],
-  provides: IAIProviderRegistry,
-  activate: (
-    app: JupyterFrontEnd,
-    editorRegistry: IFormRendererRegistry,
-    settingRegistry: ISettingRegistry,
-    rmRegistry?: IRenderMimeRegistry,
-    secretsManager?: ISecretsManager,
-    settingConnector?: ISettingConnector
-  ): IAIProviderRegistry => {
-    const providerRegistry = new AIProviderRegistry({ secretsManager });
-
-    editorRegistry.addRenderer(
-      '@jupyterlite/ai:provider-registry.AIprovider',
-      aiSettingsRenderer({
-        providerRegistry,
-        rmRegistry,
-        secretsManager,
-        settingConnector
-      })
-    );
-
-    settingRegistry
-      .load(providerRegistryPlugin.id)
-      .then(settings => {
-        const updateProvider = () => {
-          // Update the settings to the AI providers.
-          const providerSettings = (settings.get('AIprovider').composite ?? {
-            provider: 'None'
-          }) as ReadonlyPartialJSONObject;
-          providerRegistry.setProvider({
-            name: providerSettings.provider as string,
-            settings: providerSettings
-          });
-        };
-
-        settings.changed.connect(() => updateProvider());
-        updateProvider();
-      })
-      .catch(reason => {
-        console.error(
-          `Failed to load settings for ${providerRegistryPlugin.id}`,
-          reason
-        );
+const providerRegistryPlugin: JupyterFrontEndPlugin<IAIProviderRegistry> =
+  SecretsManager.sign(PLUGIN_IDS.providerRegistry, token => ({
+    id: PLUGIN_IDS.providerRegistry,
+    autoStart: true,
+    requires: [IFormRendererRegistry, ISettingRegistry],
+    optional: [IRenderMimeRegistry, ISecretsManager, ISettingConnector],
+    provides: IAIProviderRegistry,
+    activate: (
+      app: JupyterFrontEnd,
+      editorRegistry: IFormRendererRegistry,
+      settingRegistry: ISettingRegistry,
+      rmRegistry?: IRenderMimeRegistry,
+      secretsManager?: ISecretsManager,
+      settingConnector?: ISettingConnector
+    ): IAIProviderRegistry => {
+      const providerRegistry = new AIProviderRegistry({
+        token,
+        secretsManager
       });
 
-    return providerRegistry;
-  }
-};
+      editorRegistry.addRenderer(
+        `${PLUGIN_IDS.providerRegistry}.AIprovider`,
+        aiSettingsRenderer({
+          providerRegistry,
+          secretsToken: token,
+          rmRegistry,
+          secretsManager,
+          settingConnector
+        })
+      );
+
+      settingRegistry
+        .load(providerRegistryPlugin.id)
+        .then(settings => {
+          const updateProvider = () => {
+            // Update the settings to the AI providers.
+            const providerSettings = (settings.get('AIprovider').composite ?? {
+              provider: 'None'
+            }) as ReadonlyPartialJSONObject;
+            providerRegistry.setProvider({
+              name: providerSettings.provider as string,
+              settings: providerSettings
+            });
+          };
+
+          settings.changed.connect(() => updateProvider());
+          updateProvider();
+        })
+        .catch(reason => {
+          console.error(
+            `Failed to load settings for ${providerRegistryPlugin.id}`,
+            reason
+          );
+        });
+
+      return providerRegistry;
+    }
+  }));
 
 /**
  * Provides the settings connector as a separate plugin to allow for alternative
@@ -217,7 +222,7 @@ const providerRegistryPlugin: JupyterFrontEndPlugin<IAIProviderRegistry> = {
  * endpoint.
  */
 const settingsConnector: JupyterFrontEndPlugin<ISettingConnector> = {
-  id: '@jupyterlite/ai:settings-connector',
+  id: PLUGIN_IDS.settingsConnector,
   description: 'Provides a settings connector which does not save passwords.',
   autoStart: true,
   provides: ISettingConnector,

package/src/provider.ts

@@ -6,18 +6,17 @@ import { JSONSchema7 } from 'json-schema';
 import { ISecretsManager } from 'jupyter-secrets-manager';
 
 import { IBaseCompleter } from './base-completer';
-import {
-  getSecretId,
-  SECRETS_NAMESPACE,
-  SECRETS_REPLACEMENT
-} from './settings';
+import { getSecretId, SECRETS_REPLACEMENT } from './settings';
 import {
   IAIProvider,
   IAIProviderRegistry,
   IDict,
-  ISetProviderOptions
+  ISetProviderOptions,
+  PLUGIN_IDS
 } from './tokens';
 
+const SECRETS_NAMESPACE = PLUGIN_IDS.providerRegistry;
+
 export const chatSystemPrompt = (
   options: AIProviderRegistry.IPromptOptions
 ) => `
@@ -54,6 +53,7 @@ export class AIProviderRegistry implements IAIProviderRegistry {
    */
   constructor(options: AIProviderRegistry.IOptions) {
     this._secretsManager = options.secretsManager || null;
+    Private.setToken(options.token);
   }
 
   /**
@@ -171,8 +171,14 @@ export class AIProviderRegistry implements IAIProviderRegistry {
     for (const key of Object.keys(settings)) {
       if (settings[key] === SECRETS_REPLACEMENT) {
         const id = getSecretId(name, key);
-        const secrets = await this._secretsManager?.get(SECRETS_NAMESPACE, id);
-        fullSettings[key] = secrets?.value || settings[key];
+        const secrets = await this._secretsManager?.get(
+          Private.getToken(),
+          SECRETS_NAMESPACE,
+          id
+        );
+        if (secrets !== undefined) {
+          fullSettings[key] = secrets.value;
+        }
         continue;
       }
       fullSettings[key] = settings[key];
@@ -181,7 +187,7 @@ export class AIProviderRegistry implements IAIProviderRegistry {
     if (this._currentProvider?.completer !== undefined) {
       try {
         this._completer = new this._currentProvider.completer({
-          ...fullSettings
+          settings: fullSettings
         });
         this._completerError = '';
       } catch (e: any) {
@@ -236,6 +242,10 @@ export namespace AIProviderRegistry {
      * The secrets manager used in the application.
      */
     secretsManager?: ISecretsManager;
+    /**
+     * The token used to request the secrets manager.
+     */
+    token: symbol;
   }
 
   /**
@@ -290,3 +300,24 @@ export namespace AIProviderRegistry {
     });
   }
 }
+
+namespace Private {
+  /**
+   * The token to use with the secrets manager.
+   */
+  let secretsToken: symbol;
+
+  /**
+   * Set of the token.
+   */
+  export function setToken(value: symbol): void {
+    secretsToken = value;
+  }
+
+  /**
+   * get the token.
+   */
+  export function getToken(): symbol {
+    return secretsToken;
+  }
+}