Update for JupyterCAD 3.0

.github/workflows/build.yml

@@ -18,7 +18,7 @@ jobs:
         uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
 
       - name: Install dependencies
-        run: python -m pip install -U "jupyterlab>=4.0.0,<5"
+        run: python -m pip install -U "jupyterlab>=4.0.0,<5" "jupytercad>=3.1.3,<4"
 
       - name: Lint the extension
         run: |

package.json

@@ -52,8 +52,9 @@
         "watch:labextension": "jupyter labextension watch ."
     },
     "dependencies": {
-        "@jupytercad/base": "^2.0.0",
-        "@jupytercad/schema": "^2.0.0",
+        "@jupyter/collaborative-drive": "^3.1.0",
+        "@jupytercad/base": "^3.1.3",
+        "@jupytercad/schema": "^3.1.3",
         "@jupyterlab/application": "^4.0.0",
         "@jupyterlab/coreutils": "^6.0.0",
         "@jupyterlab/services": "^7.0.0",
@@ -116,6 +117,10 @@
             "@jupytercad/schema": {
                 "singleton": true,
                 "bundled": false
+            },
+            "@jupyter/collaborative-drive": {
+                "singleton": true,
+                "bundled": false
             }
         }
     },

pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["hatchling>=1.5.0", "jupyterlab>=4.0.0,<5", "hatch-nodejs-version>=0.3.2"]
+requires = ["hatchling>=1.5.0", "jupyterlab>=4.3,<5", "hatch-nodejs-version>=0.3.2"]
 build-backend = "hatchling.build"
 
 [project]
@@ -24,8 +24,7 @@ classifiers = [
 ]
 dependencies = [
     "jupyter_server>=2.0.1,<3",
-    "jupytercad_core>=2.0.0,<3",
-    "jupytercad_lab>=2.0.0,<3"
+    "jupytercad>=3.1.3,<4"
 ]
 dynamic = ["version", "description", "authors", "urls", "keywords"]
 
@@ -71,7 +70,7 @@ version_cmd = "hatch version"
 
 [tool.jupyter-releaser.hooks]
 before-build-npm = [
-    "python -m pip install 'jupyterlab>=4.0.0,<5'",
+    "python -m pip install 'jupyterlab>=4.3,<5'",
     "jlpm",
     "jlpm build:prod"
 ]

src/command.ts

@@ -103,11 +103,11 @@ namespace Private {
       };
       const { ...props } = formJsonSchema;
       const dialog = new FormDialog({
-        context: current.context,
+        model: current.model,
         title: meshOperator.title,
-        sourceData: meshOperator.default(current.context.model),
+        sourceData: meshOperator.default(current.model),
         schema: props,
-        syncData: meshOperator.syncData(current.context.model),
+        syncData: meshOperator.syncData(current.model),
         cancelButton: true
       });
       await dialog.launch();

src/worker.ts

@@ -62,7 +62,7 @@ export class SalomeWorker implements IJCadWorker {
       const numberOfSegments = jcObject?.parameters?.NumberOfSegments ?? 15;
       const p = this._appClient.execute.generateMesh({
         requestBody: {
-          sourcePath: this._tracker.currentWidget?.context.path,
+          sourcePath: this._tracker.currentWidget?.model.filePath,
           geometry: postShape as string,
           format: ExecutionRequest.format.BREP,
           numberOfSegments

ui-tests/Dockerfile

@@ -6,7 +6,7 @@ WORKDIR /home/$MAMBA_USER/cad
 
 COPY --chown=$MAMBA_USER:$MAMBA_USER ./jupyter_server_test_config.py ./jupytercad_salome*.whl ./
 
-RUN python -m pip install jupyterlab "jupytercad>=2.0.0a1" jupytercad_salome*.whl
+RUN python -m pip install jupyterlab "jupytercad>=3.1.3" jupytercad_salome*.whl
 
 EXPOSE 8888
 CMD source /home/user/salome_src/default_env_launch.sh && jupyter lab --config jupyter_server_test_config.py