jupyterlab-chat-extension 0.23.0 → 0.23.2

package/lib/index.js

@@ -17,7 +17,7 @@ import { ISettingRegistry } from '@jupyterlab/settingregistry';
 import { ITranslator, nullTranslator } from '@jupyterlab/translation';
 import { launchIcon } from '@jupyterlab/ui-components';
 import { PromiseDelegate } from '@lumino/coreutils';
-import { ChatWidgetFactory, CommandIDs, IActiveCellManagerToken, IChatFactory, IChatToolbarFactory, IMultiChatPanel, ISelectionWatcherToken, IWelcomeMessage, IWidgetConfig, LabChatModelFactory, LabChatPanel, WidgetConfig, YChat, chatFileType, getDisplayName } from 'jupyterlab-chat';
+import { ChatWidgetFactory, CommandIDs, IActiveCellManagerToken, IChatFactory, IChatToolbarFactory, IMultiChatPanel, ISelectionWatcherToken, IWelcomeMessage, IWidgetConfig, LabChatModelFactory, LabChatPanel, WidgetConfig, YChat, chatFileType, getDisplayName, resolveChatRenamePath } from 'jupyterlab-chat';
 import { chatCommandRegistryPlugin } from './chat-commands/plugins';
 import { emojiCommandsPlugin } from './chat-commands/providers/emoji';
 import { mentionCommandsPlugin } from './chat-commands/providers/user-mention';
@@ -68,6 +68,12 @@ async function createChatModel(app, contentProvider, path, defaultDirectory) {
     });
     // Set the name of the model.
     chatModel.name = model.path;
+    // Chats opened in the side panel have no document context, so the provider
+    // created above is what tells us when the document has been loaded. Without
+    // this the chat would only become usable when the document first becomes
+    // clean, which can be a second later (or never).
+    const provider = contentProvider.providers.get(`${model.format}:${chatFileType.contentType}:${model.path}`);
+    provider === null || provider === void 0 ? void 0 : provider.ready.then(() => chatModel.markDocumentSynced()).catch(e => console.error('The chat document failed to load', e));
     return {
         model: chatModel,
         displayName: getDisplayName(model.path, defaultDirectory)
@@ -873,10 +879,8 @@ const chatCommands = {
                 if (!newPath) {
                     return null;
                 }
-                // Ensure `.chat` extension
-                if (!newPath.endsWith(chatFileType.extensions[0])) {
-                    newPath = `${newPath}${chatFileType.extensions[0]}`;
-                }
+                // Ensure `.chat` extension and keep the chat in its current directory.
+                newPath = resolveChatRenamePath(oldPath, newPath);
                 try {
                     await app.serviceManager.contents.rename(oldPath, newPath);
                     return getDisplayName(newPath, widgetConfig.config.defaultDirectory);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jupyterlab-chat-extension",
-  "version": "0.23.0",
+  "version": "0.23.2",
   "description": "A chat extension based on shared documents",
   "keywords": [
     "jupyter",
@@ -47,33 +47,33 @@
     "watch:labextension": "jupyter-builder watch ."
   },
   "dependencies": {
-    "@jupyter-notebook/application": "^7.6.0",
-    "@jupyter/collaborative-drive": "^4.4.0 || ^5.0.0-alpha.0",
+    "@jupyter-notebook/application": "^7.5.0",
+    "@jupyter/collaborative-drive": "^4.4.0 || ^5.0.0",
     "@jupyter/ydoc": "^3.0.0 || ^4.0.0",
-    "@jupyterlab/application": "^4.6.0",
-    "@jupyterlab/apputils": "^4.7.0",
-    "@jupyterlab/codemirror": "^4.6.0",
-    "@jupyterlab/coreutils": "^6.6.0",
-    "@jupyterlab/docregistry": "^4.6.0",
-    "@jupyterlab/filebrowser": "^4.6.0",
-    "@jupyterlab/launcher": "^4.6.0",
-    "@jupyterlab/notebook": "^4.6.0",
-    "@jupyterlab/rendermime": "^4.6.0",
-    "@jupyterlab/services": "^7.6.0",
-    "@jupyterlab/settingregistry": "^4.6.0",
-    "@jupyterlab/translation": "^4.6.0",
-    "@jupyterlab/ui-components": "^4.6.0",
+    "@jupyterlab/application": "^4.5.0",
+    "@jupyterlab/apputils": "^4.6.0",
+    "@jupyterlab/codemirror": "^4.5.0",
+    "@jupyterlab/coreutils": "^6.5.0",
+    "@jupyterlab/docregistry": "^4.5.0",
+    "@jupyterlab/filebrowser": "^4.5.0",
+    "@jupyterlab/launcher": "^4.5.0",
+    "@jupyterlab/notebook": "^4.5.0",
+    "@jupyterlab/rendermime": "^4.5.0",
+    "@jupyterlab/services": "^7.5.0",
+    "@jupyterlab/settingregistry": "^4.5.0",
+    "@jupyterlab/translation": "^4.5.0",
+    "@jupyterlab/ui-components": "^4.5.0",
     "@lumino/commands": "^2.3.3",
     "@lumino/coreutils": "^2.2.2",
     "@lumino/signaling": "^2.1.5",
     "@lumino/widgets": "^2.8.0",
-    "jupyterlab-chat": "^0.23.0",
+    "jupyterlab-chat": "^0.23.2",
     "react": "^18.2.0",
     "y-protocols": "^1.0.5",
     "yjs": "^13.5.40"
   },
   "devDependencies": {
-    "@jupyter/builder": "^1.0.2",
+    "@jupyter/builder": "^1.2.0",
     "@types/json-schema": "^7.0.11",
     "@types/react": "^18.2.0",
     "@types/react-addons-linked-state-mixin": "^0.14.22",

package/src/index.ts

@@ -72,7 +72,8 @@ import {
   WidgetConfig,
   YChat,
   chatFileType,
-  getDisplayName
+  getDisplayName,
+  resolveChatRenamePath
 } from 'jupyterlab-chat';
 import { chatCommandRegistryPlugin } from './chat-commands/plugins';
 import { emojiCommandsPlugin } from './chat-commands/providers/emoji';
@@ -140,6 +141,17 @@ async function createChatModel(
   // Set the name of the model.
   chatModel.name = model.path;
 
+  // Chats opened in the side panel have no document context, so the provider
+  // created above is what tells us when the document has been loaded. Without
+  // this the chat would only become usable when the document first becomes
+  // clean, which can be a second later (or never).
+  const provider = contentProvider.providers.get(
+    `${model.format}:${chatFileType.contentType}:${model.path}`
+  );
+  provider?.ready
+    .then(() => chatModel.markDocumentSynced())
+    .catch(e => console.error('The chat document failed to load', e));
+
   return {
     model: chatModel,
     displayName: getDisplayName(model.path, defaultDirectory)
@@ -1106,10 +1118,8 @@ const chatCommands: JupyterFrontEndPlugin<void> = {
           return null;
         }
 
-        // Ensure `.chat` extension
-        if (!newPath.endsWith(chatFileType.extensions[0])) {
-          newPath = `${newPath}${chatFileType.extensions[0]}`;
-        }
+        // Ensure `.chat` extension and keep the chat in its current directory.
+        newPath = resolveChatRenamePath(oldPath, newPath);
 
         try {
           await app.serviceManager.contents.rename(oldPath, newPath);