Support only jupyter-collaboration 4.x

Switch from ICollaborativeDrive to ICollaborativeContentProvider at
advice of  Michał Krassowski:

<geojupyter#848 (comment)>

Author: mfisher87

.github/workflows/build.yml

@@ -175,7 +175,7 @@ jobs:
         run: |
           set -eux
           cp ./jupytergis/dist/jupytergis*.whl ./jupytergis_core/dist/jupytergis*.whl ./jupytergis_lab/dist/jupytergis*.whl ./jupytergis_qgis/dist/jupytergis*.whl .
-          python -m pip install jupytergis*.whl "jupyter-collaboration>=3" "jupyterlab==4.4.2"
+          python -m pip install jupytergis*.whl "jupyter-collaboration>=4" "jupyterlab==4.4.2"
 
       - name: Install
         shell: bash -l {0}

python/jupytergis/pyproject.toml

@@ -22,10 +22,10 @@ dependencies = [
   "jupytergis_core==0.9.1",
   "jupytergis_lab==0.9.1",
   "jupytergis_qgis==0.9.1",
-  "jupyter-collaboration>=3",
+  "jupyter-collaboration>=4",
   "jupyter-docprovider>=1,<2",
   "jupyter-server-ydoc>=1,<2",
-  "jupyter-collaboration-ui>=1",
+  "jupyter-collaboration-ui>=2",
   "jupyterlab>=4.3,<5",
 ]
 dynamic = ["version"]

python/jupytergis_core/package.json

@@ -53,7 +53,7 @@
     "watch:labextension": "jupyter labextension watch ."
   },
   "dependencies": {
-    "@jupyter/collaborative-drive": "^3.0.0",
+    "@jupyter/collaborative-drive": "^4.0.0",
     "@jupytergis/base": "^0.9.1",
     "@jupytergis/schema": "^0.9.1",
     "@jupyterlab/application": "^4.3.0",

python/jupytergis_core/src/factory.ts

@@ -1,4 +1,4 @@
-import { ICollaborativeDrive } from '@jupyter/collaborative-drive';
+import { ICollaborativeContentProvider } from '@jupyter/collaborative-drive';
 import {
   JupyterGISPanel,
   JupyterGISDocumentWidget,
@@ -29,7 +29,7 @@ interface IOptions extends DocumentRegistry.IWidgetFactoryOptions {
   rendermime?: IRenderMimeRegistry;
   consoleTracker?: IConsoleTracker;
   backendCheck?: () => boolean;
-  drive?: ICollaborativeDrive | null;
+  drive?: ICollaborativeContentProvider | null;
   formSchemaRegistry: IJGISFormSchemaRegistry;
   state: IStateDB;
   annotationModel: IAnnotationModel;

python/jupytergis_core/src/jgisplugin/plugins.ts

@@ -1,5 +1,5 @@
 import {
-  ICollaborativeDrive,
+  ICollaborativeContentProvider,
   SharedDocumentFactory,
 } from '@jupyter/collaborative-drive';
 import { CommandIDs, logoIcon, logoMiniIcon } from '@jupytergis/base';
@@ -60,7 +60,7 @@ const activate = async (
   state: IStateDB,
   launcher: ILauncher | null,
   palette: ICommandPalette | null,
-  drive: ICollaborativeDrive | null,
+  drive: ICollaborativeContentProvider | null,
 ): Promise<void> => {
   formSchemaRegistry && state;
   if (PageConfig.getOption('jgis_expose_maps')) {
@@ -273,7 +273,7 @@ const jGISPlugin: JupyterFrontEndPlugin<void> = {
     IJGISFormSchemaRegistryToken,
     IStateDB,
   ],
-  optional: [ILauncher, ICommandPalette, ICollaborativeDrive],
+  optional: [ILauncher, ICommandPalette, ICollaborativeContentProvider],
   autoStart: true,
   activate,
 };

python/jupytergis_lab/package.json

@@ -52,7 +52,7 @@
     "watch:labextension": "jupyter labextension watch ."
   },
   "dependencies": {
-    "@jupyter/collaborative-drive": "^3.0.0",
+    "@jupyter/collaborative-drive": "^4.0.0",
     "@jupytergis/base": "^0.9.1",
     "@jupytergis/schema": "^0.9.1",
     "@jupyterlab/application": "^4.3.0",

python/jupytergis_lab/src/notebookrenderer.ts

@@ -1,4 +1,4 @@
-import { ICollaborativeDrive } from '@jupyter/collaborative-drive';
+import { ICollaborativeContentProvider } from '@jupyter/collaborative-drive';
 import {
   JupyterGISOutputWidget,
   JupyterGISPanel,
@@ -139,7 +139,7 @@ export const notebookRendererPlugin: JupyterFrontEndPlugin<void> = {
     IJGISExternalCommandRegistryToken,
     IJupyterGISDocTracker,
     IJupyterYWidgetManager,
-    ICollaborativeDrive,
+    ICollaborativeContentProvider,
     IStateDB,
     IJGISFormSchemaRegistryToken,
     IAnnotationToken,
@@ -150,7 +150,7 @@ export const notebookRendererPlugin: JupyterFrontEndPlugin<void> = {
     externalCommandRegistry?: IJGISExternalCommandRegistry,
     jgisTracker?: JupyterGISTracker,
     yWidgetManager?: IJupyterYWidgetManager,
-    drive?: ICollaborativeDrive,
+    drive?: ICollaborativeContentProvider,
     formSchemaRegistry?: IJGISFormSchemaRegistry,
     state?: IStateDB,
     annotationModel?: IAnnotationModel,

python/jupytergis_qgis/package.json

@@ -53,7 +53,7 @@
     "watch:labextension": "jupyter labextension watch ."
   },
   "dependencies": {
-    "@jupyter/collaborative-drive": "^3.0.0",
+    "@jupyter/collaborative-drive": "^4.0.0",
     "@jupytergis/base": "^0.9.1",
     "@jupytergis/jupytergis-core": "^0.9.1",
     "@jupytergis/schema": "^0.9.1",

python/jupytergis_qgis/src/plugins.ts

@@ -1,5 +1,5 @@
 import {
-  ICollaborativeDrive,
+  ICollaborativeContentProvider,
   SharedDocumentFactory,
 } from '@jupyter/collaborative-drive';
 import {
@@ -75,7 +75,7 @@ const activate = async (
   app: JupyterFrontEnd,
   tracker: WidgetTracker<IJupyterGISWidget>,
   themeManager: IThemeManager,
-  drive: ICollaborativeDrive,
+  drive: ICollaborativeContentProvider,
   externalCommandRegistry: IJGISExternalCommandRegistry,
   contentFactory: ConsolePanel.IContentFactory,
   editorServices: IEditorServices,
@@ -324,7 +324,7 @@ export const qgisplugin: JupyterFrontEndPlugin<void> = {
   requires: [
     IJupyterGISDocTracker,
     IThemeManager,
-    ICollaborativeDrive,
+    ICollaborativeContentProvider,
     IJGISExternalCommandRegistryToken,
     ConsolePanel.IContentFactory,
     IEditorServices,

requirements-build.txt

@@ -1,8 +1,8 @@
 # minimum needed to build jupytergis.
 datamodel-code-generator>=0.23.0
 hatchling>=1.5.0,<2
-jupyter-collaboration>=3
-jupyter-collaboration-ui>=1
+jupyter-collaboration>=4
+jupyter-collaboration-ui>=2
 jupyter-docprovider>=1,<2
 jupyter-server-ydoc>=1,<2
 jupyterlab>=4.3,<5