Skip to content

Lazy import mamba #316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
martinRenou wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Lazy import mamba #316

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 20 additions & 10 deletions packages/xeus/src/worker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,14 @@
import { URLExt } from '@jupyterlab/coreutils';

import type { IEmpackEnvMeta, TSharedLibsMap } from '@emscripten-forge/mambajs';
// eslint-disable-next-line @typescript-eslint/consistent-type-imports
type MambaModuleType = typeof import('@emscripten-forge/mambajs');
import {
bootstrapEmpackPackedEnvironment,
bootstrapPython,
loadSharedLibs,
showPackagesList,
install,
pipInstall,
pipUninstall,
remove
} from '@emscripten-forge/mambajs';
showPackagesList
} from '@emscripten-forge/mambajs-core';
import type {
ILock,
IInstallationCommandOptions,
Expand All @@ -28,6 +26,16 @@ import type { IUnpackJSAPI } from '@emscripten-forge/untarjs';
import { XeusRemoteKernelBase } from '@jupyterlite/xeus-core';
import type { IEmpackXeusWorkerKernel } from './interfaces';

let mamba: MambaModuleType | null = null;

async function getMamba() {
if (!mamba) {
const module = await import('@emscripten-forge/mambajs');
mamba = module;
}
return mamba;
}

async function fetchJson(url: string): Promise<any> {
const response = await fetch(url);
if (!response.ok) {
Expand Down Expand Up @@ -178,10 +186,11 @@ export abstract class EmpackedXeusRemoteKernel extends XeusRemoteKernelBase {
*/
protected async install(options: IInstallationCommandOptions) {
let env: ILock;
const mamba = await getMamba();

switch (options.type) {
case 'conda': {
env = await install(
env = await mamba.install(
options.specs,
this._lock,
options.channels,
Expand All @@ -190,7 +199,7 @@ export abstract class EmpackedXeusRemoteKernel extends XeusRemoteKernelBase {
break;
}
case 'pip': {
env = await pipInstall(options.specs, this._lock, this.logger);
env = await mamba.pipInstall(options.specs, this._lock, this.logger);
break;
}
}
Expand All @@ -206,14 +215,15 @@ export abstract class EmpackedXeusRemoteKernel extends XeusRemoteKernelBase {
options: IUninstallationCommandOptions
): Promise<void> {
let env: ILock;
const mamba = await getMamba();

switch (options.type) {
case 'conda': {
env = await remove(options.specs, this._lock, this.logger);
env = await mamba.remove(options.specs, this._lock, this.logger);
break;
}
case 'pip': {
env = await pipUninstall(options.specs, this._lock, this.logger);
env = await mamba.pipUninstall(options.specs, this._lock, this.logger);
break;
}
}
Expand Down
Loading