Merge branch 'main' into filipzitny/mar-253-contributing-guide-for-deepnotevscode-deepnote

Author: jamesbhobbs

.github/workflows/ci.yml

@@ -190,6 +190,31 @@ jobs:
       - name: Run spell check
         run: npm run spell-check
 
+  package-lock-drift-check:
+    name: Package Lock Drift Check
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    steps:
+      - name: Checkout
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
+
+      - name: Setup Node.js
+        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
+        with:
+          cache: 'npm'
+          node-version-file: '.nvmrc'
+          registry-url: 'https://npm.pkg.github.com'
+          scope: '@deepnote'
+
+      - name: Install dependencies
+        run: npm install
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Check package lock drift
+        run: |
+          git diff --exit-code HEAD
+
   audit-prod:
     name: Audit - Production
     runs-on: ubuntu-latest

package-lock.json

@@ -1,7 +1,7 @@
 {
     "name": "vscode-deepnote",
     "displayName": "Deepnote",
-    "version": "0.2.0",
+    "version": "0.3.0",
     "description": "Deepnote notebook support.",
     "publisher": "Deepnote",
     "author": {
@@ -99,6 +99,12 @@
                 "category": "Deepnote",
                 "icon": "$(plug)"
             },
+            {
+                "command": "deepnote.openInDeepnote",
+                "title": "Open in Deepnote",
+                "category": "Deepnote",
+                "icon": "$(globe)"
+            },
             {
                 "command": "deepnote.newProject",
                 "title": "New project",
@@ -129,6 +135,12 @@
                 "category": "Deepnote",
                 "icon": "$(graph)"
             },
+            {
+                "command": "deepnote.addChartBlock",
+                "title": "%deepnote.commands.addChartBlock.title%",
+                "category": "Deepnote",
+                "icon": "$(graph-line)"
+            },
             {
                 "command": "deepnote.addInputTextBlock",
                 "title": "%deepnote.commands.addInputTextBlock.title%",
@@ -761,6 +773,11 @@
                     "when": "editorFocus && editorLangId == python && jupyter.hascodecells && !notebookEditorFocused && isWorkspaceTrusted",
                     "command": "jupyter.exportfileasnotebook",
                     "group": "Jupyter3@2"
+                },
+                {
+                    "when": "resourceExtname == .deepnote",
+                    "command": "deepnote.openInDeepnote",
+                    "group": "navigation"
                 }
             ],
             "editor.interactiveWindow.context": [
@@ -850,6 +867,51 @@
                     "group": "navigation@1",
                     "when": "notebookType == 'deepnote'"
                 },
