Update @jupyter/chat to 0.5.0 (#7)

* Update @jupyter/chat to 0.5.0

* Add the code cell

* lint

* Import styles from jupyter-chat

Author: brichet

package.json

@@ -53,11 +53,13 @@
         "watch:labextension": "jupyter labextension watch ."
     },
     "dependencies": {
-        "@jupyter/chat": "^0.1.0",
-        "@jupyterlab/application": "^4.0.0",
-        "@jupyterlab/apputils": "^4.0.0",
-        "@jupyterlab/completer": "^4.0.0",
-        "@jupyterlab/settingregistry": "^4.0.0",
+        "@jupyter/chat": "^0.5.0",
+        "@jupyterlab/application": "^4.2.0",
+        "@jupyterlab/apputils": "^4.3.0",
+        "@jupyterlab/completer": "^4.2.0",
+        "@jupyterlab/notebook": "^4.2.0",
+        "@jupyterlab/rendermime": "^4.2.0",
+        "@jupyterlab/settingregistry": "^4.2.0",
         "@lumino/coreutils": "^2.1.2",
         "@lumino/polling": "^2.1.2",
         "@mistralai/mistralai": "^0.5.0"

schema/chat.json

@@ -8,6 +8,12 @@
       "type": "boolean",
       "default": false,
       "readOnly": false
+    },
+    "enableCodeToolbar": {
+      "description": "Whether to enable or not the code toolbar.",
+      "type": "boolean",
+      "default": true,
+      "readOnly": false
     }
   },
   "additionalProperties": false

src/handler.ts

@@ -23,12 +23,12 @@ export class CodestralHandler extends ChatModel {
     this._mistralClient = options.mistralClient;
   }
 
-  async addMessage(message: INewMessage): Promise<boolean> {
+  async sendMessage(message: INewMessage): Promise<boolean> {
     message.id = UUID.uuid4();
     const msg: IChatMessage = {
       id: message.id,
       body: message.body,
-      sender: 'User',
+      sender: { username: 'User' },
       time: Date.now(),
       type: 'msg'
     };
@@ -38,7 +38,7 @@ export class CodestralHandler extends ChatModel {
       model: 'codestral-latest',
       messages: this._history.messages.map(msg => {
         return {
-          role: msg.sender === 'User' ? 'user' : 'assistant',
+          role: msg.sender.username === 'User' ? 'user' : 'assistant',
           content: msg.body
         };
       })
@@ -50,7 +50,7 @@ export class CodestralHandler extends ChatModel {
     const botMsg: IChatMessage = {
       id: UUID.uuid4(),
       body: botMessage.content as string,
-      sender: 'Codestral',
+      sender: { username: 'Codestral' },
       time: Date.now(),
       type: 'msg'
     };

src/index.ts

@@ -1,15 +1,19 @@
+import {
+  ActiveCellManager,
+  buildChatSidebar,
+  buildErrorWidget,
+  IActiveCellManager
+} from '@jupyter/chat';
 import {
   JupyterFrontEnd,
   JupyterFrontEndPlugin
 } from '@jupyterlab/application';
+import { ReactWidget, IThemeManager } from '@jupyterlab/apputils';
 import { ICompletionProviderManager } from '@jupyterlab/completer';
+import { INotebookTracker } from '@jupyterlab/notebook';
+import { IRenderMimeRegistry } from '@jupyterlab/rendermime';
 import { ISettingRegistry } from '@jupyterlab/settingregistry';
 import { CodestralProvider } from './provider';
-
-import { buildChatSidebar, buildErrorWidget } from '@jupyter/chat';
-import { ReactWidget, IThemeManager } from '@jupyterlab/apputils';
-import { IRenderMimeRegistry } from '@jupyterlab/rendermime';
-
 import MistralClient from '@mistralai/mistralai';
 
 import { CodestralHandler } from './handler';
@@ -52,22 +56,36 @@ const chatPlugin: JupyterFrontEndPlugin<void> = {
   id: 'jupyterlab-codestral:chat',
   description: 'Codestral chat extension',
   autoStart: true,
-  optional: [ISettingRegistry, IThemeManager],
+  optional: [INotebookTracker, ISettingRegistry, IThemeManager],
   requires: [IRenderMimeRegistry],
   activate: async (
     app: JupyterFrontEnd,
     rmRegistry: IRenderMimeRegistry,
+    notebookTracker: INotebookTracker | null,
     settingsRegistry: ISettingRegistry | null,
     themeManager: IThemeManager | null
   ) => {
-    const chatHandler = new CodestralHandler({ mistralClient });
+    let activeCellManager: IActiveCellManager | null = null;
+    if (notebookTracker) {
+      activeCellManager = new ActiveCellManager({
+        tracker: notebookTracker,
+        shell: app.shell
+      });
+    }
+
+    const chatHandler = new CodestralHandler({
+      mistralClient,
+      activeCellManager: activeCellManager
+    });
 
     let sendWithShiftEnter = false;
+    let enableCodeToolbar = true;
 
     function loadSetting(setting: ISettingRegistry.ISettings): void {
       sendWithShiftEnter = setting.get('sendWithShiftEnter')
         .composite as boolean;
-      chatHandler.config = { sendWithShiftEnter };
+      enableCodeToolbar = setting.get('enableCodeToolbar').composite as boolean;
+      chatHandler.config = { sendWithShiftEnter, enableCodeToolbar };
     }
 
     Promise.all([app.restored, settingsRegistry?.load(chatPlugin.id)])
@@ -89,7 +107,11 @@ const chatPlugin: JupyterFrontEndPlugin<void> = {
 
     let chatWidget: ReactWidget | null = null;
     try {
-      chatWidget = buildChatSidebar(chatHandler, themeManager, rmRegistry);
+      chatWidget = buildChatSidebar({
+        model: chatHandler,
+        themeManager,
+        rmRegistry
+      });
       chatWidget.title.caption = 'Codestral Chat';
     } catch (e) {
       chatWidget = buildErrorWidget(themeManager);

style/base.css

@@ -3,3 +3,5 @@
 
     https://jupyterlab.readthedocs.io/en/stable/developer/css.html
 */
+
+@import url('@jupyter/chat/style/index.css');