jupyter-chat-example 0.17.0 → 0.18.0

package/lib/index.js

@@ -2,7 +2,7 @@
  * Copyright (c) Jupyter Development Team.
  * Distributed under the terms of the Modified BSD License.
  */
-import { ActiveCellManager, AttachmentOpenerRegistry, buildChatSidebar, AbstractChatModel, SelectionWatcher, AbstractChatContext } from '@jupyter/chat';
+import { AbstractChatContext, AbstractChatModel, ActiveCellManager, AttachmentOpenerRegistry, MultiChatPanel, SelectionWatcher } from '@jupyter/chat';
 import { IThemeManager } from '@jupyterlab/apputils';
 import { IDefaultFileBrowser } from '@jupyterlab/filebrowser';
 import { INotebookTracker } from '@jupyterlab/notebook';
@@ -29,6 +29,10 @@ class ChatContext extends AbstractChatContext {
     }
 }
 class MyChatModel extends AbstractChatModel {
+    constructor(options) {
+        super(options);
+        this.setReady();
+    }
     sendMessage(newMessage) {
         var _a;
         const message = {
@@ -73,22 +77,7 @@ const plugin = {
         const selectionWatcher = new SelectionWatcher({
             shell: app.shell
         });
-        const model = new MyChatModel({
-            activeCellManager,
-            selectionWatcher,
-            documentManager: filebrowser === null || filebrowser === void 0 ? void 0 : filebrowser.model.manager
-        });
-        // Update the settings when they change.
-        function loadSetting(setting) {
-            model.config = {
-                sendWithShiftEnter: setting.get('sendWithShiftEnter')
-                    .composite,
-                stackMessages: setting.get('stackMessages').composite,
-                unreadNotifications: setting.get('unreadNotifications')
-                    .composite,
-                enableCodeToolbar: setting.get('enableCodeToolbar').composite
-            };
-        }
+        let config = {};
         // Init the settings.
         if (settingRegistry) {
             // Wait for the application to be restored and for the settings to be loaded.
@@ -97,6 +86,20 @@ const plugin = {
                 settingRegistry.load('jupyter-chat-example:plugin')
             ])
                 .then(([, setting]) => {
+                function loadSetting(setting) {
+                    config = {
+                        sendWithShiftEnter: setting.get('sendWithShiftEnter')
+                            .composite,
+                        stackMessages: setting.get('stackMessages').composite,
+                        unreadNotifications: setting.get('unreadNotifications')
+                            .composite,
+                        enableCodeToolbar: setting.get('enableCodeToolbar')
+                            .composite
+                    };
+                    panel.sections.forEach(section => {
+                        section.model.config = config;
+                    });
+                }
                 // Read the settings
                 loadSetting(setting);
                 // Listen for the plugin setting changes
@@ -111,12 +114,25 @@ const plugin = {
         attachmentOpenerRegistry.set('file', (attachment) => {
             app.commands.execute('docmanager:open', { path: attachment.value });
         });
-        const panel = buildChatSidebar({
-            model,
+        const createModel = async () => {
+            const model = new MyChatModel({
+                activeCellManager,
+                selectionWatcher,
+                documentManager: filebrowser === null || filebrowser === void 0 ? void 0 : filebrowser.model.manager,
+                config
+            });
+            model.name = UUID.uuid4();
+            return { model };
+        };
+        const panel = new MultiChatPanel({
             rmRegistry,
             themeManager,
             attachmentOpenerRegistry,
-            welcomeMessage
+            welcomeMessage,
+            createModel: createModel,
+            // No op, since the chat are transient, but it need to be provided to have the
+            // button in the toolbar.
+            renameChat: async (oldName, newName) => true
         });
         app.shell.add(panel, 'left');
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jupyter-chat-example",
-  "version": "0.17.0",
+  "version": "0.18.0",
   "description": "A chat extension providing a chat as example",
   "keywords": [
     "jupyter",
@@ -44,7 +44,7 @@
     "install:extension": "jlpm build"
   },
   "dependencies": {
-    "@jupyter/chat": "^0.17.0",
+    "@jupyter/chat": "^0.18.0",
     "@jupyterlab/application": "^4.2.0",
     "@jupyterlab/apputils": "^4.3.0",
     "@jupyterlab/notebook": "^4.2.0",

package/src/index.ts

@@ -4,16 +4,18 @@
  */
 
 import {
+  AbstractChatContext,
+  AbstractChatModel,
   ActiveCellManager,
   AttachmentOpenerRegistry,
-  buildChatSidebar,
-  AbstractChatModel,
   IAttachment,
   IChatMessage,
+  IChatContext,
+  IConfig,
   INewMessage,
+  MultiChatPanel,
   SelectionWatcher,
-  IChatContext,
-  AbstractChatContext
+  IChatModel
 } from '@jupyter/chat';
 import {
   JupyterFrontEnd,
@@ -48,6 +50,11 @@ class ChatContext extends AbstractChatContext {
 }
 
 class MyChatModel extends AbstractChatModel {
+  constructor(options: IChatModel.IOptions) {
+    super(options);
+    this.setReady();
+  }
+
   sendMessage(
     newMessage: INewMessage
   ): Promise<boolean | void> | boolean | void {
@@ -104,23 +111,7 @@ const plugin: JupyterFrontEndPlugin<void> = {
       shell: app.shell
     });
 
-    const model = new MyChatModel({
-      activeCellManager,
-      selectionWatcher,
-      documentManager: filebrowser?.model.manager
-    });
-
-    // Update the settings when they change.
-    function loadSetting(setting: ISettingRegistry.ISettings): void {
-      model.config = {
-        sendWithShiftEnter: setting.get('sendWithShiftEnter')
-          .composite as boolean,
-        stackMessages: setting.get('stackMessages').composite as boolean,
-        unreadNotifications: setting.get('unreadNotifications')
-          .composite as boolean,
-        enableCodeToolbar: setting.get('enableCodeToolbar').composite as boolean
-      };
-    }
+    let config: IConfig = {};
 
     // Init the settings.
     if (settingRegistry) {
@@ -130,6 +121,21 @@ const plugin: JupyterFrontEndPlugin<void> = {
         settingRegistry.load('jupyter-chat-example:plugin')
       ])
         .then(([, setting]) => {
+          function loadSetting(setting: ISettingRegistry.ISettings) {
+            config = {
+              sendWithShiftEnter: setting.get('sendWithShiftEnter')
+                .composite as boolean,
+              stackMessages: setting.get('stackMessages').composite as boolean,
+              unreadNotifications: setting.get('unreadNotifications')
+                .composite as boolean,
+              enableCodeToolbar: setting.get('enableCodeToolbar')
+                .composite as boolean
+            };
+
+            panel.sections.forEach(section => {
+              section.model.config = config;
+            });
+          }
           // Read the settings
           loadSetting(setting);
 
@@ -149,12 +155,26 @@ const plugin: JupyterFrontEndPlugin<void> = {
       app.commands.execute('docmanager:open', { path: attachment.value });
     });
 
-    const panel = buildChatSidebar({
-      model,
+    const createModel = async (): Promise<MultiChatPanel.IAddChatArgs> => {
+      const model = new MyChatModel({
+        activeCellManager,
+        selectionWatcher,
+        documentManager: filebrowser?.model.manager,
+        config
+      });
+      model.name = UUID.uuid4();
+      return { model };
+    };
+
+    const panel = new MultiChatPanel({
       rmRegistry,
       themeManager,
       attachmentOpenerRegistry,
-      welcomeMessage
+      welcomeMessage,
+      createModel: createModel,
+      // No op, since the chat are transient, but it need to be provided to have the
+      // button in the toolbar.
+      renameChat: async (oldName: string, newName: string) => true
     });
     app.shell.add(panel, 'left');
   }