+                {
+                    "command": "deepnote.addChartBlock",
+                    "group": "navigation@2",
+                    "when": "notebookType == 'deepnote'"
+                },
+                {
+                    "command": "deepnote.addBigNumberChartBlock",
+                    "group": "navigation@3",
+                    "when": "notebookType == 'deepnote'"
+                },
+                {
+                    "command": "deepnote.addInputTextBlock",
+                    "group": "navigation@4",
+                    "when": "notebookType == 'deepnote'"
+                },
+                {
+                    "command": "deepnote.addInputTextareaBlock",
+                    "group": "navigation@5",
+                    "when": "notebookType == 'deepnote'"
+                },
+                {
+                    "command": "deepnote.addInputSelectBlock",
+                    "group": "navigation@6",
+                    "when": "notebookType == 'deepnote'"
+                },
+                {
+                    "command": "deepnote.addInputSliderBlock",
+                    "group": "navigation@7",
+                    "when": "notebookType == 'deepnote'"
+                },
+                {
+                    "command": "deepnote.addInputCheckboxBlock",
+                    "group": "navigation@8",
+                    "when": "notebookType == 'deepnote'"
+                },
+                {
+                    "command": "deepnote.addInputDateBlock",
+                    "group": "navigation@9",
+                    "when": "notebookType == 'deepnote'"
+                },
+                {
+                    "command": "deepnote.addInputDateRangeBlock",
+                    "group": "navigation@10",
+                    "when": "notebookType == 'deepnote'"
+                },
                 {
                     "command": "jupyter.restartkernel",
                     "group": "navigation/execute@5",
@@ -1377,7 +1439,7 @@
             "view/item/context": [
                 {
                     "command": "deepnote.revealInExplorer",
-                    "when": "view == deepnoteExplorer",
+                    "when": "view == deepnoteExplorer && viewItem != loading",
                     "group": "inline@2"
                 }
             ]
@@ -1386,6 +1448,18 @@
             "type": "object",
             "title": "Deepnote",
             "properties": {
+                "deepnote.domain": {
+                    "type": "string",
+                    "default": "deepnote.com",
+                    "description": "Deepnote domain (e.g., 'deepnote.com' or 'ra-18838.deepnote-staging.com')",
+                    "scope": "application"
+                },
+                "deepnote.disableSSLVerification": {
+                    "type": "boolean",
+                    "default": false,
+                    "description": "Disable SSL certificate verification (for development only)",
+                    "scope": "application"
+                },
                 "jupyter.experiments.enabled": {
                     "type": "boolean",
                     "default": true,
@@ -2027,7 +2101,8 @@
         "viewsWelcome": [
             {
                 "view": "deepnoteExplorer",
-                "contents": "Welcome to Deepnote for VS Code!\nExplore your data with SQL and Python. Build interactive notebooks, collaborate with your team, and share your insights.\n\n\n\n[$(new-file) New Project](command:deepnote.newProject)\n[$(folder-opened) Import Notebook](command:deepnote.importNotebook)"
+                "contents": "Welcome to Deepnote for VS Code!\nExplore your data with SQL and Python. Build interactive notebooks, collaborate with your team, and share your insights.\n\n\n\n[$(new-file) New Project](command:deepnote.newProject)\n[$(folder-opened) Import Notebook](command:deepnote.importNotebook)",
+                "when": "deepnote.explorerInitialScanComplete"
             }
         ],
         "debuggers": [

package.json

@@ -255,7 +255,8 @@
     "deepnote.commands.importNotebook.title": "Import Notebook",
     "deepnote.commands.importJupyterNotebook.title": "Import Jupyter Notebook",
     "deepnote.commands.addSqlBlock.title": "Add SQL Block",
-    "deepnote.commands.addBigNumberChartBlock.title": "Add Big Number Chart Block",
+    "deepnote.commands.addBigNumberChartBlock.title": "Add Big Number Block",
+    "deepnote.commands.addChartBlock.title": "Add Chart Block",
     "deepnote.commands.addInputTextBlock.title": "Add Input Text Block",
     "deepnote.commands.addInputTextareaBlock.title": "Add Input Textarea Block",
     "deepnote.commands.addInputSelectBlock.title": "Add Input Select Block",

package.nls.json

@@ -188,6 +188,7 @@ export interface ICommandNameArgumentTypeMapping {
     [DSCommands.ContinueEditSessionInCodespace]: [];
     [DSCommands.AddSqlBlock]: [];
     [DSCommands.AddBigNumberChartBlock]: [];
+    [DSCommands.AddChartBlock]: [];
     [DSCommands.AddInputTextBlock]: [];
     [DSCommands.AddInputTextareaBlock]: [];
     [DSCommands.AddInputSelectBlock]: [];
@@ -197,4 +198,5 @@ export interface ICommandNameArgumentTypeMapping {
     [DSCommands.AddInputDateRangeBlock]: [];
     [DSCommands.AddInputFileBlock]: [];
     [DSCommands.AddButtonBlock]: [];
+    [DSCommands.OpenInDeepnote]: [];
 }

src/commands.ts

@@ -10,7 +10,7 @@ import { IOutputChannel, IExtensionContext } from '../../platform/common/types';
 import { STANDARD_OUTPUT_CHANNEL } from '../../platform/common/constants';
 import { IFileSystem } from '../../platform/common/platform/types';
 import { Cancellation } from '../../platform/common/cancellation';
-import { DEEPNOTE_TOOLKIT_WHEEL_URL, DEEPNOTE_TOOLKIT_VERSION } from './types';
+import { DEEPNOTE_TOOLKIT_VERSION } from './types';
 
 /**
  * Manages a shared installation of deepnote-toolkit in a versioned extension directory.
@@ -220,7 +220,7 @@ export class DeepnoteSharedToolkitInstaller {
                     '--target',
                     this.sharedInstallationPath.fsPath,
                     '--upgrade',
-                    `deepnote-toolkit[server] @ ${DEEPNOTE_TOOLKIT_WHEEL_URL}`
+                    `deepnote-toolkit[server]==${DEEPNOTE_TOOLKIT_VERSION}`
                 ],
                 { throwOnStdErr: false }
             );

src/kernels/deepnote/deepnoteSharedToolkitInstaller.node.ts

@@ -4,7 +4,7 @@
 import { inject, injectable, named } from 'inversify';
 import { CancellationToken, Uri, workspace } from 'vscode';
 import { PythonEnvironment } from '../../platform/pythonEnvironments/info';
-import { IDeepnoteToolkitInstaller, DEEPNOTE_TOOLKIT_WHEEL_URL, DEEPNOTE_TOOLKIT_VERSION } from './types';
+import { IDeepnoteToolkitInstaller, DEEPNOTE_TOOLKIT_VERSION } from './types';
 import { IProcessServiceFactory } from '../../platform/common/process/types.node';
 import { logger } from '../../platform/logging';
 import { IOutputChannel, IExtensionContext } from '../../platform/common/types';
@@ -189,7 +189,7 @@ export class DeepnoteToolkitInstaller implements IDeepnoteToolkitInstaller {
             Cancellation.throwIfCanceled(token);
 
             // Install deepnote-toolkit and ipykernel in venv
-            logger.info(`Installing deepnote-toolkit and ipykernel in venv from ${DEEPNOTE_TOOLKIT_WHEEL_URL}`);
+            logger.info(`Installing deepnote-toolkit (${DEEPNOTE_TOOLKIT_VERSION}) and ipykernel in venv from PyPI`);
             this.outputChannel.appendLine('Installing deepnote-toolkit and ipykernel...');
 
             const installResult = await venvProcessService.exec(
@@ -199,7 +199,7 @@ export class DeepnoteToolkitInstaller implements IDeepnoteToolkitInstaller {
                     'pip',
                     'install',
                     '--upgrade',
-                    `deepnote-toolkit[server] @ ${DEEPNOTE_TOOLKIT_WHEEL_URL}`,
+                    `deepnote-toolkit[server]==${DEEPNOTE_TOOLKIT_VERSION}`,
                     'ipykernel'
                 ],
                 { throwOnStdErr: false }
@@ -260,7 +260,7 @@ export class DeepnoteToolkitInstaller implements IDeepnoteToolkitInstaller {
                 throw new DeepnoteToolkitInstallError(
                     venvInterpreter.uri.fsPath,
                     venvPath.fsPath,
-                    DEEPNOTE_TOOLKIT_WHEEL_URL,
+                    DEEPNOTE_TOOLKIT_VERSION,
                     installResult.stdout || '',
                     installResult.stderr || 'Package installation completed but verification failed'
                 );
@@ -278,7 +278,7 @@ export class DeepnoteToolkitInstaller implements IDeepnoteToolkitInstaller {
             throw new DeepnoteToolkitInstallError(
                 baseInterpreter.uri.fsPath,
                 venvPath.fsPath,
-                DEEPNOTE_TOOLKIT_WHEEL_URL,
+                DEEPNOTE_TOOLKIT_VERSION,
                 '',
                 ex instanceof Error ? ex.message : String(ex),
                 ex instanceof Error ? ex : undefined

src/kernels/deepnote/deepnoteToolkitInstaller.node.ts

@@ -156,7 +156,6 @@ export interface IDeepnoteKernelAutoSelector {
     ensureKernelSelected(notebook: vscode.NotebookDocument, token?: vscode.CancellationToken): Promise<void>;
 }
 
-export const DEEPNOTE_TOOLKIT_VERSION = '0.2.30.post30';
-export const DEEPNOTE_TOOLKIT_WHEEL_URL = `https://deepnote-staging-runtime-artifactory.s3.amazonaws.com/deepnote-toolkit-packages/${DEEPNOTE_TOOLKIT_VERSION}/deepnote_toolkit-${DEEPNOTE_TOOLKIT_VERSION}-py3-none-any.whl`;
+export const DEEPNOTE_TOOLKIT_VERSION = '1.0.0rc2';
 export const DEEPNOTE_DEFAULT_PORT = 8888;
 export const DEEPNOTE_NOTEBOOK_TYPE = 'deepnote';

src/kernels/deepnote/types.ts

@@ -45,7 +45,7 @@ project:
           type: 'code'
           content: "df = pd.DataFrame({'a': [1, 2, 3]})\ndf"
           sortingKey: '001'
-          blockGroup: 'default-group'
+          blockGroup: 'uuid-v4'
           executionCount: 1
           metadata:
             table_state_spec: '{"pageSize": 25, "pageIndex": 0}'
@@ -150,7 +150,7 @@ Example of a cell after pocket conversion:
         __deepnotePocket: {
             type: 'code',
             sortingKey: '001',
-            blockGroup: 'default-group',
+            blockGroup: 'uuid-v4',
             executionCount: 1
         }
     },
@@ -472,7 +472,7 @@ blocks:
     type: 'big-number'
     content: ''
     sortingKey: '001'
-    blockGroup: 'default-group'
+    blockGroup: 'uuid-v4'
     metadata:
       deepnote_big_number_title: 'Customers'
       deepnote_big_number_value: 'customers'
@@ -517,7 +517,7 @@ When opened in VS Code, the block becomes a cell with JSON content showing the c
         __deepnotePocket: {
             type: 'big-number',
             sortingKey: '001',
-            blockGroup: 'default-group'
+            blockGroup: 'uuid-v4'
         }
     }
 }

src/notebooks/deepnote/blocks.md

@@ -27,6 +27,7 @@ import {
     ButtonBlockConverter
 } from './converters/inputConverters';
 import { CHART_BIG_NUMBER_MIME_TYPE } from '../../platform/deepnote/deepnoteConstants';
+import { generateUuid } from '../../platform/common/uuid';
 
 /**
  * Utility class for converting between Deepnote block structures and VS Code notebook cells.
@@ -168,7 +169,7 @@ export class DeepnoteDataConverter {
 
     private createFallbackBlock(cell: NotebookCellData, index: number): DeepnoteBlock {
         return {
-            blockGroup: 'default-group',
+            blockGroup: generateUuid(),
             id: generateBlockId(),
             sortingKey: generateSortingKey(index),
             type: cell.kind === NotebookCellKind.Code ? 'code' : 'markdown',
@@ -235,6 +236,8 @@ export class DeepnoteDataConverter {
             for (const item of output.items) {
                 if (item.mime === 'text/plain') {
                     data['text/plain'] = new TextDecoder().decode(item.data);
+                } else if (item.mime === 'text/markdown') {
+                    data['text/markdown'] = new TextDecoder().decode(item.data);
                 } else if (item.mime === 'text/html') {
                     data['text/html'] = new TextDecoder().decode(item.data);
                 } else if (item.mime === 'application/json') {
@@ -391,6 +394,10 @@ export class DeepnoteDataConverter {
                             );
                         }
 
+                        if (data['text/markdown']) {
+                            items.push(NotebookCellOutputItem.text(data['text/markdown'] as string, 'text/markdown'));
+                        }
+
                         if (data['text/plain']) {
                             let mimeType = 'text/plain';
                             // deepnote-toolkit returns the text/plain mime type for big number outputs