Update to jupyter collaboration 3

jupyterlab · Dec 9, 2024 · f8b51be · f8b51be
1 parent e8aa316
commit f8b51be
Show file tree

Hide file tree

Showing 7 changed files with 60 additions and 286 deletions.
diff --git a/packages/jupyterlab-chat/package.json b/packages/jupyterlab-chat/package.json
@@ -52,8 +52,8 @@
   },
   "dependencies": {
     "@jupyter/chat": "^0.6.2",
-    "@jupyter/docprovider": "^2.1.4",
-    "@jupyter/ydoc": "^1.1.1",
+    "@jupyter/collaborative-drive": "^3.0.0",
+    "@jupyter/ydoc": "^2.0.0 || ^3.0.0",
     "@jupyterlab/application": "^4.2.0",
     "@jupyterlab/apputils": "^4.3.0",
     "@jupyterlab/coreutils": "^6.2.0",

diff --git a/packages/jupyterlab-chat/src/widget.tsx b/packages/jupyterlab-chat/src/widget.tsx
@@ -9,7 +9,7 @@ import {
   IChatModel,
   readIcon
 } from '@jupyter/chat';
-import { ICollaborativeDrive } from '@jupyter/docprovider';
+import { ICollaborativeDrive } from '@jupyter/collaborative-drive';
 import { IThemeManager } from '@jupyterlab/apputils';
 import { PathExt } from '@jupyterlab/coreutils';
 import { DocumentWidget } from '@jupyterlab/docregistry';

diff --git a/packages/jupyterlab-chat/src/ychat.ts b/packages/jupyterlab-chat/src/ychat.ts
@@ -96,6 +96,37 @@ export class YChat extends YDocument<IChatChanges> {
     return JSONExt.deepCopy(this._messages.toJSON());
   }
 
+  getSource(): JSONObject {
+    const users = this._users.toJSON();
+    const messages = this._messages.toJSON();
+    const metadata = this._metadata.toJSON();
+
+    return { users, messages, metadata };
+  }
+
+  setSource(value: JSONObject): void {
+    if (!value) {
+      return;
+    }
+
+    this.transact(() => {
+      const messages = (value['messages'] as unknown as Array<IYmessage>) ?? [];
+      messages.forEach(message => {
+        this._messages.push([message]);
+      });
+
+      const users = value['users'] ?? {};
+      Object.entries(users).forEach(([key, val]) =>
+        this._users.set(key, val as IUser)
+      );
+
+      const metadata = value['metadata'] ?? {};
+      Object.entries(metadata).forEach(([key, val]) =>
+        this._metadata.set(key, val as any)
+      );
+    });
+  }
+
   getUser(username: string | undefined): IUser | undefined {
     if (!username) {
       return undefined;

diff --git a/python/jupyterlab-chat/package.json b/python/jupyterlab-chat/package.json
@@ -58,8 +58,8 @@
   },
   "dependencies": {
     "@jupyter-notebook/application": "^7.2.0",
-    "@jupyter/docprovider": "^2.1.4",
-    "@jupyter/ydoc": "^1.1.1",
+    "@jupyter/collaborative-drive": "^3.0.0",
+    "@jupyter/ydoc": "^2.0.0 || ^3.0.0",
     "@jupyterlab/application": "^4.2.0",
     "@jupyterlab/apputils": "^4.3.0",
     "@jupyterlab/coreutils": "^6.2.0",
@@ -132,8 +132,8 @@
         "bundled": true,
         "singleton": true
       },
-      "@jupyter/docprovider": {
-        "bundled": true,
+      "@jupyter/collaborative-drive": {
+        "bundled": false,
         "singleton": true
       },
       "jupyterlab-chat": {

diff --git a/python/jupyterlab-chat/pyproject.toml b/python/jupyterlab-chat/pyproject.toml
@@ -27,7 +27,7 @@ classifiers = [
 ]
 dependencies = [
     "jupyterlab~=4.0",
-    "jupyter_collaboration>=2.1.4,<3",
+    "jupyter_collaboration>=3,<4",
     "jupyter_server>=2.0.1,<3",
     "jupyter_ydoc",
     "pycrdt"

diff --git a/python/jupyterlab-chat/src/index.ts b/python/jupyterlab-chat/src/index.ts
@@ -17,7 +17,7 @@ import {
 import {
   ICollaborativeDrive,
   SharedDocumentFactory
-} from '@jupyter/docprovider';
+} from '@jupyter/collaborative-drive';
 import {
   ILayoutRestorer,
   JupyterFrontEnd,