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

Signed-off-by: Tomas Kislan <[email protected]>

Author: tkislan

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": {

package.json

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

@@ -3,20 +3,16 @@
 
 import { inject, injectable, named } from 'inversify';
 import { CancellationToken, l10n, Uri, workspace } from 'vscode';
-import { Cancellation } from '../../platform/common/cancellation';
+
 import { STANDARD_OUTPUT_CHANNEL } from '../../platform/common/constants';
 import { IFileSystem } from '../../platform/common/platform/types';
 import { IProcessServiceFactory } from '../../platform/common/process/types.node';
 import { IExtensionContext, IOutputChannel } from '../../platform/common/types';
 import { DeepnoteToolkitInstallError, DeepnoteVenvCreationError } from '../../platform/errors/deepnoteKernelErrors';
 import { logger } from '../../platform/logging';
 import { PythonEnvironment } from '../../platform/pythonEnvironments/info';
-import {
-    DEEPNOTE_TOOLKIT_VERSION,
-    DEEPNOTE_TOOLKIT_WHEEL_URL,
-    IDeepnoteToolkitInstaller,
-    VenvAndToolkitInstallation
-} from './types';
+import { DEEPNOTE_TOOLKIT_VERSION, IDeepnoteToolkitInstaller, VenvAndToolkitInstallation } from './types';
+import { Cancellation } from '../../platform/common/cancellation';
 
 /**
  * Handles installation of the deepnote-toolkit Python package.
@@ -271,7 +267,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(l10n.t('Installing deepnote-toolkit and ipykernel...'));
 
             const installResult = await venvProcessService.exec(
@@ -281,7 +277,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 }
@@ -319,7 +315,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'
                 );
@@ -337,7 +333,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

@@ -332,7 +332,6 @@ export interface IDeepnoteNotebookEnvironmentMapper {
     getNotebooksUsingEnvironment(environmentId: string): vscode.Uri[];
 }
 
-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

@@ -99,7 +99,7 @@ export class DeepnoteToolkitInstallError extends DeepnoteKernelError {
     constructor(
         public readonly pythonPath: string,
         public readonly venvPath: string,
-        public readonly packageUrl: string,
+        public readonly packageVersion: string,
         public readonly stdout: string,
         public readonly stderr: string,
         cause?: Error
@@ -112,7 +112,7 @@ export class DeepnoteToolkitInstallError extends DeepnoteKernelError {
         this.technicalDetails = [
             `Python interpreter: ${pythonPath}`,
             `Virtual environment: ${venvPath}`,
-            `Package URL: ${packageUrl}`,
+            `Package version: ${packageVersion}`,
             stdout ? `Installation output:\n${stdout}` : '',
             stderr ? `Error output:\n${stderr}` : 'No error output available',
             cause ? `Underlying error: ${cause.message}` : ''