Add custom API route for .deepnote files

Signed-off-by: Andy Jakubowski <[email protected]>

Author: andyjakubowski

README.md

@@ -114,12 +114,12 @@ jlpm run watch
 
 The `jlpm` command is JupyterLab's pinned version of
 [yarn](https://yarnpkg.com/) that is installed with JupyterLab. You may use
-`yarn` or `npm` in lieu of `jlpm` below.
+`yarn` or `npm` instead of `jlpm` below.
 
-In a separate terminal, run `jupyter lab` with the `--config` option to register our custom file contents manager for the `.deepnote` extension. The `--debug` option lets you see HTTP requests in the logs, which is helpful for debugging.
+In a separate terminal, run `jupyter lab`. You can add the `--debug` option to see HTTP requests in the logs, which can be helpful for debugging.
 
 ```shell
-jupyter lab --debug --config="$(pwd)/jupyter-config/server-config/jupyter_server_config.json"
+jupyter lab --debug
 ```
 
 You can watch the source directory and run JupyterLab at the same time in different terminals to watch for changes in the extension's source and automatically rebuild the extension.

jupyter-config/server-config/jupyter_server_config.json

@@ -8,7 +8,6 @@
 
     warnings.warn("Importing 'jupyterlab_deepnote' outside a proper installation.")
     __version__ = "dev"
-from jupyterlab_deepnote.contents import DeepnoteContentsManager
 from .handlers import setup_handlers
 
 
@@ -31,4 +30,3 @@ def _load_jupyter_server_extension(server_app):
     setup_handlers(server_app.web_app)
     name = "jupyterlab_deepnote"
     server_app.log.info(f"Registered {name} server extension")
-    server_app.contents_manager_class = DeepnoteContentsManager

jupyterlab_deepnote/__init__.py

@@ -1,3 +1,4 @@
+from datetime import datetime
 import json
 
 from jupyter_server.base.handlers import APIHandler
@@ -12,20 +13,26 @@ class RouteHandler(APIHandler):
     # Jupyter server
     @tornado.web.authenticated
     async def get(self):
-        print("🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨 YOOOOO")
         path = self.get_query_argument("path")
         # Use Jupyter Server’s contents_manager, not direct filesystem access.
         model = await ensure_async(
             self.contents_manager.get(path, type="file", format="text", content=True)
         )
-        result = {"data": model, "path": path}
+        # Convert datetimes to strings so JSON can handle them
+        for key in ("created", "last_modified"):
+            if isinstance(model.get(key), datetime):
+                model[key] = model[key].isoformat()
+
+        # Return everything, including YAML content
+        result = {"deepnoteFileModel": model}
+
         self.finish(json.dumps(result))
 
 
 def setup_handlers(web_app):
     host_pattern = ".*$"
 
     base_url = web_app.settings["base_url"]
-    route_pattern = url_path_join(base_url, "api", "contents", "resolve")
+    route_pattern = url_path_join(base_url, "jupyterlab-deepnote", "file")
     handlers = [(route_pattern, RouteHandler)]
     web_app.add_handlers(host_pattern, handlers)

jupyterlab_deepnote/contents.py

@@ -1,63 +1,42 @@
 import { Contents, RestContentProvider } from '@jupyterlab/services';
-import { z } from 'zod';
 import { transformDeepnoteYamlToNotebookContent } from './transform-deepnote-yaml-to-notebook-content';
+import { requestAPI } from './handler';
 
 export const deepnoteContentProviderName = 'deepnote-content-provider';
-
-const deepnoteFileFromServerSchema = z.object({
-  cells: z.array(z.any()), // or refine further with nbformat
-  metadata: z.object({
-    deepnote: z.object({
-      rawYamlString: z.string()
-    })
-  }),
-  nbformat: z.number(),
-  nbformat_minor: z.number()
-});
-
 export class DeepnoteContentProvider extends RestContentProvider {
   async get(
     localPath: string,
     options?: Contents.IFetchOptions
   ): Promise<Contents.IModel> {
     const isDeepnoteFile = localPath.endsWith('.deepnote');
 
-    if (isDeepnoteFile) {
-      await super.get(`resolve?path=${localPath}`, options);
-    }
-
-    const model = await super.get(localPath, options);
-
     if (!isDeepnoteFile) {
       // Not a .deepnote file, return as-is
-      return model;
+      const nonDeepnoteModel = await super.get(localPath, options);
+      return nonDeepnoteModel;
     }
 
-    const validatedModelContent = deepnoteFileFromServerSchema.safeParse(
-      model.content
-    );
-
-    if (!validatedModelContent.success) {
-      console.error(
-        'Invalid .deepnote file content:',
-        validatedModelContent.error
-      );
-      // Return an empty notebook instead of throwing an error
-      model.content.cells = [];
-      return model;
-    }
+    // Call custom API route to fetch the Deepnote file content
+    const data = await requestAPI<any>(`file?path=${localPath}`);
+    const modelData = data.deepnoteFileModel;
 
     // Transform the Deepnote YAML to Jupyter notebook content
-    const transformedModelContent =
-      await transformDeepnoteYamlToNotebookContent(
-        validatedModelContent.data.metadata.deepnote.rawYamlString
-      );
+    const notebookContent = await transformDeepnoteYamlToNotebookContent(
+      modelData.content
+    );
 
-    const transformedModel = {
-      ...model,
-      content: transformedModelContent
+    const model: Contents.IModel = {
+      name: modelData.name,
+      path: modelData.path,
+      type: 'notebook',
+      writable: false,
+      created: modelData.created,
+      last_modified: modelData.last_modified,
+      mimetype: 'application/x-ipynb+json',
+      format: 'json',
+      content: notebookContent
     };
 
-    return transformedModel;
+    return model;
   }
 }