Merge remote-tracking branch 'origin/main' into hannes/grn-4913-manage-deepnote-kernels

Signed-off-by: Tomas Kislan <tomas@kislan.sk>

Author: tkislan

.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

@@ -152,6 +152,12 @@
                 "category": "Deepnote",
                 "icon": "$(plug)"
             },
+            {
+                "command": "deepnote.openInDeepnote",
+                "title": "Open in Deepnote",
+                "category": "Deepnote",
+                "icon": "$(globe)"
+            },
             {
                 "command": "deepnote.newProject",
                 "title": "%deepnote.commands.newProject.title%",
@@ -182,6 +188,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%",
@@ -824,6 +836,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": [
@@ -918,6 +935,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",
@@ -1484,6 +1546,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,

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

@@ -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',

src/notebooks/deepnote/deepnoteDataConverter.ts

@@ -8,6 +8,7 @@ import { IDeepnoteNotebookManager } from '../types';
 import { DeepnoteTreeDataProvider } from './deepnoteTreeDataProvider';
 import { type DeepnoteTreeItem, DeepnoteTreeItemType, type DeepnoteTreeItemContext } from './deepnoteTreeItem';
 import { generateUuid } from '../../platform/common/uuid';
+import { DeepnoteBlock, DeepnoteFile } from '@deepnote/blocks';
 
 /**
  * Manages the Deepnote explorer tree view and related commands
@@ -213,10 +214,10 @@ export class DeepnoteExplorerView {
             const projectId = generateUuid();
             const notebookId = generateUuid();
 
-            const firstBlock = {
+            const firstBlock: DeepnoteBlock = {
                 blockGroup: generateUuid(),
                 content: '',
-                executionCount: null,
+                executionCount: 0,
                 id: generateUuid(),
                 metadata: {},
                 outputs: [],
@@ -225,9 +226,10 @@ export class DeepnoteExplorerView {
                 version: 1
             };
 
-            const projectData = {
-                version: 1.0,
+            const projectData: DeepnoteFile = {
+                version: '1.0.0',
                 metadata: {
+                    createdAt: new Date().toISOString(),
                     modifiedAt: new Date().toISOString()
                 },
                 project: {

src/notebooks/deepnote/deepnoteExplorerView.ts

@@ -265,7 +265,9 @@ suite('DeepnoteExplorerView - Empty State Commands', () => {
             const yamlContent = Buffer.from(capturedContent!).toString('utf8');
             const projectData = yaml.load(yamlContent) as any;
 
-            expect(projectData.version).to.equal(1.0);
+            expect(projectData.version).to.equal('1.0.0');
+            expect(projectData.metadata.createdAt).to.exist;
+            expect(projectData.metadata.modifiedAt).to.exist;
             expect(projectData.project.id).to.equal(projectId);
             expect(projectData.project.name).to.equal(projectName);
             expect(projectData.project.notebooks).to.have.lengthOf(1);

src/notebooks/deepnote/deepnoteExplorerView.unit.test.ts

@@ -17,6 +17,7 @@ import { IExtensionSyncActivationService } from '../../platform/activation/types
 import { IDisposableRegistry } from '../../platform/common/types';
 import { Commands } from '../../platform/common/constants';
 import { chainWithPendingUpdates } from '../../kernels/execution/notebookUpdater';
+import { WrappedError } from '../../platform/errors/types';
 import {
     DeepnoteBigNumberMetadataSchema,
     DeepnoteTextInputMetadataSchema,
@@ -30,6 +31,7 @@ import {
     DeepnoteButtonMetadataSchema,
     DeepnoteSqlMetadata
 } from './deepnoteSchemas';
+import { DATAFRAME_SQL_INTEGRATION_ID } from '../../platform/notebooks/deepnote/integrationTypes';
 
 export type InputBlockType =
     | 'input-text'
@@ -75,7 +77,10 @@ export function getInputBlockMetadata(blockType: InputBlockType, variableName: s
 
 export function safeParseDeepnoteVariableNameFromContentJson(content: string): string | undefined {
     try {
-        const variableNameResult = z.string().safeParse(JSON.parse(content)['deepnote_variable_name']);
+        const parsed = JSON.parse(content);
+        // Chart blocks use 'variable' key, other blocks use 'deepnote_variable_name'
+        const variableName = parsed['variable'] ?? parsed['deepnote_variable_name'];
+        const variableNameResult = z.string().safeParse(variableName);
         return variableNameResult.success ? variableNameResult.data : undefined;
     } catch (error) {
         logger.error('Error parsing deepnote variable name from content JSON', error);
@@ -147,6 +152,7 @@ export class DeepnoteNotebookCommandListener implements IExtensionSyncActivation
         this.disposableRegistry.push(
             commands.registerCommand(Commands.AddBigNumberChartBlock, () => this.addBigNumberChartBlock())
         );
+        this.disposableRegistry.push(commands.registerCommand(Commands.AddChartBlock, () => this.addChartBlock()));
         this.disposableRegistry.push(
             commands.registerCommand(Commands.AddInputTextBlock, () => this.addInputBlock('input-text'))
         );
@@ -189,7 +195,7 @@ export class DeepnoteNotebookCommandListener implements IExtensionSyncActivation
         const defaultMetadata: DeepnoteSqlMetadata = {
             deepnote_variable_name: deepnoteVariableName,
             deepnote_return_variable_type: 'dataframe',
-            sql_integration_id: 'deepnote-dataframe-sql'
+            sql_integration_id: DATAFRAME_SQL_INTEGRATION_ID
         };
 
         // Determine the index where to insert the new cell (below current selection or at the end)
@@ -261,6 +267,61 @@ export class DeepnoteNotebookCommandListener implements IExtensionSyncActivation
         await commands.executeCommand('notebook.cell.edit');
     }
 
+    public async addChartBlock(): Promise<void> {
+        const editor = window.activeNotebookEditor;
+
+        if (!editor) {
+            throw new WrappedError(l10n.t('No active notebook editor found'));
+        }
+
+        const document = editor.notebook;
+        const selection = editor.selection;
+        const insertIndex = selection ? selection.end : document.cellCount;
+
+        const defaultVisualizationSpec = {
+            mark: 'line',
+            $schema: 'https://vega.github.io/schema/vega-lite/v5.json',
+            data: { values: [] },
+            encoding: {
+                x: { field: 'x', type: 'quantitative' },
+                y: { field: 'y', type: 'quantitative' }
+            }
+        };
+
+        const cellContent = {
+            variable: 'df_1',
+            spec: defaultVisualizationSpec,
+            filters: []
+        };
+
+        const metadata = {
+            __deepnotePocket: {
+                type: 'visualization'
+            }
+        };
+
+        const result = await chainWithPendingUpdates(document, (edit) => {
+            const newCell = new NotebookCellData(NotebookCellKind.Code, JSON.stringify(cellContent, null, 2), 'json');
+
+            newCell.metadata = metadata;
+
+            const nbEdit = NotebookEdit.insertCells(insertIndex, [newCell]);
+
+            edit.set(document.uri, [nbEdit]);
+        });
+
+        if (result !== true) {
+            throw new WrappedError(l10n.t('Failed to insert chart block'));
+        }
+
+        const notebookRange = new NotebookRange(insertIndex, insertIndex + 1);
+
+        editor.revealRange(notebookRange, NotebookEditorRevealType.Default);
+        editor.selection = notebookRange;
+
+        await commands.executeCommand('notebook.cell.edit');
+    }
+
     public async addInputBlock(blockType: InputBlockType): Promise<void> {
         const editor = window.activeNotebookEditor;
         if (!editor) {