Merge branch 'main' into jk/feat/input-block-ux

Author: jankuca

package.json

@@ -70,6 +70,14 @@
                 "key": "escape",
                 "when": "isCompositeNotebook && !editorHoverVisible && !suggestWidgetVisible && !isComposing && !inSnippetMode && !exceptionWidgetVisible && !selectionAnchorSet && !LinkedEditingInputVisible && !renameInputVisible && !editorHasSelection && !accessibilityHelpWidgetVisible && !breakpointWidgetVisible && !findWidgetVisible && !markersNavigationVisible && !parameterHintsVisible && !editorHasMultipleSelections && !notificationToastsVisible && !notebookEditorFocused && !inlineChatVisible",
                 "command": "interactive.input.clear"
+            },
+            {
+                "key": "cmd+enter",
+                "mac": "cmd+enter",
+                "win": "ctrl+enter",
+                "linux": "ctrl+enter",
+                "when": "notebookEditorFocused && !findInputFocussed && !replaceInputFocussed",
+                "command": "jupyter.notebookeditor.runfocusedcell"
             }
         ],
         "commands": [
@@ -544,6 +552,12 @@
                 "category": "Notebook",
                 "enablement": "!jupyter.webExtension"
             },
+            {
+                "command": "jupyter.notebookeditor.runfocusedcell",
+                "title": "%jupyter.command.jupyter.notebookeditor.runfocusedcell.title%",
+                "category": "Notebook",
+                "enablement": "notebookEditorFocused"
+            },
             {
                 "command": "jupyter.expandallcells",
                 "title": "%jupyter.command.jupyter.expandallcells.title%",
@@ -714,9 +728,30 @@
             {
                 "id": "editor.interactiveWindow.context",
                 "label": "%jupyter.command.editor.interactiveWindow.context.label%"
+            },
+            {
+                "id": "deepnote.explorer.context",
+                "label": "Deepnote"
             }
         ],
         "menus": {
+            "view/title": [
+                {
+                    "command": "deepnote.newProject",
+                    "when": "view == deepnoteExplorer",
+                    "group": "navigation@1"
+                },
+                {
+                    "command": "deepnote.importNotebook",
+                    "when": "view == deepnoteExplorer",
+                    "group": "navigation@2"
+                },
+                {
+                    "command": "deepnote.refreshExplorer",
+                    "when": "view == deepnoteExplorer",
+                    "group": "navigation@3"
+                }
+            ],
             "editor/context": [
                 {
                     "submenu": "editor.interactiveWindow.context",
@@ -765,6 +800,14 @@
                     "when": "editorFocus && editorLangId == python && !notebookEditorFocused && isWorkspaceTrusted"
                 }
             ],
+            "deepnote.explorer.context": [
+                {
+                    "command": "deepnote.newProject"
+                },
+                {
+                    "command": "deepnote.importNotebook"
+                }
+            ],
             "editor/title": [
                 {
                     "command": "jupyter.restartkernel",
@@ -937,6 +980,11 @@
                 }
             ],
             "explorer/context": [
+                {
+                    "submenu": "deepnote.explorer.context",
+                    "when": "isWorkspaceTrusted",
+                    "group": "navigation@10"
+                },
                 {
                     "when": "resourceLangId == python && !notebookEditorFocused && isWorkspaceTrusted",
                     "command": "jupyter.runFileInteractive",

package.nls.json

@@ -92,6 +92,7 @@
         "message": "Add Empty Cell to Notebook File",
         "comment": ["{Locked='Notebook'}"]
     },
+    "jupyter.command.jupyter.notebookeditor.runfocusedcell.title": "Run Focused Cell",
     "jupyter.command.jupyter.interruptkernel.title": "Interrupt Kernel",
     "jupyter.command.jupyter.interruptkernel.shorttitle": "Interrupt",
     "jupyter.command.jupyter.restartkernel.title": "Restart Kernel",

src/commands.ts

@@ -58,6 +58,7 @@ export interface ICommandNameArgumentTypeMapping {
     [DSCommands.RestartKernelAndRunUpToSelectedCell]: [{ notebookEditor: { notebookUri: Uri } } | undefined];
     [DSCommands.NotebookEditorRemoveAllCells]: [];
     [DSCommands.NotebookEditorRunAllCells]: [];
+    [DSCommands.NotebookEditorRunFocusedCell]: [];
     [DSCommands.NotebookEditorAddCellBelow]: [];
     [DSCommands.ExpandAllCells]: [];
     [DSCommands.CollapseAllCells]: [];

src/messageTypes.ts

@@ -182,6 +182,7 @@ export type LocalizedMessages = {
     // Integration type labels
     integrationsPostgresTypeLabel: string;
     integrationsBigQueryTypeLabel: string;
+    integrationsSnowflakeTypeLabel: string;
     // PostgreSQL form strings
     integrationsPostgresNameLabel: string;
     integrationsPostgresNamePlaceholder: string;
@@ -204,9 +205,36 @@ export type LocalizedMessages = {
     integrationsBigQueryCredentialsLabel: string;
     integrationsBigQueryCredentialsPlaceholder: string;
     integrationsBigQueryCredentialsRequired: string;
+    // Snowflake form strings
+    integrationsSnowflakeNameLabel: string;
+    integrationsSnowflakeNamePlaceholder: string;
+    integrationsSnowflakeAccountLabel: string;
+    integrationsSnowflakeAccountPlaceholder: string;
+    integrationsSnowflakeAuthMethodLabel: string;
+    integrationsSnowflakeAuthMethodSubLabel: string;
+    integrationsSnowflakeAuthMethodUsernamePassword: string;
+    integrationsSnowflakeAuthMethodKeyPair: string;
+    integrationsSnowflakeUnsupportedAuthMethod: string;
+    integrationsSnowflakeUsernameLabel: string;
+    integrationsSnowflakePasswordLabel: string;
+    integrationsSnowflakePasswordPlaceholder: string;
+    integrationsSnowflakeServiceAccountUsernameLabel: string;
+    integrationsSnowflakeServiceAccountUsernameHelp: string;
+    integrationsSnowflakePrivateKeyLabel: string;
+    integrationsSnowflakePrivateKeyHelp: string;
+    integrationsSnowflakePrivateKeyPlaceholder: string;
+    integrationsSnowflakePrivateKeyPassphraseLabel: string;
+    integrationsSnowflakePrivateKeyPassphraseHelp: string;
+    integrationsSnowflakeDatabaseLabel: string;
+    integrationsSnowflakeDatabasePlaceholder: string;
+    integrationsSnowflakeRoleLabel: string;
+    integrationsSnowflakeRolePlaceholder: string;
+    integrationsSnowflakeWarehouseLabel: string;
+    integrationsSnowflakeWarehousePlaceholder: string;
     // Common form strings
     integrationsRequiredField: string;
     integrationsOptionalField: string;
+    integrationsUnnamedIntegration: string;
     // Select input settings strings
     selectInputSettingsTitle: string;
     allowMultipleValues: string;

src/notebooks/deepnote/integrations/integrationManager.ts

@@ -5,8 +5,15 @@ import { IExtensionContext } from '../../../platform/common/types';
 import { Commands } from '../../../platform/common/constants';
 import { logger } from '../../../platform/logging';
 import { IIntegrationDetector, IIntegrationManager, IIntegrationStorage, IIntegrationWebviewProvider } from './types';
-import { IntegrationStatus, IntegrationWithStatus } from '../../../platform/notebooks/deepnote/integrationTypes';
+import {
+    DEEPNOTE_TO_INTEGRATION_TYPE,
+    IntegrationStatus,
+    IntegrationType,
+    IntegrationWithStatus,
+    RawIntegrationType
+} from '../../../platform/notebooks/deepnote/integrationTypes';
 import { BlockWithIntegration, scanBlocksForIntegrations } from './integrationUtils';
+import { IDeepnoteNotebookManager } from '../../types';
 
 /**
  * Manages integration UI and commands for Deepnote notebooks
@@ -21,7 +28,8 @@ export class IntegrationManager implements IIntegrationManager {
         @inject(IExtensionContext) private readonly extensionContext: IExtensionContext,
         @inject(IIntegrationDetector) private readonly integrationDetector: IIntegrationDetector,
         @inject(IIntegrationStorage) private readonly integrationStorage: IIntegrationStorage,
-        @inject(IIntegrationWebviewProvider) private readonly webviewProvider: IIntegrationWebviewProvider
+        @inject(IIntegrationWebviewProvider) private readonly webviewProvider: IIntegrationWebviewProvider,
+        @inject(IDeepnoteNotebookManager) private readonly notebookManager: IDeepnoteNotebookManager
     ) {}
 
     public activate(): void {
@@ -150,9 +158,33 @@ export class IntegrationManager implements IIntegrationManager {
         if (selectedIntegrationId && !integrations.has(selectedIntegrationId)) {
             logger.debug(`IntegrationManager: Adding requested integration ${selectedIntegrationId} to the map`);
             const config = await this.integrationStorage.getIntegrationConfig(selectedIntegrationId);
+
+            // Try to get integration metadata from the project
+            const project = this.notebookManager.getOriginalProject(projectId);
+            const projectIntegration = project?.project.integrations?.find((i) => i.id === selectedIntegrationId);
+
+            let integrationName: string | undefined;
+            let integrationType: IntegrationType | undefined;
+
+            if (projectIntegration) {
+                integrationName = projectIntegration.name;
+
+                // Validate that projectIntegration.type exists in the mapping before lookup
+                if (projectIntegration.type in DEEPNOTE_TO_INTEGRATION_TYPE) {
+                    // Map the Deepnote integration type to our IntegrationType
+                    integrationType = DEEPNOTE_TO_INTEGRATION_TYPE[projectIntegration.type as RawIntegrationType];
+                } else {
+                    logger.warn(
+                        `IntegrationManager: Unknown integration type '${projectIntegration.type}' for integration ID '${selectedIntegrationId}' in project '${projectId}'. Integration type will be undefined.`
+                    );
+                }
+            }
+
             integrations.set(selectedIntegrationId, {
                 config: config || null,
-                status: config ? IntegrationStatus.Connected : IntegrationStatus.Disconnected
+                status: config ? IntegrationStatus.Connected : IntegrationStatus.Disconnected,
+                integrationName,
+                integrationType
             });
         }
 

src/notebooks/deepnote/integrations/integrationWebview.ts

@@ -131,6 +131,7 @@ export class IntegrationWebviewProvider implements IIntegrationWebviewProvider {
             integrationsConfigureTitle: localize.Integrations.configureTitle,
             integrationsPostgresTypeLabel: localize.Integrations.postgresTypeLabel,
             integrationsBigQueryTypeLabel: localize.Integrations.bigQueryTypeLabel,
+            integrationsSnowflakeTypeLabel: localize.Integrations.snowflakeTypeLabel,
             integrationsCancel: localize.Integrations.cancel,
             integrationsSave: localize.Integrations.save,
             integrationsRequiredField: localize.Integrations.requiredField,
@@ -154,7 +155,34 @@ export class IntegrationWebviewProvider implements IIntegrationWebviewProvider {
             integrationsBigQueryProjectIdPlaceholder: localize.Integrations.bigQueryProjectIdPlaceholder,
             integrationsBigQueryCredentialsLabel: localize.Integrations.bigQueryCredentialsLabel,
             integrationsBigQueryCredentialsPlaceholder: localize.Integrations.bigQueryCredentialsPlaceholder,
-            integrationsBigQueryCredentialsRequired: localize.Integrations.bigQueryCredentialsRequired
+            integrationsBigQueryCredentialsRequired: localize.Integrations.bigQueryCredentialsRequired,
+            integrationsSnowflakeNameLabel: localize.Integrations.snowflakeNameLabel,
+            integrationsSnowflakeNamePlaceholder: localize.Integrations.snowflakeNamePlaceholder,
+            integrationsSnowflakeAccountLabel: localize.Integrations.snowflakeAccountLabel,
+            integrationsSnowflakeAccountPlaceholder: localize.Integrations.snowflakeAccountPlaceholder,
+            integrationsSnowflakeAuthMethodLabel: localize.Integrations.snowflakeAuthMethodLabel,
+            integrationsSnowflakeAuthMethodSubLabel: localize.Integrations.snowflakeAuthMethodSubLabel,
+            integrationsSnowflakeAuthMethodUsernamePassword: localize.Integrations.snowflakeAuthMethodUsernamePassword,
+            integrationsSnowflakeAuthMethodKeyPair: localize.Integrations.snowflakeAuthMethodKeyPair,
+            integrationsSnowflakeUnsupportedAuthMethod: localize.Integrations.snowflakeUnsupportedAuthMethod,
+            integrationsSnowflakeUsernameLabel: localize.Integrations.snowflakeUsernameLabel,
+            integrationsSnowflakePasswordLabel: localize.Integrations.snowflakePasswordLabel,
+            integrationsSnowflakePasswordPlaceholder: localize.Integrations.snowflakePasswordPlaceholder,
+            integrationsSnowflakeServiceAccountUsernameLabel:
+                localize.Integrations.snowflakeServiceAccountUsernameLabel,
+            integrationsSnowflakeServiceAccountUsernameHelp: localize.Integrations.snowflakeServiceAccountUsernameHelp,
+            integrationsSnowflakePrivateKeyLabel: localize.Integrations.snowflakePrivateKeyLabel,
+            integrationsSnowflakePrivateKeyHelp: localize.Integrations.snowflakePrivateKeyHelp,
+            integrationsSnowflakePrivateKeyPlaceholder: localize.Integrations.snowflakePrivateKeyPlaceholder,
+            integrationsSnowflakePrivateKeyPassphraseLabel: localize.Integrations.snowflakePrivateKeyPassphraseLabel,
+            integrationsSnowflakePrivateKeyPassphraseHelp: localize.Integrations.snowflakePrivateKeyPassphraseHelp,
+            integrationsSnowflakeDatabaseLabel: localize.Integrations.snowflakeDatabaseLabel,
+            integrationsSnowflakeDatabasePlaceholder: localize.Integrations.snowflakeDatabasePlaceholder,
+            integrationsSnowflakeRoleLabel: localize.Integrations.snowflakeRoleLabel,
+            integrationsSnowflakeRolePlaceholder: localize.Integrations.snowflakeRolePlaceholder,
+            integrationsSnowflakeWarehouseLabel: localize.Integrations.snowflakeWarehouseLabel,
+            integrationsSnowflakeWarehousePlaceholder: localize.Integrations.snowflakeWarehousePlaceholder,
+            integrationsUnnamedIntegration: localize.Integrations.unnamedIntegration('{0}')
         };
 
         await this.currentPanel.webview.postMessage({

src/notebooks/deepnote/sqlCellStatusBarProvider.ts

@@ -437,6 +437,8 @@ export class SqlCellStatusBarProvider implements NotebookCellStatusBarItemProvid
                 return l10n.t('PostgreSQL');
             case IntegrationType.BigQuery:
                 return l10n.t('BigQuery');
+            case IntegrationType.Snowflake:
+                return l10n.t('Snowflake');
             default:
                 return String(type);
         }

src/notebooks/notebookCommandListener.ts

@@ -68,6 +68,9 @@ export class NotebookCommandListener implements INotebookCommandHandler, IExtens
         this.disposableRegistry.push(
             commands.registerCommand(Commands.NotebookEditorRunAllCells, () => this.runAllCells())
         );
+        this.disposableRegistry.push(
+            commands.registerCommand(Commands.NotebookEditorRunFocusedCell, () => this.runFocusedCell())
+        );
         this.disposableRegistry.push(
             commands.registerCommand(Commands.NotebookEditorAddCellBelow, () => this.addCellBelow())
         );
@@ -115,6 +118,27 @@ export class NotebookCommandListener implements INotebookCommandHandler, IExtens
         }
     }
 
+    private runFocusedCell() {
+        const editor = window.activeNotebookEditor;
+        if (!editor) {
+            return;
+        }
+
+        // Get the first selection range
+        const range = editor.selections[0];
+        if (!range) {
+            return;
+        }
+
+        // Execute the cell at the start of the selection
+        commands
+            .executeCommand('notebook.cell.execute', {
+                ranges: [{ start: range.start, end: range.start + 1 }],
+                document: editor.notebook.uri
+            })
+            .then(noop, noop);
+    }
+
     private addCellBelow() {
         if (window.activeNotebookEditor) {
             commands.executeCommand('notebook.cell.insertCodeCellBelow').then(noop, noop);

src/platform/common/constants.ts

@@ -189,6 +189,7 @@ export namespace Commands {
     export const NotebookEditorRemoveAllCells = 'jupyter.notebookeditor.removeallcells';
     export const NotebookEditorRunAllCells = 'jupyter.notebookeditor.runallcells';
     export const NotebookEditorRunSelectedCell = 'jupyter.notebookeditor.runselectedcell';
+    export const NotebookEditorRunFocusedCell = 'jupyter.notebookeditor.runfocusedcell';
     export const NotebookEditorAddCellBelow = 'jupyter.notebookeditor.addcellbelow';
     export const ExpandAllCells = 'jupyter.expandallcells';
     export const CollapseAllCells = 'jupyter.collapseallcells';